diff --git a/dub.sdl b/dub.sdl index 3b9911e689..c2076a5f63 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 433d26664a..5d51c5507b 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 9b6083cbf4..0000000000 --- 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 4cff4c5633..94e87086a0 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 6234c599c2..efbed06b6d 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