fix(test): Move the testsuite out of tree

.dockerignore

@@ -3,4 +3,4 @@
 *.a
 *.o
 .dub/
-test/*/.dub/
+test/integration/*/.dub/

.github/workflows/main.yml

@@ -115,7 +115,7 @@ 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
+          dub run   --compiler=${{ env.DC }} --single test/integration/issue2051_running_unittests_from_dub_single_file_packages_fails.d
           ./scripts/ci/ci.sh
         fi
 
@@ -127,19 +127,19 @@ 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
+          dub run   --compiler=${{ env.DC }} --single test/integration/issue2051_running_unittests_from_dub_single_file_packages_fails.d
+          dub --single test/integration/run-test.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}
+            rm -rf test/integration/{1-dynLib-simple,2-dynLib-dep,2-dynLib-with-staticLib-dep}
             # Unicode in paths too
-            rm -rf test/issue130-unicode-СНА*
+            rm -rf test/integration/issue130-unicode-СНА*
             # ImportC probably requires set-up MSVC environment variables
-            rm -rf test/use-c-sources
+            rm -rf test/integration/use-c-sources
           fi
-          test/run-unittest.sh
+          test/integration/run-test.sh
         fi
       shell: bash
 

.gitignore

@@ -35,20 +35,20 @@ __dummy.html
 *.exe
 *.lib
 *.log
-/test/*/*
-/test/*.*
-!/test/*.d
-!/test/*.d.min_frontend
-!/test/*.sh
-!/test/*.sh.min_frontend
-!/test/*/.no_*
-!/test/*/.min_frontend
-!/test/*/.fail_build
-!/test/*/dub.json
-!/test/*/dub.sdl
-!/test/*/dub.settings.json
-!/test/*/source/
-!/test/*/src/
+/test/integration/*/*
+/test/integration/*.*
+!/test/integration/*.d
+!/test/integration/*.d.min_frontend
+!/test/integration/*.sh
+!/test/integration/*.sh.min_frontend
+!/test/integration/*/.no_*
+!/test/integration/*/.min_frontend
+!/test/integration/*/.fail_build
+!/test/integration/*/dub.json
+!/test/integration/*/dub.sdl
+!/test/integration/*/dub.settings.json
+!/test/integration/*/source/
+!/test/integration/*/src/
 
 # Ignore coverage files
 cov/

docker/Dockerfile.alpine

@@ -14,10 +14,10 @@ RUN dub test --compiler=$DCBIN && dub build --compiler=$DCBIN
 # Remove dub to avoid the risk of using the wrong binary
 RUN apk del dub
 
-# Used by the `run-unittest.sh` script
+# Used by the `run-test.sh` script
 ENV DUB=/root/build/bin/dub
 ENV DC=$DCBIN
 
 # Finally, just run the test-suite
-WORKDIR /root/build/test/
-ENTRYPOINT [ "/root/build/test/run-unittest.sh" ]
+WORKDIR /root/build/test/integration/
+ENTRYPOINT [ "/root/build/test/integration/run-test.sh" ]

dub.sdl

@@ -24,6 +24,11 @@ configuration "application" {
 	//dflags "-fpreview=in" platform="gdc"
 }
 
+configuration "unittest" {
+	versions "DubUseCurl"
+	sourcePaths "source" "test/unit/"
+}
+
 configuration "library" {
 	targetType "library"
 	excludedSourceFiles "source/app.d"

scripts/ci/ci.sh

@@ -18,5 +18,5 @@ else
     dub test --compiler=${DC} -b unittest-cov
     ./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
+DUB=`pwd`/bin/dub DC=${DC} dub --single ./test/integration/run-test.d
+DUB=`pwd`/bin/dub DC=${DC} test/integration/run-test.sh

test/.gitignore → test/integration/.gitignore

@@ -18,7 +18,7 @@ version-spec/**/foo
 
 /test_registry
 /issue_2051_running_unittests_from_dub_single_file_packages_fails
-/run-unittest
+/run-test
 
 test.log
 custom-source-main-bug487/custom-source-main-bug487

test/dub-as-a-library-cwd/dub.json → test/integration/dub-as-a-library-cwd/dub.json

@@ -3,7 +3,7 @@
 	"workingDirectory": ".",
 	"dependencies": {
 		"dub": {
-			"path": "../.."
+			"path": "../../../"
 		}
 	}
 }

test/integration/dub-custom-root-2/source/app.d

@@ -0,0 +1,12 @@
+import std.file;
+import std.path;
+import std.stdio;
+import std.string;
+
+void main()
+{
+	// run me from test/integration/ with dub --root=dub-custom-root
+	string cwd = getcwd.chomp("/");
+	assert(cwd.endsWith("test/integration/dub-custom-root-2/source"), cwd);
+	writeln("ok");
+}

test/integration/dub-custom-root/source/app.d

@@ -0,0 +1,10 @@
+import std.file;
+import std.path;
+import std.stdio;
+
+void main()
+{
+	// run me from test/integration/ with dub --root=test/integration/dub-custom-root
+	assert(getcwd.baseName == "integration", getcwd);
+	writeln("ok");
+}

test/issue103-single-file-package-no-ext → test/integration/issue103-single-file-package-no-ext

@@ -1,4 +1,4 @@
-#!../bin/dub
+#!../../bin/dub
 /+ dub.sdl:
    name "single-file-test"
 +/

test/issue103-single-file-package.d → test/integration/issue103-single-file-package.d

@@ -1,4 +1,4 @@
-#!../bin/dub
+#!../../bin/dub
 /+ dub.sdl:
    name "single-file-test"
 +/