From b9a930abf27902a448b9eca2a0225c0dec360d7e Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Sat, 9 Dec 2017 09:08:51 +0100
Subject: [PATCH] Start testing the DMD DUB package on Travis

---
 dub.sdl                                     | 1 -
 test/dub_package/.gitignore                 | 1 +
 test/dub_package/dub.sdl                    | 5 -----
 test/dub_package/{source/app.d => parser.d} | 3 +++
 travis.sh                                   | 8 ++++----
 5 files changed, 8 insertions(+), 10 deletions(-)
 delete mode 100644 test/dub_package/dub.sdl
 rename test/dub_package/{source/app.d => parser.d} (94%)

diff --git a/dub.sdl b/dub.sdl
index 3b9911e689b8..c2076a5f6356 100644
--- a/dub.sdl
+++ b/dub.sdl
@@ -42,7 +42,6 @@ subPackage {
 
   sourceFiles \
     "src/ddmd/astbase.d" \
-    "src/ddmd/astbasevisitor.d" \
     "src/ddmd/parse.d" \
     "src/ddmd/transitivevisitor.d" \
     "src/ddmd/permissivevisitor.d" \
diff --git a/test/dub_package/.gitignore b/test/dub_package/.gitignore
index 433d26664af8..5d51c5507b5d 100644
--- a/test/dub_package/.gitignore
+++ b/test/dub_package/.gitignore
@@ -3,3 +3,4 @@ docs.json
 __dummy.html
 *.o
 *.obj
+/parser
diff --git a/test/dub_package/dub.sdl b/test/dub_package/dub.sdl
deleted file mode 100644
index 9b6083cbf468..000000000000
--- a/test/dub_package/dub.sdl
+++ /dev/null
@@ -1,5 +0,0 @@
-name "dmd-dub-test"
-description "Test of the DMD Dub package"
-license "BSL 1.0"
-
-dependency "dmd" path="../../"
diff --git a/test/dub_package/source/app.d b/test/dub_package/parser.d
similarity index 94%
rename from test/dub_package/source/app.d
rename to test/dub_package/parser.d
index 4cff4c5633c7..94e87086a03f 100644
--- a/test/dub_package/source/app.d
+++ b/test/dub_package/parser.d
@@ -1,3 +1,6 @@
+/+dub.sdl:
+dependency "dmd" path="../.."
++/
 // The tests in this module are highlevel and mostly indented to make sure all
 // necessary modules are included in the Dub package.
 
diff --git a/travis.sh b/travis.sh
index 6234c599c253..efbed06b6db1 100755
--- a/travis.sh
+++ b/travis.sh
@@ -66,9 +66,7 @@ rebuild() {
 
 # test druntime, phobos, dmd
 test() {
-    # Temporarily skip testing the DUB package
-    #See also: https://github.com/dlang/dmd/pull/6999
-    #test_dub_package
+    test_dub_package
     make -j$N -C ../druntime -f posix.mak MODEL=$MODEL unittest
     make -j$N -C ../phobos -f posix.mak MODEL=$MODEL unittest
     test_dmd
@@ -86,9 +84,11 @@ test_dmd() {
 
 # test dub package
 test_dub_package() {
+    source ~/dlang/*/activate # activate host compiler
     pushd test/dub_package
-    dub test
+    dub --single --build=unittest parser.d
     popd
+    deactivate
 }
 
 for proj in druntime phobos; do