Refactor integration tests

.github/workflows/main.yml

@@ -74,6 +74,9 @@ jobs:
           - { dc: ldc-master, do_test: true }
           # Test on ARM64
           - { os: macOS-14, dc: ldc-latest, do_test: true }
+          # ice when building tests: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=119817
+          - { os: ubuntu-24.04, dc: gdc-13, do_test: false }
+          - { os: ubuntu-24.04, dc: gdc-14, do_test: true }
         exclude:
           # Error with those versions:
           # ld: multiple errors: symbol count from symbol table and dynamic symbol table differ in [.../dub.o]; address=0x0 points to section(2) with no content in '[...]/osx/lib/libphobos2.a[3177](config_a68_4c3.o)'
@@ -96,14 +99,29 @@ jobs:
     - name: '[Linux] Install dependencies'
       if: runner.os == 'Linux'
       run: |
-        sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev netcat
+        sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev netcat-openbsd
 
     # Compiler to test with
     - name: Prepare compiler
-      uses: dlang-community/setup-dlang@v1
+      uses: dlang-community/setup-dlang@v2
       with:
         compiler: ${{ matrix.dc }}
 
+    - name: Set environment variables
+      shell: bash
+      run: |
+        for name in DC DMD; do
+          var=${!name}
+          var=$(basename "${var}")
+          var=${var%.exe} # strip the extension
+          export "${name}=${var}"
+          tee -a ${GITHUB_ENV} <<<"${name}=${var}"
+        done
+
+        if [[ ${{ matrix.dc }} == gdc-13 ]]; then
+          tee -a ${GITHUB_ENV} <<<"DFLAGS=-Wno-error"
+        fi
+
     # Checkout the repository
     - name: Checkout
       uses: actions/checkout@v4
@@ -115,7 +133,6 @@ jobs:
       run: |
         dub build --compiler=${{ env.DC }}
         if [[ ${{ matrix.do_test }} == 'true' ]]; then
-          dub run   --compiler=${{ env.DC }} --single test/issue2051_running_unittests_from_dub_single_file_packages_fails.d
           ./scripts/ci/ci.sh
         fi
 
@@ -127,19 +144,7 @@ jobs:
         dub build --compiler=${{ env.DC }}
         if [[ ${{ matrix.do_test }} == 'true' ]]; then
           dub test  --compiler=${{ env.DC }}
-          dub run   --compiler=${{ env.DC }} --single test/issue2051_running_unittests_from_dub_single_file_packages_fails.d
-          dub --single test/run-unittest.d
-
-          # FIXME: DMD fails a few tests on Windows; remove them for now
-          if [[ '${{ matrix.dc }}' = dmd* ]]; then
-            # DLL support is lacking
-            rm -rf test/{1-dynLib-simple,2-dynLib-dep,2-dynLib-with-staticLib-dep}
-            # Unicode in paths too
-            rm -rf test/issue130-unicode-СНА*
-            # ImportC probably requires set-up MSVC environment variables
-            rm -rf test/use-c-sources
-          fi
-          test/run-unittest.sh
+          dub run --root test/run_unittest -- -v
         fi
       shell: bash
 

docker/Dockerfile.alpine

@@ -7,7 +7,7 @@ ARG DCBIN
 
 # Build dub (and install tests dependencies in the process)
 WORKDIR /root/build/
-RUN apk add --no-cache bash build-base curl curl-dev dtools dub git grep rsync $DCPKG
+RUN apk add --no-cache bash build-base curl curl-dev dtools dub git grep rsync lld $DCPKG
 ADD . /root/build/
 RUN dub test --compiler=$DCBIN && dub build --compiler=$DCBIN
 
@@ -20,4 +20,4 @@ ENV DC=$DCBIN
 
 # Finally, just run the test-suite
 WORKDIR /root/build/test/
-ENTRYPOINT [ "/root/build/test/run-unittest.sh" ]
+ENTRYPOINT [ "/root/build/bin/dub", "--root", "run_unittest", "--" ]

scripts/ci/ci.sh

@@ -2,21 +2,36 @@
 
 set -v -e -o pipefail
 
-vibe_ver=$(jq -r '.versions | .["vibe-d"]' < dub.selections.json)
-dub fetch vibe-d@$vibe_ver # get optional dependency
-dub test --compiler=${DC} -c library-nonet
+testLibraryNonet=1
+if [[ ${DC} =~ gdc|gdmd ]]; then
+    # ICE with gdc-14
+    testLibraryNonet=
+fi
+
+if [[ ${testLibraryNonet} ]]; then
+    vibe_ver=$(jq -r '.versions | .["vibe-d"]' < dub.selections.json)
+    dub fetch vibe-d@$vibe_ver # get optional dependency
+    dub test --compiler=${DC} -c library-nonet --build=unittest
+fi
 
 export DMD="$(command -v $DMD)"
 
-./build.d -preview=in -w -g -debug
+"${DMD}" -run build.d -preview=in -w -g -debug
+
+if [[ ${testLibraryNoNet} ]]; then
+    dub test --compiler=${DC} -b unittest-cov
+fi
 
 if [ "$COVERAGE" = true ]; then
     # library-nonet fails to build with coverage (Issue 13742)
-    dub test --compiler=${DC} -b unittest-cov
-    ./build.d -cov
+    "${DMD}" -run build.d -cov
 else
-    dub test --compiler=${DC} -b unittest-cov
-    ./build.d
+    "${DMD}" -run build.d
 fi
-DUB=`pwd`/bin/dub DC=${DC} dub --single ./test/run-unittest.d
-DUB=`pwd`/bin/dub DC=${DC} test/run-unittest.sh
+
+# force the creation of the coverage dir
+bin/dub --version
+
+# let the runner add the needed flags, in the case of gdmd
+unset DFLAGS
+DC=${DMD} dub run --root test/run_unittest -- -v

test/.gitignore

@@ -2,68 +2,15 @@
 *.lib
 *.so
 *.dll
-
-1-exec-simple/exec-simple
-1-staticLib-simple/__test__library__
-2-dynLib-dep/dynlib-dep
-2-sourceLib-dep/sourcelib-dep
-2-staticLib-dep/staticlib-dep
-custom-unittest/custom-unittest
-path-subpackage-ref/test
-subpackage-ref/test
-subpackage-common-with-sourcefile-globbing/mypackage*
-version-spec/**/CMakeLists.txt
-version-spec/**/foo.cmake
-version-spec/**/foo
-
-/test_registry
-/issue_2051_running_unittests_from_dub_single_file_packages_fails
 /run-unittest
-
 test.log
-custom-source-main-bug487/custom-source-main-bug487
-3-copyFiles/bin/
-ignore-hidden-1/ignore-hidden-1
-ignore-hidden-2/ignore-hidden-2
-expected-import-path-output
-expected-string-import-path-output
-expected-describe-data-1-list-output
-expected-describe-data-2-dmd-output
-expected-issue616-output
-describe-project/dummy.dat
-describe-project/dummy-dep1.dat
-*/main/main
-*/*test-library
-*/*test-application
-*/exec-simple
-issue1474/ext/fortytwo.d
-issue2452/ext/fortytwo.d
-
-cov-ctfe/test
-issue1003-check-empty-ld-flags/issue1003-empty-ld-flags
-issue1053-extra-files-visuald/LICENSE.txt
-issue1053-extra-files-visuald/README.txt
-issue1053-extra-files-visuald/extra_files.sln
-issue1117-extra-dependency-files/test
-issue1396-pre-post-run-commands/test
-issue1396-pre-post-run-commands/test.txt
-issue1477-subpackage-visuald-paths/library_subpackage_a.sln
-issue1477-subpackage-visuald-paths/sub/subpackage_a/subpackage_a.sln
-issue1504-envvar-in-path/test
-issue1773-lint/report.json
-issue2085-target-none-visuald/root.sln
-issue2086-copyfiles-subpackage-targetpath/sub/sub
-issue2086-copyfiles-subpackage-targetpath/sub/to_be_deployed.txt
-issue2262-exact-cached-version-match/testproj
-issue361-optional-deps/cmp.tmp
-issue838-custom-cache-paths/test
-issue97-targettype-none/a/issue97-targettype-none_a
-issue97-targettype-none/b/issue97-targettype-none_b
-issue990-download-optional-selected/b
-output-1504.txt
-version-filters-diamond/version-filters-diamond
-version-filters-none/version-filters-none
-version-filters-source-dep/version-filters-source-dep
-version-filters/version-filters
-version-spec/newfoo/foo-test-application
-version-spec/oldfoo/foo-test-application
+*/*
+!*/dub.json
+!*/dub.sdl
+!*/package.json
+!*/run.d
+!*/run.sh
+!*/source
+!*/.gitignore
+!*/test.config
+!extra/*

test/0-init-fail-json/dub.sdl

@@ -0,0 +1,2 @@
+name "0-init-fail-json"
+dependency "common" path="../common"

test/0-init-fail-json/source/app.d

@@ -0,0 +1,21 @@
+import std.file : exists, remove;
+import std.path : buildPath;
+import std.process : environment, spawnProcess, wait;
+
+import common;
+
+void main()
+{
+	enum packname = "0-init-fail-pack";
+	immutable deps = ["logger", "PACKAGE_DONT_EXIST"]; // would be very unlucky if it does exist...
+
+	if (!spawnProcess([dub, "init", "-n", packname] ~ deps ~ [ "-f", "json"]).wait)
+		die("Init with unknown non-existing dependency expected to fail");
+
+	const filepath = buildPath(packname, "dub.json");
+	if (filepath.exists)
+	{
+		remove(packname);
+		die(filepath, " was not created");
+	}
+}

test/0-init-fail/dub.sdl

@@ -0,0 +1,2 @@
+name "0-init-fail"
+dependency "common" path="../common"

test/0-init-fail/source/app.d

@@ -0,0 +1,21 @@
+import std.file : exists, remove;
+import std.path : buildPath;
+import std.process : environment, spawnProcess, wait;
+
+import common;
+
+void main()
+{
+	enum packname = "0-init-fail-pack";
+	immutable deps = ["logger", "PACKAGE_DONT_EXIST"]; // would be very unlucky if it does exist...
+
+	if (!spawnProcess([dub, "init", "-n", packname] ~ deps).wait)
+		die("Init with unknown non-existing dependency expected to fail");
+
+	const filepath = buildPath(packname, "dub.sdl");
+	if (filepath.exists)
+	{
+		remove(packname);
+		die(filepath ~ " was not created");
+	}
+}

test/0-init-interactive/.gitignore

@@ -0,0 +1,2 @@
+!/exp
+!/exp/*

test/0-init-interactive/dub.sdl

@@ -0,0 +1,2 @@
+name "0-init-interactive"
+dependency "common" path="../common"

test/0-init-interactive.default_name.dub.sdl → test/0-init-interactive/exp/default_name.dub.sdl

@@ -1,4 +1,4 @@
-name "0-init-interactive"
+name "new-package"
 description "desc"
 authors "author"
 copyright "copy"