Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dub.sdl
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
1 change: 1 addition & 0 deletions test/dub_package/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ docs.json
__dummy.html
*.o
*.obj
/parser
5 changes: 0 additions & 5 deletions test/dub_package/dub.sdl

This file was deleted.

3 changes: 3 additions & 0 deletions test/dub_package/source/app.d → test/dub_package/parser.d
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
8 changes: 4 additions & 4 deletions travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down