From 1f3e577a43f9e63790fbd5543ed7cff256fff4c1 Mon Sep 17 00:00:00 2001 From: Mathias Lang Date: Fri, 18 Apr 2025 16:24:41 +0200 Subject: [PATCH] fix(test): Move the testsuite out of tree To ensure its compilation is opt-in and not opt-out. This also moves the integration test suite to offer better segmentation. --- .dockerignore | 2 +- .github/workflows/main.yml | 14 ++++----- .gitignore | 28 +++++++++--------- docker/Dockerfile.alpine | 6 ++-- dub.sdl | 5 ++++ scripts/ci/ci.sh | 4 +-- test/dub-custom-root-2/source/app.d | 12 -------- test/dub-custom-root/source/app.d | 10 ------- test/{ => integration}/.gitignore | 2 +- .../0-init-fail-json.script.d | 0 test/{ => integration}/0-init-fail.sh | 0 .../0-init-interactive.default_name.dub.sdl | 0 .../0-init-interactive.dub.json | 0 .../0-init-interactive.dub.sdl | 0 .../0-init-interactive.license_gpl3.dub.sdl | 0 .../0-init-interactive.license_mpl2.dub.sdl | 0 ...it-interactive.license_proprietary.dub.sdl | 0 test/{ => integration}/0-init-interactive.sh | 0 test/{ => integration}/0-init-multi-json.sh | 0 test/{ => integration}/0-init-multi.sh | 0 test/{ => integration}/0-init-simple-json.sh | 0 test/{ => integration}/0-init-simple.sh | 0 .../1-dynLib-simple/.no_build_gdc | 0 .../{ => integration}/1-dynLib-simple/.no_run | 0 .../1-dynLib-simple/dub.json | 0 .../1-dynLib-simple/source/dynlib/app.d | 0 .../1-exec-simple-package-json/package.json | 0 .../1-exec-simple-package-json/source/app.d | 0 test/{ => integration}/1-exec-simple/dub.json | 0 .../1-exec-simple/source/app.d | 0 .../1-sourceLib-simple/.no_build | 0 .../1-sourceLib-simple/dub.json | 0 .../1-sourceLib-simple/source/sourcelib/app.d | 0 .../1-staticLib-simple/.no_run | 0 .../1-staticLib-simple/dub.json | 0 .../1-staticLib-simple/source/staticlib/app.d | 0 .../2-dynLib-dep/.no_build_windows | 0 test/{ => integration}/2-dynLib-dep/dub.json | 0 .../2-dynLib-dep/source/app.d | 0 .../2-dynLib-with-staticLib-dep/.no_build_gdc | 0 .../2-dynLib-with-staticLib-dep/.no_run | 0 .../2-dynLib-with-staticLib-dep/dub.json | 0 .../source/dynlib/app.d | 0 .../2-sourceLib-dep/dub.json | 0 .../2-sourceLib-dep/source/app.d | 0 .../2-staticLib-dep/dub.json | 0 .../2-staticLib-dep/source/app.d | 0 test/{ => integration}/3-copyFiles/.no_test | 0 .../3-copyFiles/data/file_to_copy.txt | 0 .../3-copyFiles/data/file_to_copy_mask1.txt | 0 .../3-copyFiles/data/file_to_copy_mask2.txt | 0 .../.nocopy/file_inside_dot_prefixed_dir.txt | 0 .../3-copyFiles/data/res/hdpi/file1.txt | 0 .../3-copyFiles/data/res/hdpi/file2.txt | 0 .../3-copyFiles/data/res/hdpi/file3.txt | 0 .../data/res/hdpi/nested_dir/nested_file.txt | 0 .../3-copyFiles/data/res/i18n/resource_en.txt | 0 .../3-copyFiles/data/res/i18n/resource_fr.txt | 0 .../3-copyFiles/data/res/ldpi/file1.txt | 0 .../3-copyFiles/data/res/ldpi/file2.txt | 0 .../3-copyFiles/data/res/ldpi/file3.txt | 0 .../3-copyFiles/data/res/mdpi/file1.txt | 0 .../3-copyFiles/data/res/mdpi/file2.txt | 0 .../3-copyFiles/data/res/mdpi/file3.txt | 0 test/{ => integration}/3-copyFiles/dub.json | 0 .../3-copyFiles/source/app.d | 0 .../4-describe-data-1-list.sh | 0 .../4-describe-data-2-dmd.sh | 0 .../4-describe-data-3-zero-delim.sh | 0 .../4-describe-data-check-escape | 0 .../4-describe-import-paths.sh | 0 test/{ => integration}/4-describe-json.sh | 0 .../4-describe-string-import-paths.sh | 0 test/{ => integration}/5-convert-stdout.sh | 0 test/{ => integration}/5-convert.sh | 0 test/{ => integration}/5-convert/.no_build | 0 test/{ => integration}/5-convert/dub.sdl | 0 .../cache-generated-test-config.sh | 0 .../cache-generated-test-config/.no_build | 0 .../cache-generated-test-config/.no_run | 0 .../cache-generated-test-config/.no_test | 0 .../cache-generated-test-config/dub.sdl | 0 .../cache-generated-test-config/source/test.d | 0 test/{ => integration}/colored-output.sh | 0 test/{ => integration}/common.sh | 0 test/{ => integration}/common/.no_build | 0 test/{ => integration}/common/.no_run | 0 test/{ => integration}/common/.no_test | 0 test/{ => integration}/common/dub.sdl | 0 test/{ => integration}/common/source/common.d | 0 test/{ => integration}/cov-ctfe.sh | 0 test/{ => integration}/cov-ctfe/.no_build | 0 test/{ => integration}/cov-ctfe/.no_run | 0 test/{ => integration}/cov-ctfe/.no_test | 0 test/{ => integration}/cov-ctfe/dub.sdl | 0 test/{ => integration}/cov-ctfe/test.d | 0 .../custom-source-main-bug487/.gitignore | 0 .../custom-source-main-bug487/.no_run | 0 .../custom-source-main-bug487/.no_test | 0 .../custom-source-main-bug487/dub.json | 0 .../custom-source-main-bug487/mysrc/app.d | 0 .../custom-unittest/dub.json | 0 .../custom-unittest/source/app.d | 0 .../custom-unittest/source/lib.d | 0 .../custom-unittest/test/main.d | 0 test/{ => integration}/d-versions.sh | 0 test/{ => integration}/d-versions/.gitignore | 0 test/{ => integration}/d-versions/.no_build | 0 test/{ => integration}/d-versions/.no_run | 0 test/{ => integration}/d-versions/.no_test | 0 test/{ => integration}/d-versions/dub.sdl | 0 .../{ => integration}/d-versions/source/app.d | 0 test/{ => integration}/dc-env.sh | 0 test/{ => integration}/ddox.sh | 0 test/{ => integration}/ddox.sh.min_frontend | 0 test/{ => integration}/ddox/.no_build | 0 .../ddox/custom-tool/.gitignore | 0 .../ddox/custom-tool/dub.sdl | 0 .../ddox/custom-tool/public/copied | 0 .../ddox/custom-tool/source/app.d | 0 test/{ => integration}/ddox/custom/.gitignore | 0 test/{ => integration}/ddox/custom/dub.sdl | 0 .../ddox/custom/source/ddox_project.d | 0 .../{ => integration}/ddox/default/.gitignore | 0 test/{ => integration}/ddox/default/dub.sdl | 0 .../ddox/default/source/ddox_project.d | 0 .../depen-build-settings/.gitignore | 0 .../depen-build-settings/.no_build_dmd | 0 .../depen-build-settings/.no_build_gdc | 0 .../depen-build-settings/.no_test | 0 .../depend/depend2/dub.json | 0 .../depend/depend2/source/depend2.d | 0 .../depen-build-settings/depend/dub.json | 0 .../depend/source/depend.d | 0 .../depen-build-settings/dub.json | 0 .../depen-build-settings/dub.selections.json | 0 .../depen-build-settings/source/app.d | 0 .../describe-dependency-1/.no_build | 0 .../describe-dependency-1/data/dummy-dep1.dat | 0 .../dependency-postGenerateCommands.sh | 0 .../dependency-preGenerateCommands.sh | 0 .../describe-dependency-1/dub.json | 0 .../describe-dependency-1/otherdir/dummy.d | 0 .../describe-dependency-1/source/dummy.d | 0 .../describe-dependency-2/.no_build | 0 .../describe-dependency-2/dub.json | 0 .../some-extra-string-import-path/dummy.d | 0 .../describe-dependency-2/some-path/dummy.d | 0 .../describe-dependency-3/.no_build | 0 .../describe-dependency-3/dep3-source/dummy.d | 0 .../dep3-string-import-path/dummy.d | 0 .../describe-dependency-3/dub.json | 0 .../describe-project/.no_build | 0 .../describe-project/data/dummy.dat | 0 .../do-postGenerateCommands.sh | 0 .../do-preGenerateCommands.sh | 0 .../describe-project/dub.json | 0 .../describe-project/src/dummy.d | 0 .../describe-project/views/dummy.d | 0 test/{ => integration}/dpath-variable.sh | 0 .../dpath-variable/.gitignore | 0 .../{ => integration}/dpath-variable/dub.json | 0 .../dpath-variable/source/app.d | 0 .../{ => integration}/dub-as-a-library-cwd.sh | 0 .../dub-as-a-library-cwd/.gitignore | 0 .../dub-as-a-library-cwd/.no_test | 0 .../dub-as-a-library-cwd/dub.json | 2 +- .../dub-as-a-library-cwd/source/app.d | 0 .../dub-as-a-library-cwd/subproject/dub.sdl | 0 .../subproject/source/app.d | 0 .../dub-custom-root-2/.gitignore | 0 .../dub-custom-root-2/.no_run | 0 .../dub-custom-root-2/.no_test | 0 .../dub-custom-root-2/dub.json | 0 .../dub-custom-root-2/source/app.d | 12 ++++++++ test/{ => integration}/dub-custom-root.sh | 0 .../dub-custom-root/.gitignore | 0 .../{ => integration}/dub-custom-root/.no_run | 0 .../dub-custom-root/.no_test | 0 .../dub-custom-root/dub.json | 0 test/integration/dub-custom-root/source/app.d | 10 +++++++ test/{ => integration}/dub_test_root.sh | 0 .../dustmite-no-redirect-test/.no_build | 0 .../project/dub.json | 0 .../project/source/app.d | 0 .../{ => integration}/dustmite-no-redirect.sh | 0 .../environment-variables.script.d | 0 .../environment-variables/.gitignore | 0 .../environment-variables/.no_build | 0 .../environment-variables/.no_run | 0 .../environment-variables/.no_test | 0 .../environment-variables/deppkg/dub.json | 0 .../deppkg/source/deppkg/foo.d | 0 .../environment-variables/dub.json | 0 .../environment-variables/dub.settings.json | 0 .../environment-variables/source/app.d | 0 .../expected-issue1037-output | 0 test/{ => integration}/feat663-search.sh | 0 test/{ => integration}/fetchzip.sh | 0 .../fetchzip.sh.min_frontend | 0 .../filesystem-version-with-buildinfo.sh | 0 .../.no_build | 0 .../fs-json-dubpackage-1.0.7+build-9-9-9.zip | Bin .../{ => integration}/git-dependency/dub.json | 0 .../git-dependency/src/app.d | 0 test/{ => integration}/help.sh | 0 .../ignore-hidden-1/.gitignore | 0 .../{ => integration}/ignore-hidden-1/.no_run | 0 .../ignore-hidden-1/.no_test | 0 .../ignore-hidden-1/dub.json | 0 .../ignore-hidden-1/source/.hidden.d | 0 .../ignore-hidden-1/source/app.d | 0 .../ignore-hidden-2/.gitignore | 0 .../{ => integration}/ignore-hidden-2/.no_run | 0 .../ignore-hidden-2/.no_test | 0 .../ignore-hidden-2/dub.json | 0 .../ignore-hidden-2/source/.hidden.d | 0 .../ignore-hidden-2/source/app.d | 0 .../ignore-useless-arch-switch/.no_test | 0 .../ignore-useless-arch-switch/dub.sdl | 0 .../ignore-useless-arch-switch/source/app.d | 0 .../injected-from-dependency/.no_test | 0 .../injected-from-dependency/ahook.d | 0 .../injected-from-dependency/dub.json | 0 .../injected-from-dependency/source/entry.d | 0 .../injected-from-dependency/toload/vars.d | 0 test/{ => integration}/interactive-remove.sh | 0 .../issue1003-check-empty-ld-flags.sh | 0 .../issue1003-check-empty-ld-flags/dub.json | 0 .../source/app.d | 0 .../issue1004-override-config.sh | 0 .../issue1004-override-config/.no_build | 0 .../issue1004-override-config/a/a.d | 0 .../issue1004-override-config/a/dub.sdl | 0 .../issue1004-override-config/main/dub.sdl | 0 .../main/source/main.d | 0 .../issue1005-configuration-resolution.sh | 0 .../.no_build | 0 .../a/dub.sdl | 0 .../b/dub.sdl | 0 .../b/source/b.d | 0 .../c/dub.sdl | 0 .../main/dub.sdl | 0 .../main/source/app.d | 0 .../issue1024-selective-upgrade.sh | 0 .../issue1024-selective-upgrade/.no_build | 0 .../a-1.0.0/dub.sdl | 0 .../a-1.0.1/dub.sdl | 0 .../b-1.0.0/dub.sdl | 0 .../b-1.0.1/dub.sdl | 0 .../issue1024-selective-upgrade/main/dub.sdl | 0 .../issue103-single-file-package-json.d | 0 .../issue103-single-file-package-no-ext | 2 +- .../issue103-single-file-package-w-dep.d | 0 .../issue103-single-file-package.d | 2 +- .../issue103-single-file-package.sh | 0 .../issue1037-better-dependency-messages.sh | 0 .../.no_build | 0 .../.no_run | 0 .../.no_test | 0 .../b/dub.json | 0 .../dub.json | 0 .../issue1040-run-with-ver.sh | 0 .../issue1053-extra-files-visuald.sh | 0 .../issue1053-extra-files-visuald/dub.json | 0 .../shaders/saturate.vert | 0 .../shaders/warp.geom | 0 .../source/app.d | 0 .../text/LICENSE.txt | 0 .../text/README.txt | 0 .../issue1070-init-mistakes-dirs-as-files.sh | 0 .../.no_build | 0 .../.no_run | 0 .../.no_test | 0 .../source/.empty | 0 .../issue1091-bogus-rebuild.sh | 0 .../issue1117-extra-dependency-files.sh | 0 .../.gitignore | 0 .../.no_build | 0 .../dependency.txt | 0 .../issue1117-extra-dependency-files/dub.json | 0 .../source/app.d | 0 .../issue1136-temp-copy-files.sh | 0 .../issue1136-temp-copy-files/.no_build | 0 .../issue1136-temp-copy-files/app.d | 0 .../issue1136-temp-copy-files/mylib/dub.sdl | 0 .../mylib/helloworld.txt | 0 .../issue1158-stdin-for-single-files.sh | 0 .../.no_build | 0 .../issue1158-stdin-for-single-files/stdin.d | 0 .../issue1180-local-cache-broken.sh | 0 ...sue1180-local-cache-broken.sh.min_frontend | 0 .../issue1180-local-cache-broken/.gitignore | 0 .../issue1180-local-cache-broken/.no_build | 0 .../issue1180-local-cache-broken/dub.json | 0 .../issue1180-local-cache-broken/source/app.d | 0 .../issue1194-warn-wrong-subconfig.sh | 0 .../issue1194-warn-wrong-subconfig/.no_build | 0 .../issue1194-warn-wrong-subconfig/dub.sdl | 0 .../source/app.d | 0 .../.gitignore | 0 .../.no_run | 0 .../.no_test | 0 .../daughter/.gitignore | 0 .../daughter/dub.sdl | 0 .../daughter/source/dummy.d | 0 .../diamond/.gitignore | 0 .../diamond/dub.sdl | 0 .../diamond/source/dummy.d | 0 .../dub.sdl | 0 .../son/.gitignore | 0 .../son/dub.sdl | 0 .../son/source/dummy.d | 0 .../source/app.d | 0 .../issue1262-version-inheritance/.gitignore | 0 .../issue1262-version-inheritance/.no_run | 0 .../issue1262-version-inheritance/.no_test | 0 .../daughter/.gitignore | 0 .../daughter/dub.sdl | 0 .../daughter/source/dummy.d | 0 .../issue1262-version-inheritance/dub.sdl | 0 .../son/.gitignore | 0 .../issue1262-version-inheritance/son/dub.sdl | 0 .../son/source/dummy.d | 0 .../source/app.d | 0 test/{ => integration}/issue1277.sh | 0 test/{ => integration}/issue1277/.no_build | 0 test/{ => integration}/issue1277/source/app.d | 0 .../dub.sdl" | 0 .../source/app.d" | 0 .../issue1336-registry/.gitignore | 0 .../issue1336-registry/.no_build | 0 ...5D&include_dependencies=true&minimize=true | 0 .../gitcompatibledubpackage/1.0.2.zip | 0 .../gitcompatibledubpackage/1.0.3.zip | 0 .../gitcompatibledubpackage/1.0.4.zip | Bin .../issue1350-transitive-none-deps/.gitignore | 0 .../issue1350-transitive-none-deps/.no_run | 0 .../issue1350-transitive-none-deps/.no_test | 0 .../common-dep/common.d | 0 .../common-dep/dub.sdl | 0 .../common-none/dub.sdl | 0 .../dep1/dep1.d | 0 .../dep1/dub.sdl | 0 .../dep2/dep2.d | 0 .../dep2/dub.sdl | 0 .../issue1350-transitive-none-deps/dub.sdl | 0 .../issue1350-transitive-none-deps/test.d | 0 .../issue1372-ignore-files-in-hidden-dirs.sh | 0 .../.hiddensource/hello.d | 0 .../dub.json | 0 .../source/.AppleDouble/app.d | 0 .../source/.compileMe/hello.d | 0 .../source/app.d | 0 .../issue1396-pre-post-run-commands.sh | 0 .../issue1396-pre-post-run-commands/.no_build | 0 .../issue1396-pre-post-run-commands/dub.sdl | 0 .../post-run.sh | 0 .../source/app.d | 0 .../.no_build | 0 .../fs-json-dubpackage-1.0.7.zip | Bin .../fs-sdl-dubpackage-1.0.5.zip | Bin .../fs-sdl-dubpackage-1.0.6.zip | Bin .../issue1401-filesystem-supplier.sh | 0 .../issue1408-inherit-linker-files/.no_run | 0 .../issue1408-inherit-linker-files/.no_test | 0 .../issue1408-inherit-linker-files/dep.d | 0 .../issue1408-inherit-linker-files/dub.sdl | 0 .../issue1408-inherit-linker-files/lib.d | 0 .../lib/dub.sdl | 0 .../issue1408-inherit-linker-files/lib/lib.d | 0 .../issue1408-inherit-linker-files/main.d | 0 .../issue1416-maven-repo-pkg-supplier.sh | 0 ...16-maven-repo-pkg-supplier.sh.min_frontend | 0 .../.gitignore | 0 .../.no_build | 0 .../1.0.5/maven-dubpackage-1.0.5.zip | Bin .../1.0.6/maven-dubpackage-1.0.6.zip | Bin .../maven-dubpackage/maven-metadata.xml | 0 .../issue1427-betterC/.gitignore | 0 .../issue1427-betterC/.min_frontend | 0 .../issue1427-betterC/.no_run | 0 .../issue1427-betterC/.no_test | 0 .../issue1427-betterC/dub.json | 0 .../issue1427-betterC/source/app.d | 0 .../issue1447-build-settings-vars.sh | 0 .../issue1447-build-settings-vars/.no_run | 0 .../issue1447-build-settings-vars/.no_test | 0 .../issue1447-build-settings-vars/dub.json | 0 .../source/app.d | 0 .../view-aarch64/arch | 0 .../view-x86/arch | 0 .../view-x86_64/arch | 0 .../issue1474-generate-source.script.d | 0 test/{ => integration}/issue1474/.no_build | 0 test/{ => integration}/issue1474/dub.json | 0 test/{ => integration}/issue1474/ext/kekw.d | 0 test/{ => integration}/issue1474/source/app.d | 0 .../issue1477-subpackage-visuald-paths.sh | 0 .../.no_build | 0 .../dub.sdl | 0 .../source/library.d | 0 .../sub/subpackage_a/dub.sdl | 0 .../sub/subpackage_a/source/subpackage_a.d | 0 .../issue1504-envvar-in-path.sh | 0 .../issue1504-envvar-in-path/.no_build | 0 .../issue1504-envvar-in-path/dub.json | 0 .../issue1504-envvar-in-path/source/app.d | 0 .../teststrings/message.txt | 0 ...1505-single-file-package-dynamic-library.d | 0 ...505-single-file-package-dynamic-library.sh | 0 ...issue1524-maven-upgrade-dependency-tree.sh | 0 ...en-upgrade-dependency-tree.sh.min_frontend | 0 .../.gitignore | 0 .../.no_build | 0 .../dub.json | 0 .../1.0.5/maven-dubpackage-a-1.0.5.zip | Bin .../maven-dubpackage-a/maven-metadata.xml | 0 .../1.0.6/maven-dubpackage-b-1.0.6.zip | Bin .../maven-dubpackage-b/maven-metadata.xml | 0 .../source/app.d | 0 .../issue1531-toolchain-requirements.sh | 0 .../issue1551-var-escaping/dub.json | 0 .../issue1551-var-escaping/source/app.d | 0 .../issue1556-fetch-and-build-pkgs/.no_build | 0 .../dependency-package-1.0.0.zip | Bin .../main-package-1.0.0.zip | Bin .../issue1556-fetch-and-build.sh | 0 .../issue1567-fetch-sub-package.sh | 0 .../issue1567-fetch-sub-package/.no_build | 0 .../issue1567-fetch-sub-package/.no_run | 0 .../issue1567-fetch-sub-package/.no_test | 0 .../fetch-sub-package-dubpackage-1.0.1.zip | Bin .../{ => integration}/issue1574-addcommand.sh | 0 .../issue1574-addcommand.sh.min_frontend | 0 .../issue1636-betterC-dub-test.sh | 0 .../issue1636-betterC-dub-test/.gitignore | 0 .../issue1636-betterC-dub-test/.min_frontend | 0 .../issue1636-betterC-dub-test/.no_run | 0 .../issue1636-betterC-dub-test/dub.json | 0 .../issue1636-betterC-dub-test/source/lib.d | 0 .../issue1645-dflags-build.sh | 0 .../issue1651-custom-dub-init-type.sh | 0 .../issue1651-custom-dub-init-type/.no_build | 0 .../issue1651-custom-dub-init-type/.no_run | 0 .../issue1651-custom-dub-init-type/.no_test | 0 .../custom-dub-init-dubpackage-1.0.1.zip | Bin .../issue1691-build-subpkg.sh | 0 .../issue1691-build-subpkg/.gitignore | 0 .../issue1691-build-subpkg/.no_build | 0 .../issue1691-build-subpkg/dub.sdl | 0 .../issue1691-build-subpkg/source/app.d | 0 .../issue1691-build-subpkg/subpkg/dub.sdl | 0 .../subpkg/source/subpkg.d | 0 .../issue1739-project-settings-file.sh | 0 test/{ => integration}/issue1773-lint.sh | 0 .../issue1773-lint/.gitignore | 0 .../issue1773-lint/.no_build | 0 .../{ => integration}/issue1773-lint/dub.json | 0 .../issue1773-lint/source/app.d | 0 test/{ => integration}/issue1775/.no_run | 0 test/{ => integration}/issue1775/.no_test | 0 test/{ => integration}/issue1775/dub.json | 0 .../issue1775/issue1775.marker | 0 test/{ => integration}/issue1775/source/app.d | 0 .../b/dub.sdl | 0 .../b/source/b/foo.d | 0 .../b/views/layout.diet | 0 .../c/dub.sdl | 0 .../c/source/dummy.d | 0 .../c/views/fancylayout.diet | 0 .../dub.sdl | 0 .../source/app.d | 0 .../views/layout.diet | 0 .../issue1856-build-unittest.sh | 0 test/{ => integration}/issue1867-lowmem.sh | 0 .../issue1867-lowmem/.gitignore | 0 .../issue1867-lowmem/.no_build | 0 .../issue1867-lowmem/.no_run | 0 .../issue1867-lowmem/.no_test | 0 .../issue1867-lowmem/dub.sdl | 0 .../issue1867-lowmem/dub.settings.json | 0 .../issue1867-lowmem/source/app.d | 0 .../issue2012-dc-env/.no_build | 0 test/{ => integration}/issue2012-dc-env/app.d | 0 .../.no_build | 0 .../.no_run | 0 .../.no_test | 0 .../dub.json | 0 .../dub.selections.json-nofoo | 0 .../dub.selections.json-usefoo | 0 .../libbar/dub.json | 0 .../libbar/source/libbar/bar.d | 0 .../libfoo/dub.json | 0 .../libfoo/source/libfoo/foo.d | 0 .../source/app.d | 0 ...ests_from_dub_single_file_packages_fails.d | 0 .../issue2085-target-none-visuald.sh | 0 .../issue2085-target-none-visuald/.no_build | 0 .../issue2085-target-none-visuald/.no_run | 0 .../issue2085-target-none-visuald/dub.json | 0 .../sub/dub.json | 0 .../sub/source/app.d | 0 ...sue2086-copyfiles-subpackage-targetpath.sh | 0 .../.no_run | 0 .../.no_test | 0 .../dub.json | 0 .../sub/dub.json | 0 .../sub/files/to_be_deployed.txt | 0 .../sub/source/app.d | 0 .../issue2190-unset-TEMP.script.d | 0 .../issue2192-environment-variables.sh | 0 .../issue2192-environment-variables/.no_run | 0 .../issue2192-environment-variables/dub.sdl | 0 .../source/lib.d | 0 .../issue2234-copy-read-only-files.script.d | 0 .../issue2234-copy-read-only-files/.gitignore | 0 .../issue2234-copy-read-only-files/dub.json | 0 .../files/images/to_be_deployed.img | 0 .../files/to_be_deployed.bin | 0 .../source/app.d | 0 .../issue2258-dynLib-exe-dep/.no_build_dmd | 0 .../issue2258-dynLib-exe-dep/.no_build_gdc | 0 .../issue2258-dynLib-exe-dep/dub.json | 0 .../issue2258-dynLib-exe-dep/source/app.d | 0 .../issue2262-exact-cached-version-match.sh | 0 .../.no_build | 0 .../dub.sdl | 0 .../source/app.d | 0 .../issue2348-postbuildcommands.script.d | 0 .../issue2377-dynLib-dep-extra-files.script.d | 0 .../.gitignore | 0 .../.no_build | 0 .../dep1/dub.sdl | 0 .../dep1/source/dep1.d | 0 .../dep2/dub.sdl | 0 .../dep2/source/dep2.d | 0 .../framework/dub.sdl | 0 .../parent/dub.sdl | 0 .../parent/source/app.d | 0 .../parent/source/parent.d | 0 test/{ => integration}/issue2448/dub.json | 0 test/{ => integration}/issue2448/ext/kekw.d | 0 test/{ => integration}/issue2448/source/app.d | 0 test/{ => integration}/issue2452/.no_test | 0 test/{ => integration}/issue2452/dub.json | 0 test/{ => integration}/issue2452/source/app.d | 0 .../issue2574-mistyping-commands.sh | 0 ...ue2587-subpackage-dependency-resolution.sh | 0 .../.no_build | 0 .../.no_run | 0 .../.no_test | 0 .../a/.gitignore | 0 .../a/dub.json | 0 .../a/source/app.d | 0 .../b/.gitignore | 0 .../b/dub.json | 0 .../b/source/b.d | 0 .../c/.gitignore | 0 .../c/dub.json | 0 .../c/source/c.d | 0 .../issue2650-deprecated-modules/.no_build | 0 .../issue2650-deprecated-modules/.no_run | 0 .../issue2650-deprecated-modules/dub.sdl | 0 .../source/test.d | 0 .../issue2684-recipe-file.sh | 0 .../issue2684-recipe-file/.gitignore | 0 .../issue2684-recipe-file/anotherSource/app.d | 0 .../issue2684-recipe-file/dub.json | 0 .../dubWithAnotherSource.json | 0 .../issue2684-recipe-file/source/app.d | 0 .../c_headers/foo.h | 0 .../dub.sdl | 0 .../source/app.d | 0 .../source/foo.c | 0 .../issue2840-build-collision.sh | 0 .../issue2840-build-collision/.no_build | 0 .../issue2840-build-collision/build.d | 0 .../issue346-redundant-flags.sh | 0 .../issue346-redundant-flags/.no_build | 0 .../issue346-redundant-flags/.no_run | 0 .../issue346-redundant-flags/.no_test | 0 .../issue346-redundant-flags/a/dub.json | 0 .../issue346-redundant-flags/a/source/a.d | 0 .../issue346-redundant-flags/b/dub.json | 0 .../issue346-redundant-flags/b/source/b.d | 0 .../issue346-redundant-flags/main/dub.json | 0 .../main/source/main.d | 0 .../issue361-optional-deps.sh | 0 .../issue361-optional-deps/.no_build | 0 .../issue361-optional-deps/a/dub.sdl | 0 .../issue361-optional-deps/a/src/a.d | 0 .../issue361-optional-deps/b/dub.sdl | 0 .../issue361-optional-deps/b/src/b.d | 0 .../issue361-optional-deps/main1/dub.sdl | 0 .../issue361-optional-deps/main1/src/main1.d | 0 .../issue361-optional-deps/main2/dub.sdl | 0 .../main2/dub.selections.json | 0 .../issue361-optional-deps/main2/src/main2.d | 0 .../issue502-root-import/dub.json | 0 .../issue502-root-import/source/app.d | 0 .../issue564-invalid-upgrade-dependency.sh | 0 .../.no_build | 0 .../.no_run | 0 .../.no_test | 0 .../a-1.0.0/dub.json | 0 .../a-1.0.0/source/a.d | 0 .../a-1.1.0/dub.json | 0 .../a-1.1.0/source/a.d | 0 .../main/dub.json | 0 .../main/dub.selections.json | 0 .../main/source/app.d | 0 .../{ => integration}/issue586-subpack-dep.sh | 0 .../issue586-subpack-dep/.no_build | 0 .../issue586-subpack-dep/.no_run | 0 .../issue586-subpack-dep/.no_test | 0 .../issue586-subpack-dep/a/b/dub.sdl | 0 .../issue586-subpack-dep/a/b/source/b.d | 0 .../issue586-subpack-dep/a/dub.sdl | 0 .../issue586-subpack-dep/a/source/a.d | 0 .../issue586-subpack-dep/main/dub.sdl | 0 .../main/dub.selections.json | 0 .../issue586-subpack-dep/main/source/c.d | 0 test/{ => integration}/issue613-dynlib-pic.sh | 0 .../issue613-dynlib-pic/.gitignore | 0 .../issue613-dynlib-pic/.no_build | 0 .../issue613-dynlib-pic/.no_run | 0 .../issue613-dynlib-pic/.no_test | 0 .../issue613-dynlib-pic/dub.sdl | 0 .../issue613-dynlib-pic/source/app.d | 0 .../issue616-describe-vs-generate-commands.sh | 0 .../.no_build | 0 .../do-preGenerateCommands.sh | 0 .../dub.json | 0 .../src/dummy.d | 0 .../issue616-subpack/.no_build | 0 .../issue616-subpack/dub.json | 0 .../issue616-subpack/src/dummy.d | 0 .../issue616-subsubpack/.no_build | 0 .../issue616-subsubpack/dub.json | 0 .../issue616-subsubpack/src/dummy.d | 0 .../issue672-upgrade-optional.sh | 0 .../issue672-upgrade-optional/.no_build | 0 .../issue672-upgrade-optional/dub.sdl | 0 .../dub.selections.json | 0 .../issue674-concurrent-dub.sh | 0 .../issue686-multiple-march.sh | 0 .../issue686-multiple-march/.no_build | 0 .../issue686-multiple-march/.no_run | 0 .../issue686-multiple-march/.no_test | 0 .../issue686-multiple-march/a/dub.json | 0 .../issue686-multiple-march/a/source/a.d | 0 .../issue686-multiple-march/b/dub.json | 0 .../issue686-multiple-march/b/source/b.d | 0 .../issue686-multiple-march/main/dub.json | 0 .../main/source/main.d | 0 .../a-1.0/dub.sdl | 0 .../a-1.0/source/a.d | 0 .../a-2.0/dub.sdl | 0 .../issue754-path-selection-fail/dub.sdl | 0 .../dub.selections.json | 0 .../issue754-path-selection-fail/source/app.d | 0 .../issue777-bogus-path-dependency/b/a.d | 0 .../issue777-bogus-path-dependency/b/dub.sdl | 0 .../c-err/dub.sdl | 0 .../c-err/source/lib.d | 0 .../issue777-bogus-path-dependency/c/dub.sdl | 0 .../c/source/lib.d | 0 .../issue777-bogus-path-dependency/dub.sdl | 0 .../dub.selections.json | 0 .../source/app.d | 0 .../issue782-gtkd-pkg-config.sh | 0 .../issue782-gtkd-pkg-config.sh.min_frontend | 0 .../issue782-gtkd-pkg-config/.no_build | 0 .../issue782-gtkd-pkg-config/.no_run | 0 .../issue782-gtkd-pkg-config/.no_test | 0 .../fake-gtkd/dub.json | 0 .../fake-gtkd/pkgconfig/fake-gtkd.pc | 0 .../fake-gtkd/src/fakegtkd.d | 0 .../fake-gtkd/src/lib.d | 0 .../issue782-gtkd-pkg-config/main/dub.json | 0 .../issue782-gtkd-pkg-config/main/src/app.d | 0 .../issue813-fixed-dependency.sh | 0 .../issue813-fixed-dependency/.no_build | 0 .../issue813-fixed-dependency/main/dub.sdl | 0 .../main/dub.selections.json | 0 .../issue813-fixed-dependency/main/src/app.d | 0 .../issue813-fixed-dependency/sub/dub.sdl | 0 .../issue813-fixed-dependency/sub/sub/dub.sdl | 0 .../sub/sub/src/sub/test.d | 0 .../issue813-pure-sub-dependency.sh | 0 .../issue813-pure-sub-dependency/.no_build | 0 .../issue813-pure-sub-dependency/main/dub.sdl | 0 .../main/src/app.d | 0 .../issue813-pure-sub-dependency/sub/dub.sdl | 0 .../sub/sub/dub.sdl | 0 .../sub/sub/src/sub/test.d | 0 .../issue820-extra-fields-after-convert.sh | 0 .../issue838-custom-cache-paths.sh | 0 .../issue838-custom-cache-paths/.no_build | 0 .../cache/foo/1.0.0/foo/dub.sdl | 0 .../issue838-custom-cache-paths/dub.sdl | 0 .../issue838-custom-cache-paths/source/app.d | 0 .../issue877-auto-fetch-package-on-run.sh | 0 .../issue884-init-defer-file-creation.sh | 0 .../issue895-local-configuration.sh | 0 .../issue923-subpackage-deps.sh | 0 .../issue923-subpackage-deps/.no_build | 0 .../issue923-subpackage-deps/a/dub.sdl | 0 .../issue923-subpackage-deps/b/dub.sdl | 0 .../issue923-subpackage-deps/b/source/b.d | 0 .../issue923-subpackage-deps/main/dub.sdl | 0 .../main/source/app.d | 0 test/{ => integration}/issue934-path-dep.sh | 0 .../issue934-path-dep/.no_build | 0 .../issue934-path-dep/a/dub.sdl | 0 .../issue934-path-dep/b/dub.sdl | 0 .../issue934-path-dep/b/source/b.d | 0 .../issue934-path-dep/main/dub.sdl | 0 .../issue934-path-dep/main/source/app.d | 0 .../issue959-path-based-subpack-dep/dub.sdl | 0 .../foo/dub.sdl | 0 .../issue959-path-based-subpack-dep/main.d | 0 .../.fail_build | 0 .../issue97-targettype-none-nodeps/.gitignore | 0 .../issue97-targettype-none-nodeps/.no_run | 0 .../issue97-targettype-none-nodeps/a/dub.sdl | 0 .../a/source/app.d | 0 .../issue97-targettype-none-nodeps/b/dub.sdl | 0 .../b/source/app.d | 0 .../issue97-targettype-none-nodeps/dub.sdl | 0 .../.gitignore | 0 .../issue97-targettype-none-onerecipe/.no_run | 0 .../.no_test | 0 .../a/source/app.d | 0 .../b/source/app.d | 0 .../issue97-targettype-none-onerecipe/dub.sdl | 0 .../issue97-targettype-none.sh | 0 .../issue97-targettype-none/.no_build | 0 .../issue97-targettype-none/.no_run | 0 .../issue97-targettype-none/a/dub.sdl | 0 .../issue97-targettype-none/a/source/app.d | 0 .../issue97-targettype-none/b/dub.sdl | 0 .../issue97-targettype-none/b/source/app.d | 0 .../issue97-targettype-none/dub.sdl | 0 .../issue990-download-optional-selected.sh | 0 .../.no_build | 0 .../dub.sdl | 0 .../dub.selections.json | 0 .../source/app.d | 0 test/{ => integration}/mutex-main-1/.no_run | 0 test/{ => integration}/mutex-main-1/.no_test | 0 test/{ => integration}/mutex-main-1/dub.json | 0 .../mutex-main-1/source/app.d | 0 .../mutex-main-1/source/app2.d | 0 test/{ => integration}/mutex-main-2/.no_run | 0 test/{ => integration}/mutex-main-2/.no_test | 0 test/{ => integration}/mutex-main-2/dub.json | 0 .../mutex-main-2/source/app.d | 0 .../mutex-main-2/source/app2.d | 0 .../mutex-main-3/.fail_build | 0 test/{ => integration}/mutex-main-3/.no_run | 0 test/{ => integration}/mutex-main-3/.no_test | 0 test/{ => integration}/mutex-main-3/dub.json | 0 .../mutex-main-3/source/app.d | 0 .../mutex-main-3/source/app2.d | 0 .../path-subpackage-ref/dub.json | 0 .../path-subpackage-ref/source/app.d | 0 .../path-subpackage-ref/subpack/dub.json | 0 .../path-subpackage-ref/subpack/source/lib.d | 0 test/{ => integration}/pr1549-dub-exe-var.sh | 0 .../pr1549-dub-exe-var/.gitignore | 0 .../pr1549-dub-exe-var/.no_build | 0 .../pr1549-dub-exe-var/dub.sdl | 0 .../pr1549-dub-exe-var/setmsg.d | 0 .../pr1549-dub-exe-var/source/app.d | 0 .../pr2642-cache-db/.gitignore | 0 .../pr2642-cache-db/.no_test | 0 .../{ => integration}/pr2642-cache-db/dub.sdl | 0 .../pr2642-cache-db/source/test_cache_db.d | 0 .../pr2644-describe-artifact-path/.gitignore | 0 .../pr2644-describe-artifact-path/.no_test | 0 .../pr2644-describe-artifact-path/dub.sdl | 0 .../source/describe_artifact_path.d | 0 .../pr2647-build-deep/.gitignore | 0 .../pr2647-build-deep/.no_test | 0 .../pr2647-build-deep/dub.sdl | 0 .../pr2647-build-deep/pack/dub.sdl | 0 .../pr2647-build-deep/pack/source/lib.d | 0 .../source/test_build_deep.d | 0 test/{ => integration}/removed-dub-obj.sh | 0 .../removed-dub-obj/.no_build | 0 .../{ => integration}/removed-dub-obj/.no_run | 0 .../removed-dub-obj/.no_test | 0 .../{ => integration}/removed-dub-obj/dub.sdl | 0 .../removed-dub-obj/source/test.d | 0 .../run-test.d} | 4 +-- .../run-test.sh} | 0 .../sdl-package-simple/dub.sdl | 0 .../sdl-package-simple/source/app.d | 0 .../single-file-sdl-default-name.d | 0 .../single-file-sdl-default-name.sh | 0 ...package-common-with-sourcefile-globbing.sh | 0 .../.no_build | 0 .../code/mypackage/client/app.d | 0 .../code/mypackage/client/extra.d | 0 .../code/mypackage/common/blah.d | 0 .../code/mypackage/server/app.d | 0 .../code/mypackage/server/extra.d | 0 .../dub.sdl | 0 .../{ => integration}/subpackage-ref/dub.json | 0 .../subpackage-ref/source/app.d | 0 .../test-upgrade-subpackages.sh | 0 test/{ => integration}/test-version-opt.sh | 0 test/{ => integration}/test_registry.d | 0 test/{ => integration}/timeout.sh | 0 test/{ => integration}/unittest-cov-ctfe.sh | 0 .../unittest-cov-ctfe/.no_build | 0 .../unittest-cov-ctfe/.no_run | 0 .../unittest-cov-ctfe/.no_test | 0 .../unittest-cov-ctfe/dub.sdl | 0 .../unittest-cov-ctfe/source/mod.d | 0 .../use-c-sources/.min_frontend | 0 .../use-c-sources/.no_build_gdc | 0 test/{ => integration}/use-c-sources/dub.json | 0 .../use-c-sources/source/app.d | 0 .../use-c-sources/source/some_c_code.c | 0 .../use-c-sources/source/some_c_code.h | 0 .../version-filters-diamond/.gitignore | 0 .../version-filters-diamond/.no_build | 0 .../version-filters-diamond/.no_run | 0 .../version-filters-diamond/.no_test | 0 .../daughter/.gitignore | 0 .../version-filters-diamond/daughter/dub.sdl | 0 .../daughter/source/dummy.d | 0 .../diamond/.gitignore | 0 .../version-filters-diamond/diamond/dub.sdl | 0 .../diamond/source/dummy.d | 0 .../version-filters-diamond/dub.sdl | 0 .../version-filters-diamond/son/.gitignore | 0 .../version-filters-diamond/son/dub.sdl | 0 .../son/source/dummy.d | 0 .../version-filters-diamond/source/app.d | 0 .../version-filters-none/.gitignore | 0 .../version-filters-none/.no_build | 0 .../version-filters-none/.no_run | 0 .../version-filters-none/.no_test | 0 .../version-filters-none/dub.sdl | 0 .../version-filters-none/source/app.d | 0 .../version-filters-source-dep/.gitignore | 0 .../version-filters-source-dep/.no_build | 0 .../version-filters-source-dep/.no_run | 0 .../version-filters-source-dep/.no_test | 0 .../version-filters-source-dep/dub.sdl | 0 .../source-dep/dub.sdl | 0 .../source-dep/source/dummy.d | 0 .../version-filters-source-dep/source/app.d | 0 test/{ => integration}/version-filters.sh | 0 .../version-filters/.gitignore | 0 .../version-filters/.no_build | 0 .../{ => integration}/version-filters/.no_run | 0 .../version-filters/.no_test | 0 .../version-filters/daughter/.gitignore | 0 .../version-filters/daughter/dub.sdl | 0 .../version-filters/daughter/source/dummy.d | 0 .../{ => integration}/version-filters/dub.sdl | 0 .../version-filters/son/.gitignore | 0 .../version-filters/son/dub.sdl | 0 .../version-filters/son/source/dummy.d | 0 .../version-filters/source/app.d | 0 test/{ => integration}/version-spec.sh | 0 test/{ => integration}/version-spec/.no_build | 0 test/{ => integration}/version-spec/.no_run | 0 test/{ => integration}/version-spec/.no_test | 0 .../version-spec/newfoo/dub.sdl | 0 .../version-spec/newfoo/source/app.d | 0 .../version-spec/oldfoo/dub.sdl | 0 .../version-spec/oldfoo/source/app.d | 0 test/{ => integration}/win32_default.d | 0 test/{ => integration}/win32_default.script.d | 0 {source => test/unit}/dub/test/base.d | 0 {source => test/unit}/dub/test/dependencies.d | 0 {source => test/unit}/dub/test/others.d | 0 .../dub/test/selections_from_parent_dir.d | 0 {source => test/unit}/dub/test/subpackages.d | 0 885 files changed, 60 insertions(+), 55 deletions(-) delete mode 100644 test/dub-custom-root-2/source/app.d delete mode 100644 test/dub-custom-root/source/app.d rename test/{ => integration}/.gitignore (99%) rename test/{ => integration}/0-init-fail-json.script.d (100%) rename test/{ => integration}/0-init-fail.sh (100%) rename test/{ => integration}/0-init-interactive.default_name.dub.sdl (100%) rename test/{ => integration}/0-init-interactive.dub.json (100%) rename test/{ => integration}/0-init-interactive.dub.sdl (100%) rename test/{ => integration}/0-init-interactive.license_gpl3.dub.sdl (100%) rename test/{ => integration}/0-init-interactive.license_mpl2.dub.sdl (100%) rename test/{ => integration}/0-init-interactive.license_proprietary.dub.sdl (100%) rename test/{ => integration}/0-init-interactive.sh (100%) rename test/{ => integration}/0-init-multi-json.sh (100%) rename test/{ => integration}/0-init-multi.sh (100%) rename test/{ => integration}/0-init-simple-json.sh (100%) rename test/{ => integration}/0-init-simple.sh (100%) rename test/{ => integration}/1-dynLib-simple/.no_build_gdc (100%) rename test/{ => integration}/1-dynLib-simple/.no_run (100%) rename test/{ => integration}/1-dynLib-simple/dub.json (100%) rename test/{ => integration}/1-dynLib-simple/source/dynlib/app.d (100%) rename test/{ => integration}/1-exec-simple-package-json/package.json (100%) rename test/{ => integration}/1-exec-simple-package-json/source/app.d (100%) rename test/{ => integration}/1-exec-simple/dub.json (100%) rename test/{ => integration}/1-exec-simple/source/app.d (100%) rename test/{ => integration}/1-sourceLib-simple/.no_build (100%) rename test/{ => integration}/1-sourceLib-simple/dub.json (100%) rename test/{ => integration}/1-sourceLib-simple/source/sourcelib/app.d (100%) rename test/{ => integration}/1-staticLib-simple/.no_run (100%) rename test/{ => integration}/1-staticLib-simple/dub.json (100%) rename test/{ => integration}/1-staticLib-simple/source/staticlib/app.d (100%) rename test/{ => integration}/2-dynLib-dep/.no_build_windows (100%) rename test/{ => integration}/2-dynLib-dep/dub.json (100%) rename test/{ => integration}/2-dynLib-dep/source/app.d (100%) rename test/{ => integration}/2-dynLib-with-staticLib-dep/.no_build_gdc (100%) rename test/{ => integration}/2-dynLib-with-staticLib-dep/.no_run (100%) rename test/{ => integration}/2-dynLib-with-staticLib-dep/dub.json (100%) rename test/{ => integration}/2-dynLib-with-staticLib-dep/source/dynlib/app.d (100%) rename test/{ => integration}/2-sourceLib-dep/dub.json (100%) rename test/{ => integration}/2-sourceLib-dep/source/app.d (100%) rename test/{ => integration}/2-staticLib-dep/dub.json (100%) rename test/{ => integration}/2-staticLib-dep/source/app.d (100%) rename test/{ => integration}/3-copyFiles/.no_test (100%) rename test/{ => integration}/3-copyFiles/data/file_to_copy.txt (100%) rename test/{ => integration}/3-copyFiles/data/file_to_copy_mask1.txt (100%) rename test/{ => integration}/3-copyFiles/data/file_to_copy_mask2.txt (100%) rename test/{ => integration}/3-copyFiles/data/res/.nocopy/file_inside_dot_prefixed_dir.txt (100%) rename test/{ => integration}/3-copyFiles/data/res/hdpi/file1.txt (100%) rename test/{ => integration}/3-copyFiles/data/res/hdpi/file2.txt (100%) rename test/{ => integration}/3-copyFiles/data/res/hdpi/file3.txt (100%) rename test/{ => integration}/3-copyFiles/data/res/hdpi/nested_dir/nested_file.txt (100%) rename test/{ => integration}/3-copyFiles/data/res/i18n/resource_en.txt (100%) rename test/{ => integration}/3-copyFiles/data/res/i18n/resource_fr.txt (100%) rename test/{ => integration}/3-copyFiles/data/res/ldpi/file1.txt (100%) rename test/{ => integration}/3-copyFiles/data/res/ldpi/file2.txt (100%) rename test/{ => integration}/3-copyFiles/data/res/ldpi/file3.txt (100%) rename test/{ => integration}/3-copyFiles/data/res/mdpi/file1.txt (100%) rename test/{ => integration}/3-copyFiles/data/res/mdpi/file2.txt (100%) rename test/{ => integration}/3-copyFiles/data/res/mdpi/file3.txt (100%) rename test/{ => integration}/3-copyFiles/dub.json (100%) rename test/{ => integration}/3-copyFiles/source/app.d (100%) rename test/{ => integration}/4-describe-data-1-list.sh (100%) rename test/{ => integration}/4-describe-data-2-dmd.sh (100%) rename test/{ => integration}/4-describe-data-3-zero-delim.sh (100%) rename test/{ => integration}/4-describe-data-check-escape (100%) rename test/{ => integration}/4-describe-import-paths.sh (100%) rename test/{ => integration}/4-describe-json.sh (100%) rename test/{ => integration}/4-describe-string-import-paths.sh (100%) rename test/{ => integration}/5-convert-stdout.sh (100%) rename test/{ => integration}/5-convert.sh (100%) rename test/{ => integration}/5-convert/.no_build (100%) rename test/{ => integration}/5-convert/dub.sdl (100%) rename test/{ => integration}/cache-generated-test-config.sh (100%) rename test/{ => integration}/cache-generated-test-config/.no_build (100%) rename test/{ => integration}/cache-generated-test-config/.no_run (100%) rename test/{ => integration}/cache-generated-test-config/.no_test (100%) rename test/{ => integration}/cache-generated-test-config/dub.sdl (100%) rename test/{ => integration}/cache-generated-test-config/source/test.d (100%) rename test/{ => integration}/colored-output.sh (100%) rename test/{ => integration}/common.sh (100%) rename test/{ => integration}/common/.no_build (100%) rename test/{ => integration}/common/.no_run (100%) rename test/{ => integration}/common/.no_test (100%) rename test/{ => integration}/common/dub.sdl (100%) rename test/{ => integration}/common/source/common.d (100%) rename test/{ => integration}/cov-ctfe.sh (100%) rename test/{ => integration}/cov-ctfe/.no_build (100%) rename test/{ => integration}/cov-ctfe/.no_run (100%) rename test/{ => integration}/cov-ctfe/.no_test (100%) rename test/{ => integration}/cov-ctfe/dub.sdl (100%) rename test/{ => integration}/cov-ctfe/test.d (100%) rename test/{ => integration}/custom-source-main-bug487/.gitignore (100%) rename test/{ => integration}/custom-source-main-bug487/.no_run (100%) rename test/{ => integration}/custom-source-main-bug487/.no_test (100%) rename test/{ => integration}/custom-source-main-bug487/dub.json (100%) rename test/{ => integration}/custom-source-main-bug487/mysrc/app.d (100%) rename test/{ => integration}/custom-unittest/dub.json (100%) rename test/{ => integration}/custom-unittest/source/app.d (100%) rename test/{ => integration}/custom-unittest/source/lib.d (100%) rename test/{ => integration}/custom-unittest/test/main.d (100%) rename test/{ => integration}/d-versions.sh (100%) rename test/{ => integration}/d-versions/.gitignore (100%) rename test/{ => integration}/d-versions/.no_build (100%) rename test/{ => integration}/d-versions/.no_run (100%) rename test/{ => integration}/d-versions/.no_test (100%) rename test/{ => integration}/d-versions/dub.sdl (100%) rename test/{ => integration}/d-versions/source/app.d (100%) rename test/{ => integration}/dc-env.sh (100%) rename test/{ => integration}/ddox.sh (100%) rename test/{ => integration}/ddox.sh.min_frontend (100%) rename test/{ => integration}/ddox/.no_build (100%) rename test/{ => integration}/ddox/custom-tool/.gitignore (100%) rename test/{ => integration}/ddox/custom-tool/dub.sdl (100%) rename test/{ => integration}/ddox/custom-tool/public/copied (100%) rename test/{ => integration}/ddox/custom-tool/source/app.d (100%) rename test/{ => integration}/ddox/custom/.gitignore (100%) rename test/{ => integration}/ddox/custom/dub.sdl (100%) rename test/{ => integration}/ddox/custom/source/ddox_project.d (100%) rename test/{ => integration}/ddox/default/.gitignore (100%) rename test/{ => integration}/ddox/default/dub.sdl (100%) rename test/{ => integration}/ddox/default/source/ddox_project.d (100%) rename test/{ => integration}/depen-build-settings/.gitignore (100%) rename test/{ => integration}/depen-build-settings/.no_build_dmd (100%) rename test/{ => integration}/depen-build-settings/.no_build_gdc (100%) rename test/{ => integration}/depen-build-settings/.no_test (100%) rename test/{ => integration}/depen-build-settings/depend/depend2/dub.json (100%) rename test/{ => integration}/depen-build-settings/depend/depend2/source/depend2.d (100%) rename test/{ => integration}/depen-build-settings/depend/dub.json (100%) rename test/{ => integration}/depen-build-settings/depend/source/depend.d (100%) rename test/{ => integration}/depen-build-settings/dub.json (100%) rename test/{ => integration}/depen-build-settings/dub.selections.json (100%) rename test/{ => integration}/depen-build-settings/source/app.d (100%) rename test/{ => integration}/describe-dependency-1/.no_build (100%) rename test/{ => integration}/describe-dependency-1/data/dummy-dep1.dat (100%) rename test/{ => integration}/describe-dependency-1/dependency-postGenerateCommands.sh (100%) rename test/{ => integration}/describe-dependency-1/dependency-preGenerateCommands.sh (100%) rename test/{ => integration}/describe-dependency-1/dub.json (100%) rename test/{ => integration}/describe-dependency-1/otherdir/dummy.d (100%) rename test/{ => integration}/describe-dependency-1/source/dummy.d (100%) rename test/{ => integration}/describe-dependency-2/.no_build (100%) rename test/{ => integration}/describe-dependency-2/dub.json (100%) rename test/{ => integration}/describe-dependency-2/some-extra-string-import-path/dummy.d (100%) rename test/{ => integration}/describe-dependency-2/some-path/dummy.d (100%) rename test/{ => integration}/describe-dependency-3/.no_build (100%) rename test/{ => integration}/describe-dependency-3/dep3-source/dummy.d (100%) rename test/{ => integration}/describe-dependency-3/dep3-string-import-path/dummy.d (100%) rename test/{ => integration}/describe-dependency-3/dub.json (100%) rename test/{ => integration}/describe-project/.no_build (100%) rename test/{ => integration}/describe-project/data/dummy.dat (100%) rename test/{ => integration}/describe-project/do-postGenerateCommands.sh (100%) rename test/{ => integration}/describe-project/do-preGenerateCommands.sh (100%) rename test/{ => integration}/describe-project/dub.json (100%) rename test/{ => integration}/describe-project/src/dummy.d (100%) rename test/{ => integration}/describe-project/views/dummy.d (100%) rename test/{ => integration}/dpath-variable.sh (100%) rename test/{ => integration}/dpath-variable/.gitignore (100%) rename test/{ => integration}/dpath-variable/dub.json (100%) rename test/{ => integration}/dpath-variable/source/app.d (100%) rename test/{ => integration}/dub-as-a-library-cwd.sh (100%) rename test/{ => integration}/dub-as-a-library-cwd/.gitignore (100%) rename test/{ => integration}/dub-as-a-library-cwd/.no_test (100%) rename test/{ => integration}/dub-as-a-library-cwd/dub.json (81%) rename test/{ => integration}/dub-as-a-library-cwd/source/app.d (100%) rename test/{ => integration}/dub-as-a-library-cwd/subproject/dub.sdl (100%) rename test/{ => integration}/dub-as-a-library-cwd/subproject/source/app.d (100%) rename test/{ => integration}/dub-custom-root-2/.gitignore (100%) rename test/{ => integration}/dub-custom-root-2/.no_run (100%) rename test/{ => integration}/dub-custom-root-2/.no_test (100%) rename test/{ => integration}/dub-custom-root-2/dub.json (100%) create mode 100644 test/integration/dub-custom-root-2/source/app.d rename test/{ => integration}/dub-custom-root.sh (100%) rename test/{ => integration}/dub-custom-root/.gitignore (100%) rename test/{ => integration}/dub-custom-root/.no_run (100%) rename test/{ => integration}/dub-custom-root/.no_test (100%) rename test/{ => integration}/dub-custom-root/dub.json (100%) create mode 100644 test/integration/dub-custom-root/source/app.d rename test/{ => integration}/dub_test_root.sh (100%) rename test/{ => integration}/dustmite-no-redirect-test/.no_build (100%) rename test/{ => integration}/dustmite-no-redirect-test/project/dub.json (100%) rename test/{ => integration}/dustmite-no-redirect-test/project/source/app.d (100%) rename test/{ => integration}/dustmite-no-redirect.sh (100%) rename test/{ => integration}/environment-variables.script.d (100%) rename test/{ => integration}/environment-variables/.gitignore (100%) rename test/{ => integration}/environment-variables/.no_build (100%) rename test/{ => integration}/environment-variables/.no_run (100%) rename test/{ => integration}/environment-variables/.no_test (100%) rename test/{ => integration}/environment-variables/deppkg/dub.json (100%) rename test/{ => integration}/environment-variables/deppkg/source/deppkg/foo.d (100%) rename test/{ => integration}/environment-variables/dub.json (100%) rename test/{ => integration}/environment-variables/dub.settings.json (100%) rename test/{ => integration}/environment-variables/source/app.d (100%) rename test/{ => integration}/expected-issue1037-output (100%) rename test/{ => integration}/feat663-search.sh (100%) rename test/{ => integration}/fetchzip.sh (100%) rename test/{ => integration}/fetchzip.sh.min_frontend (100%) rename test/{ => integration}/filesystem-version-with-buildinfo.sh (100%) rename test/{ => integration}/filesystem-version-with-buildinfo/.no_build (100%) rename test/{ => integration}/filesystem-version-with-buildinfo/fs-json-dubpackage-1.0.7+build-9-9-9.zip (100%) rename test/{ => integration}/git-dependency/dub.json (100%) rename test/{ => integration}/git-dependency/src/app.d (100%) rename test/{ => integration}/help.sh (100%) rename test/{ => integration}/ignore-hidden-1/.gitignore (100%) rename test/{ => integration}/ignore-hidden-1/.no_run (100%) rename test/{ => integration}/ignore-hidden-1/.no_test (100%) rename test/{ => integration}/ignore-hidden-1/dub.json (100%) rename test/{ => integration}/ignore-hidden-1/source/.hidden.d (100%) rename test/{ => integration}/ignore-hidden-1/source/app.d (100%) rename test/{ => integration}/ignore-hidden-2/.gitignore (100%) rename test/{ => integration}/ignore-hidden-2/.no_run (100%) rename test/{ => integration}/ignore-hidden-2/.no_test (100%) rename test/{ => integration}/ignore-hidden-2/dub.json (100%) rename test/{ => integration}/ignore-hidden-2/source/.hidden.d (100%) rename test/{ => integration}/ignore-hidden-2/source/app.d (100%) rename test/{ => integration}/ignore-useless-arch-switch/.no_test (100%) rename test/{ => integration}/ignore-useless-arch-switch/dub.sdl (100%) rename test/{ => integration}/ignore-useless-arch-switch/source/app.d (100%) rename test/{ => integration}/injected-from-dependency/.no_test (100%) rename test/{ => integration}/injected-from-dependency/ahook.d (100%) rename test/{ => integration}/injected-from-dependency/dub.json (100%) rename test/{ => integration}/injected-from-dependency/source/entry.d (100%) rename test/{ => integration}/injected-from-dependency/toload/vars.d (100%) rename test/{ => integration}/interactive-remove.sh (100%) rename test/{ => integration}/issue1003-check-empty-ld-flags.sh (100%) rename test/{ => integration}/issue1003-check-empty-ld-flags/dub.json (100%) rename test/{ => integration}/issue1003-check-empty-ld-flags/source/app.d (100%) rename test/{ => integration}/issue1004-override-config.sh (100%) rename test/{ => integration}/issue1004-override-config/.no_build (100%) rename test/{ => integration}/issue1004-override-config/a/a.d (100%) rename test/{ => integration}/issue1004-override-config/a/dub.sdl (100%) rename test/{ => integration}/issue1004-override-config/main/dub.sdl (100%) rename test/{ => integration}/issue1004-override-config/main/source/main.d (100%) rename test/{ => integration}/issue1005-configuration-resolution.sh (100%) rename test/{ => integration}/issue1005-configuration-resolution/.no_build (100%) rename test/{ => integration}/issue1005-configuration-resolution/a/dub.sdl (100%) rename test/{ => integration}/issue1005-configuration-resolution/b/dub.sdl (100%) rename test/{ => integration}/issue1005-configuration-resolution/b/source/b.d (100%) rename test/{ => integration}/issue1005-configuration-resolution/c/dub.sdl (100%) rename test/{ => integration}/issue1005-configuration-resolution/main/dub.sdl (100%) rename test/{ => integration}/issue1005-configuration-resolution/main/source/app.d (100%) rename test/{ => integration}/issue1024-selective-upgrade.sh (100%) rename test/{ => integration}/issue1024-selective-upgrade/.no_build (100%) rename test/{ => integration}/issue1024-selective-upgrade/a-1.0.0/dub.sdl (100%) rename test/{ => integration}/issue1024-selective-upgrade/a-1.0.1/dub.sdl (100%) rename test/{ => integration}/issue1024-selective-upgrade/b-1.0.0/dub.sdl (100%) rename test/{ => integration}/issue1024-selective-upgrade/b-1.0.1/dub.sdl (100%) rename test/{ => integration}/issue1024-selective-upgrade/main/dub.sdl (100%) rename test/{ => integration}/issue103-single-file-package-json.d (100%) rename test/{ => integration}/issue103-single-file-package-no-ext (92%) rename test/{ => integration}/issue103-single-file-package-w-dep.d (100%) rename test/{ => integration}/issue103-single-file-package.d (92%) rename test/{ => integration}/issue103-single-file-package.sh (100%) rename test/{ => integration}/issue1037-better-dependency-messages.sh (100%) rename test/{ => integration}/issue1037-better-dependency-messages/.no_build (100%) rename test/{ => integration}/issue1037-better-dependency-messages/.no_run (100%) rename test/{ => integration}/issue1037-better-dependency-messages/.no_test (100%) rename test/{ => integration}/issue1037-better-dependency-messages/b/dub.json (100%) rename test/{ => integration}/issue1037-better-dependency-messages/dub.json (100%) rename test/{ => integration}/issue1040-run-with-ver.sh (100%) rename test/{ => integration}/issue1053-extra-files-visuald.sh (100%) rename test/{ => integration}/issue1053-extra-files-visuald/dub.json (100%) rename test/{ => integration}/issue1053-extra-files-visuald/shaders/saturate.vert (100%) rename test/{ => integration}/issue1053-extra-files-visuald/shaders/warp.geom (100%) rename test/{ => integration}/issue1053-extra-files-visuald/source/app.d (100%) rename test/{ => integration}/issue1053-extra-files-visuald/text/LICENSE.txt (100%) rename test/{ => integration}/issue1053-extra-files-visuald/text/README.txt (100%) rename test/{ => integration}/issue1070-init-mistakes-dirs-as-files.sh (100%) rename test/{ => integration}/issue1070-init-mistakes-dirs-as-files/.no_build (100%) rename test/{ => integration}/issue1070-init-mistakes-dirs-as-files/.no_run (100%) rename test/{ => integration}/issue1070-init-mistakes-dirs-as-files/.no_test (100%) rename test/{ => integration}/issue1070-init-mistakes-dirs-as-files/source/.empty (100%) rename test/{ => integration}/issue1091-bogus-rebuild.sh (100%) rename test/{ => integration}/issue1117-extra-dependency-files.sh (100%) rename test/{ => integration}/issue1117-extra-dependency-files/.gitignore (100%) rename test/{ => integration}/issue1117-extra-dependency-files/.no_build (100%) rename test/{ => integration}/issue1117-extra-dependency-files/dependency.txt (100%) rename test/{ => integration}/issue1117-extra-dependency-files/dub.json (100%) rename test/{ => integration}/issue1117-extra-dependency-files/source/app.d (100%) rename test/{ => integration}/issue1136-temp-copy-files.sh (100%) rename test/{ => integration}/issue1136-temp-copy-files/.no_build (100%) rename test/{ => integration}/issue1136-temp-copy-files/app.d (100%) rename test/{ => integration}/issue1136-temp-copy-files/mylib/dub.sdl (100%) rename test/{ => integration}/issue1136-temp-copy-files/mylib/helloworld.txt (100%) rename test/{ => integration}/issue1158-stdin-for-single-files.sh (100%) rename test/{ => integration}/issue1158-stdin-for-single-files/.no_build (100%) rename test/{ => integration}/issue1158-stdin-for-single-files/stdin.d (100%) rename test/{ => integration}/issue1180-local-cache-broken.sh (100%) rename test/{ => integration}/issue1180-local-cache-broken.sh.min_frontend (100%) rename test/{ => integration}/issue1180-local-cache-broken/.gitignore (100%) rename test/{ => integration}/issue1180-local-cache-broken/.no_build (100%) rename test/{ => integration}/issue1180-local-cache-broken/dub.json (100%) rename test/{ => integration}/issue1180-local-cache-broken/source/app.d (100%) rename test/{ => integration}/issue1194-warn-wrong-subconfig.sh (100%) rename test/{ => integration}/issue1194-warn-wrong-subconfig/.no_build (100%) rename test/{ => integration}/issue1194-warn-wrong-subconfig/dub.sdl (100%) rename test/{ => integration}/issue1194-warn-wrong-subconfig/source/app.d (100%) rename test/{ => integration}/issue1262-version-inheritance-diamond/.gitignore (100%) rename test/{ => integration}/issue1262-version-inheritance-diamond/.no_run (100%) rename test/{ => integration}/issue1262-version-inheritance-diamond/.no_test (100%) rename test/{ => integration}/issue1262-version-inheritance-diamond/daughter/.gitignore (100%) rename test/{ => integration}/issue1262-version-inheritance-diamond/daughter/dub.sdl (100%) rename test/{ => integration}/issue1262-version-inheritance-diamond/daughter/source/dummy.d (100%) rename test/{ => integration}/issue1262-version-inheritance-diamond/diamond/.gitignore (100%) rename test/{ => integration}/issue1262-version-inheritance-diamond/diamond/dub.sdl (100%) rename test/{ => integration}/issue1262-version-inheritance-diamond/diamond/source/dummy.d (100%) rename test/{ => integration}/issue1262-version-inheritance-diamond/dub.sdl (100%) rename test/{ => integration}/issue1262-version-inheritance-diamond/son/.gitignore (100%) rename test/{ => integration}/issue1262-version-inheritance-diamond/son/dub.sdl (100%) rename test/{ => integration}/issue1262-version-inheritance-diamond/son/source/dummy.d (100%) rename test/{ => integration}/issue1262-version-inheritance-diamond/source/app.d (100%) rename test/{ => integration}/issue1262-version-inheritance/.gitignore (100%) rename test/{ => integration}/issue1262-version-inheritance/.no_run (100%) rename test/{ => integration}/issue1262-version-inheritance/.no_test (100%) rename test/{ => integration}/issue1262-version-inheritance/daughter/.gitignore (100%) rename test/{ => integration}/issue1262-version-inheritance/daughter/dub.sdl (100%) rename test/{ => integration}/issue1262-version-inheritance/daughter/source/dummy.d (100%) rename test/{ => integration}/issue1262-version-inheritance/dub.sdl (100%) rename test/{ => integration}/issue1262-version-inheritance/son/.gitignore (100%) rename test/{ => integration}/issue1262-version-inheritance/son/dub.sdl (100%) rename test/{ => integration}/issue1262-version-inheritance/son/source/dummy.d (100%) rename test/{ => integration}/issue1262-version-inheritance/source/app.d (100%) rename test/{ => integration}/issue1277.sh (100%) rename test/{ => integration}/issue1277/.no_build (100%) rename test/{ => integration}/issue1277/source/app.d (100%) rename "test/issue130-unicode-\320\241\320\235\320\220\320\257\320\220\320\241\320\242\320\225\320\257\320\205/dub.sdl" => "test/integration/issue130-unicode-\320\241\320\235\320\220\320\257\320\220\320\241\320\242\320\225\320\257\320\205/dub.sdl" (100%) rename "test/issue130-unicode-\320\241\320\235\320\220\320\257\320\220\320\241\320\242\320\225\320\257\320\205/source/app.d" => "test/integration/issue130-unicode-\320\241\320\235\320\220\320\257\320\220\320\241\320\242\320\225\320\257\320\205/source/app.d" (100%) rename test/{ => integration}/issue1336-registry/.gitignore (100%) rename test/{ => integration}/issue1336-registry/.no_build (100%) rename test/{ => integration}/issue1336-registry/api/packages/infos__packages=%5B%22gitcompatibledubpackage%22%5D&include_dependencies=true&minimize=true (100%) rename test/{ => integration}/issue1336-registry/packages/gitcompatibledubpackage/1.0.2.zip (100%) rename test/{ => integration}/issue1336-registry/packages/gitcompatibledubpackage/1.0.3.zip (100%) rename test/{ => integration}/issue1336-registry/packages/gitcompatibledubpackage/1.0.4.zip (100%) rename test/{ => integration}/issue1350-transitive-none-deps/.gitignore (100%) rename test/{ => integration}/issue1350-transitive-none-deps/.no_run (100%) rename test/{ => integration}/issue1350-transitive-none-deps/.no_test (100%) rename test/{ => integration}/issue1350-transitive-none-deps/common-dep/common.d (100%) rename test/{ => integration}/issue1350-transitive-none-deps/common-dep/dub.sdl (100%) rename test/{ => integration}/issue1350-transitive-none-deps/common-none/dub.sdl (100%) rename test/{ => integration}/issue1350-transitive-none-deps/dep1/dep1.d (100%) rename test/{ => integration}/issue1350-transitive-none-deps/dep1/dub.sdl (100%) rename test/{ => integration}/issue1350-transitive-none-deps/dep2/dep2.d (100%) rename test/{ => integration}/issue1350-transitive-none-deps/dep2/dub.sdl (100%) rename test/{ => integration}/issue1350-transitive-none-deps/dub.sdl (100%) rename test/{ => integration}/issue1350-transitive-none-deps/test.d (100%) rename test/{ => integration}/issue1372-ignore-files-in-hidden-dirs.sh (100%) rename test/{ => integration}/issue1372-ignore-files-in-hidden-dirs/.hiddensource/hello.d (100%) rename test/{ => integration}/issue1372-ignore-files-in-hidden-dirs/dub.json (100%) rename test/{ => integration}/issue1372-ignore-files-in-hidden-dirs/source/.AppleDouble/app.d (100%) rename test/{ => integration}/issue1372-ignore-files-in-hidden-dirs/source/.compileMe/hello.d (100%) rename test/{ => integration}/issue1372-ignore-files-in-hidden-dirs/source/app.d (100%) rename test/{ => integration}/issue1396-pre-post-run-commands.sh (100%) rename test/{ => integration}/issue1396-pre-post-run-commands/.no_build (100%) rename test/{ => integration}/issue1396-pre-post-run-commands/dub.sdl (100%) rename test/{ => integration}/issue1396-pre-post-run-commands/post-run.sh (100%) rename test/{ => integration}/issue1396-pre-post-run-commands/source/app.d (100%) rename test/{ => integration}/issue1401-file-system-pkg-supplier/.no_build (100%) rename test/{ => integration}/issue1401-file-system-pkg-supplier/fs-json-dubpackage-1.0.7.zip (100%) rename test/{ => integration}/issue1401-file-system-pkg-supplier/fs-sdl-dubpackage-1.0.5.zip (100%) rename test/{ => integration}/issue1401-file-system-pkg-supplier/fs-sdl-dubpackage-1.0.6.zip (100%) rename test/{ => integration}/issue1401-filesystem-supplier.sh (100%) rename test/{ => integration}/issue1408-inherit-linker-files/.no_run (100%) rename test/{ => integration}/issue1408-inherit-linker-files/.no_test (100%) rename test/{ => integration}/issue1408-inherit-linker-files/dep.d (100%) rename test/{ => integration}/issue1408-inherit-linker-files/dub.sdl (100%) rename test/{ => integration}/issue1408-inherit-linker-files/lib.d (100%) rename test/{ => integration}/issue1408-inherit-linker-files/lib/dub.sdl (100%) rename test/{ => integration}/issue1408-inherit-linker-files/lib/lib.d (100%) rename test/{ => integration}/issue1408-inherit-linker-files/main.d (100%) rename test/{ => integration}/issue1416-maven-repo-pkg-supplier.sh (100%) rename test/{ => integration}/issue1416-maven-repo-pkg-supplier.sh.min_frontend (100%) rename test/{ => integration}/issue1416-maven-repo-pkg-supplier/.gitignore (100%) rename test/{ => integration}/issue1416-maven-repo-pkg-supplier/.no_build (100%) rename test/{ => integration}/issue1416-maven-repo-pkg-supplier/maven/release/dubpackages/maven-dubpackage/1.0.5/maven-dubpackage-1.0.5.zip (100%) rename test/{ => integration}/issue1416-maven-repo-pkg-supplier/maven/release/dubpackages/maven-dubpackage/1.0.6/maven-dubpackage-1.0.6.zip (100%) rename test/{ => integration}/issue1416-maven-repo-pkg-supplier/maven/release/dubpackages/maven-dubpackage/maven-metadata.xml (100%) rename test/{ => integration}/issue1427-betterC/.gitignore (100%) rename test/{ => integration}/issue1427-betterC/.min_frontend (100%) rename test/{ => integration}/issue1427-betterC/.no_run (100%) rename test/{ => integration}/issue1427-betterC/.no_test (100%) rename test/{ => integration}/issue1427-betterC/dub.json (100%) rename test/{ => integration}/issue1427-betterC/source/app.d (100%) rename test/{ => integration}/issue1447-build-settings-vars.sh (100%) rename test/{ => integration}/issue1447-build-settings-vars/.no_run (100%) rename test/{ => integration}/issue1447-build-settings-vars/.no_test (100%) rename test/{ => integration}/issue1447-build-settings-vars/dub.json (100%) rename test/{ => integration}/issue1447-build-settings-vars/source/app.d (100%) rename test/{ => integration}/issue1447-build-settings-vars/view-aarch64/arch (100%) rename test/{ => integration}/issue1447-build-settings-vars/view-x86/arch (100%) rename test/{ => integration}/issue1447-build-settings-vars/view-x86_64/arch (100%) rename test/{ => integration}/issue1474-generate-source.script.d (100%) rename test/{ => integration}/issue1474/.no_build (100%) rename test/{ => integration}/issue1474/dub.json (100%) rename test/{ => integration}/issue1474/ext/kekw.d (100%) rename test/{ => integration}/issue1474/source/app.d (100%) rename test/{ => integration}/issue1477-subpackage-visuald-paths.sh (100%) rename test/{ => integration}/issue1477-subpackage-visuald-paths/.no_build (100%) rename test/{ => integration}/issue1477-subpackage-visuald-paths/dub.sdl (100%) rename test/{ => integration}/issue1477-subpackage-visuald-paths/source/library.d (100%) rename test/{ => integration}/issue1477-subpackage-visuald-paths/sub/subpackage_a/dub.sdl (100%) rename test/{ => integration}/issue1477-subpackage-visuald-paths/sub/subpackage_a/source/subpackage_a.d (100%) rename test/{ => integration}/issue1504-envvar-in-path.sh (100%) rename test/{ => integration}/issue1504-envvar-in-path/.no_build (100%) rename test/{ => integration}/issue1504-envvar-in-path/dub.json (100%) rename test/{ => integration}/issue1504-envvar-in-path/source/app.d (100%) rename test/{ => integration}/issue1504-envvar-in-path/teststrings/message.txt (100%) rename test/{ => integration}/issue1505-single-file-package-dynamic-library.d (100%) rename test/{ => integration}/issue1505-single-file-package-dynamic-library.sh (100%) rename test/{ => integration}/issue1524-maven-upgrade-dependency-tree.sh (100%) rename test/{ => integration}/issue1524-maven-upgrade-dependency-tree.sh.min_frontend (100%) rename test/{ => integration}/issue1524-maven-upgrade-dependency-tree/.gitignore (100%) rename test/{ => integration}/issue1524-maven-upgrade-dependency-tree/.no_build (100%) rename test/{ => integration}/issue1524-maven-upgrade-dependency-tree/dub.json (100%) rename test/{ => integration}/issue1524-maven-upgrade-dependency-tree/maven/release/dubpackages/maven-dubpackage-a/1.0.5/maven-dubpackage-a-1.0.5.zip (100%) rename test/{ => integration}/issue1524-maven-upgrade-dependency-tree/maven/release/dubpackages/maven-dubpackage-a/maven-metadata.xml (100%) rename test/{ => integration}/issue1524-maven-upgrade-dependency-tree/maven/release/dubpackages/maven-dubpackage-b/1.0.6/maven-dubpackage-b-1.0.6.zip (100%) rename test/{ => integration}/issue1524-maven-upgrade-dependency-tree/maven/release/dubpackages/maven-dubpackage-b/maven-metadata.xml (100%) rename test/{ => integration}/issue1524-maven-upgrade-dependency-tree/source/app.d (100%) rename test/{ => integration}/issue1531-toolchain-requirements.sh (100%) rename test/{ => integration}/issue1551-var-escaping/dub.json (100%) rename test/{ => integration}/issue1551-var-escaping/source/app.d (100%) rename test/{ => integration}/issue1556-fetch-and-build-pkgs/.no_build (100%) rename test/{ => integration}/issue1556-fetch-and-build-pkgs/dependency-package-1.0.0.zip (100%) rename test/{ => integration}/issue1556-fetch-and-build-pkgs/main-package-1.0.0.zip (100%) rename test/{ => integration}/issue1556-fetch-and-build.sh (100%) rename test/{ => integration}/issue1567-fetch-sub-package.sh (100%) rename test/{ => integration}/issue1567-fetch-sub-package/.no_build (100%) rename test/{ => integration}/issue1567-fetch-sub-package/.no_run (100%) rename test/{ => integration}/issue1567-fetch-sub-package/.no_test (100%) rename test/{ => integration}/issue1567-fetch-sub-package/fetch-sub-package-dubpackage-1.0.1.zip (100%) rename test/{ => integration}/issue1574-addcommand.sh (100%) rename test/{ => integration}/issue1574-addcommand.sh.min_frontend (100%) rename test/{ => integration}/issue1636-betterC-dub-test.sh (100%) rename test/{ => integration}/issue1636-betterC-dub-test/.gitignore (100%) rename test/{ => integration}/issue1636-betterC-dub-test/.min_frontend (100%) rename test/{ => integration}/issue1636-betterC-dub-test/.no_run (100%) rename test/{ => integration}/issue1636-betterC-dub-test/dub.json (100%) rename test/{ => integration}/issue1636-betterC-dub-test/source/lib.d (100%) rename test/{ => integration}/issue1645-dflags-build.sh (100%) rename test/{ => integration}/issue1651-custom-dub-init-type.sh (100%) rename test/{ => integration}/issue1651-custom-dub-init-type/.no_build (100%) rename test/{ => integration}/issue1651-custom-dub-init-type/.no_run (100%) rename test/{ => integration}/issue1651-custom-dub-init-type/.no_test (100%) rename test/{ => integration}/issue1651-custom-dub-init-type/custom-dub-init-dubpackage-1.0.1.zip (100%) rename test/{ => integration}/issue1691-build-subpkg.sh (100%) rename test/{ => integration}/issue1691-build-subpkg/.gitignore (100%) rename test/{ => integration}/issue1691-build-subpkg/.no_build (100%) rename test/{ => integration}/issue1691-build-subpkg/dub.sdl (100%) rename test/{ => integration}/issue1691-build-subpkg/source/app.d (100%) rename test/{ => integration}/issue1691-build-subpkg/subpkg/dub.sdl (100%) rename test/{ => integration}/issue1691-build-subpkg/subpkg/source/subpkg.d (100%) rename test/{ => integration}/issue1739-project-settings-file.sh (100%) rename test/{ => integration}/issue1773-lint.sh (100%) rename test/{ => integration}/issue1773-lint/.gitignore (100%) rename test/{ => integration}/issue1773-lint/.no_build (100%) rename test/{ => integration}/issue1773-lint/dub.json (100%) rename test/{ => integration}/issue1773-lint/source/app.d (100%) rename test/{ => integration}/issue1775/.no_run (100%) rename test/{ => integration}/issue1775/.no_test (100%) rename test/{ => integration}/issue1775/dub.json (100%) rename test/{ => integration}/issue1775/issue1775.marker (100%) rename test/{ => integration}/issue1775/source/app.d (100%) rename test/{ => integration}/issue1788-incomplete-string-import-override/b/dub.sdl (100%) rename test/{ => integration}/issue1788-incomplete-string-import-override/b/source/b/foo.d (100%) rename test/{ => integration}/issue1788-incomplete-string-import-override/b/views/layout.diet (100%) rename test/{ => integration}/issue1788-incomplete-string-import-override/c/dub.sdl (100%) rename test/{ => integration}/issue1788-incomplete-string-import-override/c/source/dummy.d (100%) rename test/{ => integration}/issue1788-incomplete-string-import-override/c/views/fancylayout.diet (100%) rename test/{ => integration}/issue1788-incomplete-string-import-override/dub.sdl (100%) rename test/{ => integration}/issue1788-incomplete-string-import-override/source/app.d (100%) rename test/{ => integration}/issue1788-incomplete-string-import-override/views/layout.diet (100%) rename test/{ => integration}/issue1856-build-unittest.sh (100%) rename test/{ => integration}/issue1867-lowmem.sh (100%) rename test/{ => integration}/issue1867-lowmem/.gitignore (100%) rename test/{ => integration}/issue1867-lowmem/.no_build (100%) rename test/{ => integration}/issue1867-lowmem/.no_run (100%) rename test/{ => integration}/issue1867-lowmem/.no_test (100%) rename test/{ => integration}/issue1867-lowmem/dub.sdl (100%) rename test/{ => integration}/issue1867-lowmem/dub.settings.json (100%) rename test/{ => integration}/issue1867-lowmem/source/app.d (100%) rename test/{ => integration}/issue2012-dc-env/.no_build (100%) rename test/{ => integration}/issue2012-dc-env/app.d (100%) rename test/{ => integration}/issue2046-ignored-optional-with-path/.no_build (100%) rename test/{ => integration}/issue2046-ignored-optional-with-path/.no_run (100%) rename test/{ => integration}/issue2046-ignored-optional-with-path/.no_test (100%) rename test/{ => integration}/issue2046-ignored-optional-with-path/dub.json (100%) rename test/{ => integration}/issue2046-ignored-optional-with-path/dub.selections.json-nofoo (100%) rename test/{ => integration}/issue2046-ignored-optional-with-path/dub.selections.json-usefoo (100%) rename test/{ => integration}/issue2046-ignored-optional-with-path/libbar/dub.json (100%) rename test/{ => integration}/issue2046-ignored-optional-with-path/libbar/source/libbar/bar.d (100%) rename test/{ => integration}/issue2046-ignored-optional-with-path/libfoo/dub.json (100%) rename test/{ => integration}/issue2046-ignored-optional-with-path/libfoo/source/libfoo/foo.d (100%) rename test/{ => integration}/issue2046-ignored-optional-with-path/source/app.d (100%) rename test/{ => integration}/issue2051_running_unittests_from_dub_single_file_packages_fails.d (100%) rename test/{ => integration}/issue2085-target-none-visuald.sh (100%) rename test/{ => integration}/issue2085-target-none-visuald/.no_build (100%) rename test/{ => integration}/issue2085-target-none-visuald/.no_run (100%) rename test/{ => integration}/issue2085-target-none-visuald/dub.json (100%) rename test/{ => integration}/issue2085-target-none-visuald/sub/dub.json (100%) rename test/{ => integration}/issue2085-target-none-visuald/sub/source/app.d (100%) rename test/{ => integration}/issue2086-copyfiles-subpackage-targetpath.sh (100%) rename test/{ => integration}/issue2086-copyfiles-subpackage-targetpath/.no_run (100%) rename test/{ => integration}/issue2086-copyfiles-subpackage-targetpath/.no_test (100%) rename test/{ => integration}/issue2086-copyfiles-subpackage-targetpath/dub.json (100%) rename test/{ => integration}/issue2086-copyfiles-subpackage-targetpath/sub/dub.json (100%) rename test/{ => integration}/issue2086-copyfiles-subpackage-targetpath/sub/files/to_be_deployed.txt (100%) rename test/{ => integration}/issue2086-copyfiles-subpackage-targetpath/sub/source/app.d (100%) rename test/{ => integration}/issue2190-unset-TEMP.script.d (100%) rename test/{ => integration}/issue2192-environment-variables.sh (100%) rename test/{ => integration}/issue2192-environment-variables/.no_run (100%) rename test/{ => integration}/issue2192-environment-variables/dub.sdl (100%) rename test/{ => integration}/issue2192-environment-variables/source/lib.d (100%) rename test/{ => integration}/issue2234-copy-read-only-files.script.d (100%) rename test/{ => integration}/issue2234-copy-read-only-files/.gitignore (100%) rename test/{ => integration}/issue2234-copy-read-only-files/dub.json (100%) rename test/{ => integration}/issue2234-copy-read-only-files/files/images/to_be_deployed.img (100%) rename test/{ => integration}/issue2234-copy-read-only-files/files/to_be_deployed.bin (100%) rename test/{ => integration}/issue2234-copy-read-only-files/source/app.d (100%) rename test/{ => integration}/issue2258-dynLib-exe-dep/.no_build_dmd (100%) rename test/{ => integration}/issue2258-dynLib-exe-dep/.no_build_gdc (100%) rename test/{ => integration}/issue2258-dynLib-exe-dep/dub.json (100%) rename test/{ => integration}/issue2258-dynLib-exe-dep/source/app.d (100%) rename test/{ => integration}/issue2262-exact-cached-version-match.sh (100%) rename test/{ => integration}/issue2262-exact-cached-version-match/.no_build (100%) rename test/{ => integration}/issue2262-exact-cached-version-match/dub.sdl (100%) rename test/{ => integration}/issue2262-exact-cached-version-match/source/app.d (100%) rename test/{ => integration}/issue2348-postbuildcommands.script.d (100%) rename test/{ => integration}/issue2377-dynLib-dep-extra-files.script.d (100%) rename test/{ => integration}/issue2377-dynLib-dep-extra-files/.gitignore (100%) rename test/{ => integration}/issue2377-dynLib-dep-extra-files/.no_build (100%) rename test/{ => integration}/issue2377-dynLib-dep-extra-files/dep1/dub.sdl (100%) rename test/{ => integration}/issue2377-dynLib-dep-extra-files/dep1/source/dep1.d (100%) rename test/{ => integration}/issue2377-dynLib-dep-extra-files/dep2/dub.sdl (100%) rename test/{ => integration}/issue2377-dynLib-dep-extra-files/dep2/source/dep2.d (100%) rename test/{ => integration}/issue2377-dynLib-dep-extra-files/framework/dub.sdl (100%) rename test/{ => integration}/issue2377-dynLib-dep-extra-files/parent/dub.sdl (100%) rename test/{ => integration}/issue2377-dynLib-dep-extra-files/parent/source/app.d (100%) rename test/{ => integration}/issue2377-dynLib-dep-extra-files/parent/source/parent.d (100%) rename test/{ => integration}/issue2448/dub.json (100%) rename test/{ => integration}/issue2448/ext/kekw.d (100%) rename test/{ => integration}/issue2448/source/app.d (100%) rename test/{ => integration}/issue2452/.no_test (100%) rename test/{ => integration}/issue2452/dub.json (100%) rename test/{ => integration}/issue2452/source/app.d (100%) rename test/{ => integration}/issue2574-mistyping-commands.sh (100%) rename test/{ => integration}/issue2587-subpackage-dependency-resolution.sh (100%) rename test/{ => integration}/issue2587-subpackage-dependency-resolution/.no_build (100%) rename test/{ => integration}/issue2587-subpackage-dependency-resolution/.no_run (100%) rename test/{ => integration}/issue2587-subpackage-dependency-resolution/.no_test (100%) rename test/{ => integration}/issue2587-subpackage-dependency-resolution/a/.gitignore (100%) rename test/{ => integration}/issue2587-subpackage-dependency-resolution/a/dub.json (100%) rename test/{ => integration}/issue2587-subpackage-dependency-resolution/a/source/app.d (100%) rename test/{ => integration}/issue2587-subpackage-dependency-resolution/b/.gitignore (100%) rename test/{ => integration}/issue2587-subpackage-dependency-resolution/b/dub.json (100%) rename test/{ => integration}/issue2587-subpackage-dependency-resolution/b/source/b.d (100%) rename test/{ => integration}/issue2587-subpackage-dependency-resolution/c/.gitignore (100%) rename test/{ => integration}/issue2587-subpackage-dependency-resolution/c/dub.json (100%) rename test/{ => integration}/issue2587-subpackage-dependency-resolution/c/source/c.d (100%) rename test/{ => integration}/issue2650-deprecated-modules/.no_build (100%) rename test/{ => integration}/issue2650-deprecated-modules/.no_run (100%) rename test/{ => integration}/issue2650-deprecated-modules/dub.sdl (100%) rename test/{ => integration}/issue2650-deprecated-modules/source/test.d (100%) rename test/{ => integration}/issue2684-recipe-file.sh (100%) rename test/{ => integration}/issue2684-recipe-file/.gitignore (100%) rename test/{ => integration}/issue2684-recipe-file/anotherSource/app.d (100%) rename test/{ => integration}/issue2684-recipe-file/dub.json (100%) rename test/{ => integration}/issue2684-recipe-file/dubWithAnotherSource.json (100%) rename test/{ => integration}/issue2684-recipe-file/source/app.d (100%) rename test/{ => integration}/issue2698-cimportpaths-broken-with-dmd-ldc/c_headers/foo.h (100%) rename test/{ => integration}/issue2698-cimportpaths-broken-with-dmd-ldc/dub.sdl (100%) rename test/{ => integration}/issue2698-cimportpaths-broken-with-dmd-ldc/source/app.d (100%) rename test/{ => integration}/issue2698-cimportpaths-broken-with-dmd-ldc/source/foo.c (100%) rename test/{ => integration}/issue2840-build-collision.sh (100%) rename test/{ => integration}/issue2840-build-collision/.no_build (100%) rename test/{ => integration}/issue2840-build-collision/build.d (100%) rename test/{ => integration}/issue346-redundant-flags.sh (100%) rename test/{ => integration}/issue346-redundant-flags/.no_build (100%) rename test/{ => integration}/issue346-redundant-flags/.no_run (100%) rename test/{ => integration}/issue346-redundant-flags/.no_test (100%) rename test/{ => integration}/issue346-redundant-flags/a/dub.json (100%) rename test/{ => integration}/issue346-redundant-flags/a/source/a.d (100%) rename test/{ => integration}/issue346-redundant-flags/b/dub.json (100%) rename test/{ => integration}/issue346-redundant-flags/b/source/b.d (100%) rename test/{ => integration}/issue346-redundant-flags/main/dub.json (100%) rename test/{ => integration}/issue346-redundant-flags/main/source/main.d (100%) rename test/{ => integration}/issue361-optional-deps.sh (100%) rename test/{ => integration}/issue361-optional-deps/.no_build (100%) rename test/{ => integration}/issue361-optional-deps/a/dub.sdl (100%) rename test/{ => integration}/issue361-optional-deps/a/src/a.d (100%) rename test/{ => integration}/issue361-optional-deps/b/dub.sdl (100%) rename test/{ => integration}/issue361-optional-deps/b/src/b.d (100%) rename test/{ => integration}/issue361-optional-deps/main1/dub.sdl (100%) rename test/{ => integration}/issue361-optional-deps/main1/src/main1.d (100%) rename test/{ => integration}/issue361-optional-deps/main2/dub.sdl (100%) rename test/{ => integration}/issue361-optional-deps/main2/dub.selections.json (100%) rename test/{ => integration}/issue361-optional-deps/main2/src/main2.d (100%) rename test/{ => integration}/issue502-root-import/dub.json (100%) rename test/{ => integration}/issue502-root-import/source/app.d (100%) rename test/{ => integration}/issue564-invalid-upgrade-dependency.sh (100%) rename test/{ => integration}/issue564-invalid-upgrade-dependency/.no_build (100%) rename test/{ => integration}/issue564-invalid-upgrade-dependency/.no_run (100%) rename test/{ => integration}/issue564-invalid-upgrade-dependency/.no_test (100%) rename test/{ => integration}/issue564-invalid-upgrade-dependency/a-1.0.0/dub.json (100%) rename test/{ => integration}/issue564-invalid-upgrade-dependency/a-1.0.0/source/a.d (100%) rename test/{ => integration}/issue564-invalid-upgrade-dependency/a-1.1.0/dub.json (100%) rename test/{ => integration}/issue564-invalid-upgrade-dependency/a-1.1.0/source/a.d (100%) rename test/{ => integration}/issue564-invalid-upgrade-dependency/main/dub.json (100%) rename test/{ => integration}/issue564-invalid-upgrade-dependency/main/dub.selections.json (100%) rename test/{ => integration}/issue564-invalid-upgrade-dependency/main/source/app.d (100%) rename test/{ => integration}/issue586-subpack-dep.sh (100%) rename test/{ => integration}/issue586-subpack-dep/.no_build (100%) rename test/{ => integration}/issue586-subpack-dep/.no_run (100%) rename test/{ => integration}/issue586-subpack-dep/.no_test (100%) rename test/{ => integration}/issue586-subpack-dep/a/b/dub.sdl (100%) rename test/{ => integration}/issue586-subpack-dep/a/b/source/b.d (100%) rename test/{ => integration}/issue586-subpack-dep/a/dub.sdl (100%) rename test/{ => integration}/issue586-subpack-dep/a/source/a.d (100%) rename test/{ => integration}/issue586-subpack-dep/main/dub.sdl (100%) rename test/{ => integration}/issue586-subpack-dep/main/dub.selections.json (100%) rename test/{ => integration}/issue586-subpack-dep/main/source/c.d (100%) rename test/{ => integration}/issue613-dynlib-pic.sh (100%) rename test/{ => integration}/issue613-dynlib-pic/.gitignore (100%) rename test/{ => integration}/issue613-dynlib-pic/.no_build (100%) rename test/{ => integration}/issue613-dynlib-pic/.no_run (100%) rename test/{ => integration}/issue613-dynlib-pic/.no_test (100%) rename test/{ => integration}/issue613-dynlib-pic/dub.sdl (100%) rename test/{ => integration}/issue613-dynlib-pic/source/app.d (100%) rename test/{ => integration}/issue616-describe-vs-generate-commands.sh (100%) rename test/{ => integration}/issue616-describe-vs-generate-commands/.no_build (100%) rename test/{ => integration}/issue616-describe-vs-generate-commands/do-preGenerateCommands.sh (100%) rename test/{ => integration}/issue616-describe-vs-generate-commands/dub.json (100%) rename test/{ => integration}/issue616-describe-vs-generate-commands/src/dummy.d (100%) rename test/{ => integration}/issue616-subpack/.no_build (100%) rename test/{ => integration}/issue616-subpack/dub.json (100%) rename test/{ => integration}/issue616-subpack/src/dummy.d (100%) rename test/{ => integration}/issue616-subsubpack/.no_build (100%) rename test/{ => integration}/issue616-subsubpack/dub.json (100%) rename test/{ => integration}/issue616-subsubpack/src/dummy.d (100%) rename test/{ => integration}/issue672-upgrade-optional.sh (100%) rename test/{ => integration}/issue672-upgrade-optional/.no_build (100%) rename test/{ => integration}/issue672-upgrade-optional/dub.sdl (100%) rename test/{ => integration}/issue672-upgrade-optional/dub.selections.json (100%) rename test/{ => integration}/issue674-concurrent-dub.sh (100%) rename test/{ => integration}/issue686-multiple-march.sh (100%) rename test/{ => integration}/issue686-multiple-march/.no_build (100%) rename test/{ => integration}/issue686-multiple-march/.no_run (100%) rename test/{ => integration}/issue686-multiple-march/.no_test (100%) rename test/{ => integration}/issue686-multiple-march/a/dub.json (100%) rename test/{ => integration}/issue686-multiple-march/a/source/a.d (100%) rename test/{ => integration}/issue686-multiple-march/b/dub.json (100%) rename test/{ => integration}/issue686-multiple-march/b/source/b.d (100%) rename test/{ => integration}/issue686-multiple-march/main/dub.json (100%) rename test/{ => integration}/issue686-multiple-march/main/source/main.d (100%) rename test/{ => integration}/issue754-path-selection-fail/a-1.0/dub.sdl (100%) rename test/{ => integration}/issue754-path-selection-fail/a-1.0/source/a.d (100%) rename test/{ => integration}/issue754-path-selection-fail/a-2.0/dub.sdl (100%) rename test/{ => integration}/issue754-path-selection-fail/dub.sdl (100%) rename test/{ => integration}/issue754-path-selection-fail/dub.selections.json (100%) rename test/{ => integration}/issue754-path-selection-fail/source/app.d (100%) rename test/{ => integration}/issue777-bogus-path-dependency/b/a.d (100%) rename test/{ => integration}/issue777-bogus-path-dependency/b/dub.sdl (100%) rename test/{ => integration}/issue777-bogus-path-dependency/c-err/dub.sdl (100%) rename test/{ => integration}/issue777-bogus-path-dependency/c-err/source/lib.d (100%) rename test/{ => integration}/issue777-bogus-path-dependency/c/dub.sdl (100%) rename test/{ => integration}/issue777-bogus-path-dependency/c/source/lib.d (100%) rename test/{ => integration}/issue777-bogus-path-dependency/dub.sdl (100%) rename test/{ => integration}/issue777-bogus-path-dependency/dub.selections.json (100%) rename test/{ => integration}/issue777-bogus-path-dependency/source/app.d (100%) rename test/{ => integration}/issue782-gtkd-pkg-config.sh (100%) rename test/{ => integration}/issue782-gtkd-pkg-config.sh.min_frontend (100%) rename test/{ => integration}/issue782-gtkd-pkg-config/.no_build (100%) rename test/{ => integration}/issue782-gtkd-pkg-config/.no_run (100%) rename test/{ => integration}/issue782-gtkd-pkg-config/.no_test (100%) rename test/{ => integration}/issue782-gtkd-pkg-config/fake-gtkd/dub.json (100%) rename test/{ => integration}/issue782-gtkd-pkg-config/fake-gtkd/pkgconfig/fake-gtkd.pc (100%) rename test/{ => integration}/issue782-gtkd-pkg-config/fake-gtkd/src/fakegtkd.d (100%) rename test/{ => integration}/issue782-gtkd-pkg-config/fake-gtkd/src/lib.d (100%) rename test/{ => integration}/issue782-gtkd-pkg-config/main/dub.json (100%) rename test/{ => integration}/issue782-gtkd-pkg-config/main/src/app.d (100%) rename test/{ => integration}/issue813-fixed-dependency.sh (100%) rename test/{ => integration}/issue813-fixed-dependency/.no_build (100%) rename test/{ => integration}/issue813-fixed-dependency/main/dub.sdl (100%) rename test/{ => integration}/issue813-fixed-dependency/main/dub.selections.json (100%) rename test/{ => integration}/issue813-fixed-dependency/main/src/app.d (100%) rename test/{ => integration}/issue813-fixed-dependency/sub/dub.sdl (100%) rename test/{ => integration}/issue813-fixed-dependency/sub/sub/dub.sdl (100%) rename test/{ => integration}/issue813-fixed-dependency/sub/sub/src/sub/test.d (100%) rename test/{ => integration}/issue813-pure-sub-dependency.sh (100%) rename test/{ => integration}/issue813-pure-sub-dependency/.no_build (100%) rename test/{ => integration}/issue813-pure-sub-dependency/main/dub.sdl (100%) rename test/{ => integration}/issue813-pure-sub-dependency/main/src/app.d (100%) rename test/{ => integration}/issue813-pure-sub-dependency/sub/dub.sdl (100%) rename test/{ => integration}/issue813-pure-sub-dependency/sub/sub/dub.sdl (100%) rename test/{ => integration}/issue813-pure-sub-dependency/sub/sub/src/sub/test.d (100%) rename test/{ => integration}/issue820-extra-fields-after-convert.sh (100%) rename test/{ => integration}/issue838-custom-cache-paths.sh (100%) rename test/{ => integration}/issue838-custom-cache-paths/.no_build (100%) rename test/{ => integration}/issue838-custom-cache-paths/cache/foo/1.0.0/foo/dub.sdl (100%) rename test/{ => integration}/issue838-custom-cache-paths/dub.sdl (100%) rename test/{ => integration}/issue838-custom-cache-paths/source/app.d (100%) rename test/{ => integration}/issue877-auto-fetch-package-on-run.sh (100%) rename test/{ => integration}/issue884-init-defer-file-creation.sh (100%) rename test/{ => integration}/issue895-local-configuration.sh (100%) rename test/{ => integration}/issue923-subpackage-deps.sh (100%) rename test/{ => integration}/issue923-subpackage-deps/.no_build (100%) rename test/{ => integration}/issue923-subpackage-deps/a/dub.sdl (100%) rename test/{ => integration}/issue923-subpackage-deps/b/dub.sdl (100%) rename test/{ => integration}/issue923-subpackage-deps/b/source/b.d (100%) rename test/{ => integration}/issue923-subpackage-deps/main/dub.sdl (100%) rename test/{ => integration}/issue923-subpackage-deps/main/source/app.d (100%) rename test/{ => integration}/issue934-path-dep.sh (100%) rename test/{ => integration}/issue934-path-dep/.no_build (100%) rename test/{ => integration}/issue934-path-dep/a/dub.sdl (100%) rename test/{ => integration}/issue934-path-dep/b/dub.sdl (100%) rename test/{ => integration}/issue934-path-dep/b/source/b.d (100%) rename test/{ => integration}/issue934-path-dep/main/dub.sdl (100%) rename test/{ => integration}/issue934-path-dep/main/source/app.d (100%) rename test/{ => integration}/issue959-path-based-subpack-dep/dub.sdl (100%) rename test/{ => integration}/issue959-path-based-subpack-dep/foo/dub.sdl (100%) rename test/{ => integration}/issue959-path-based-subpack-dep/main.d (100%) rename test/{ => integration}/issue97-targettype-none-nodeps/.fail_build (100%) rename test/{ => integration}/issue97-targettype-none-nodeps/.gitignore (100%) rename test/{ => integration}/issue97-targettype-none-nodeps/.no_run (100%) rename test/{ => integration}/issue97-targettype-none-nodeps/a/dub.sdl (100%) rename test/{ => integration}/issue97-targettype-none-nodeps/a/source/app.d (100%) rename test/{ => integration}/issue97-targettype-none-nodeps/b/dub.sdl (100%) rename test/{ => integration}/issue97-targettype-none-nodeps/b/source/app.d (100%) rename test/{ => integration}/issue97-targettype-none-nodeps/dub.sdl (100%) rename test/{ => integration}/issue97-targettype-none-onerecipe/.gitignore (100%) rename test/{ => integration}/issue97-targettype-none-onerecipe/.no_run (100%) rename test/{ => integration}/issue97-targettype-none-onerecipe/.no_test (100%) rename test/{ => integration}/issue97-targettype-none-onerecipe/a/source/app.d (100%) rename test/{ => integration}/issue97-targettype-none-onerecipe/b/source/app.d (100%) rename test/{ => integration}/issue97-targettype-none-onerecipe/dub.sdl (100%) rename test/{ => integration}/issue97-targettype-none.sh (100%) rename test/{ => integration}/issue97-targettype-none/.no_build (100%) rename test/{ => integration}/issue97-targettype-none/.no_run (100%) rename test/{ => integration}/issue97-targettype-none/a/dub.sdl (100%) rename test/{ => integration}/issue97-targettype-none/a/source/app.d (100%) rename test/{ => integration}/issue97-targettype-none/b/dub.sdl (100%) rename test/{ => integration}/issue97-targettype-none/b/source/app.d (100%) rename test/{ => integration}/issue97-targettype-none/dub.sdl (100%) rename test/{ => integration}/issue990-download-optional-selected.sh (100%) rename test/{ => integration}/issue990-download-optional-selected/.no_build (100%) rename test/{ => integration}/issue990-download-optional-selected/dub.sdl (100%) rename test/{ => integration}/issue990-download-optional-selected/dub.selections.json (100%) rename test/{ => integration}/issue990-download-optional-selected/source/app.d (100%) rename test/{ => integration}/mutex-main-1/.no_run (100%) rename test/{ => integration}/mutex-main-1/.no_test (100%) rename test/{ => integration}/mutex-main-1/dub.json (100%) rename test/{ => integration}/mutex-main-1/source/app.d (100%) rename test/{ => integration}/mutex-main-1/source/app2.d (100%) rename test/{ => integration}/mutex-main-2/.no_run (100%) rename test/{ => integration}/mutex-main-2/.no_test (100%) rename test/{ => integration}/mutex-main-2/dub.json (100%) rename test/{ => integration}/mutex-main-2/source/app.d (100%) rename test/{ => integration}/mutex-main-2/source/app2.d (100%) rename test/{ => integration}/mutex-main-3/.fail_build (100%) rename test/{ => integration}/mutex-main-3/.no_run (100%) rename test/{ => integration}/mutex-main-3/.no_test (100%) rename test/{ => integration}/mutex-main-3/dub.json (100%) rename test/{ => integration}/mutex-main-3/source/app.d (100%) rename test/{ => integration}/mutex-main-3/source/app2.d (100%) rename test/{ => integration}/path-subpackage-ref/dub.json (100%) rename test/{ => integration}/path-subpackage-ref/source/app.d (100%) rename test/{ => integration}/path-subpackage-ref/subpack/dub.json (100%) rename test/{ => integration}/path-subpackage-ref/subpack/source/lib.d (100%) rename test/{ => integration}/pr1549-dub-exe-var.sh (100%) rename test/{ => integration}/pr1549-dub-exe-var/.gitignore (100%) rename test/{ => integration}/pr1549-dub-exe-var/.no_build (100%) rename test/{ => integration}/pr1549-dub-exe-var/dub.sdl (100%) rename test/{ => integration}/pr1549-dub-exe-var/setmsg.d (100%) rename test/{ => integration}/pr1549-dub-exe-var/source/app.d (100%) rename test/{ => integration}/pr2642-cache-db/.gitignore (100%) rename test/{ => integration}/pr2642-cache-db/.no_test (100%) rename test/{ => integration}/pr2642-cache-db/dub.sdl (100%) rename test/{ => integration}/pr2642-cache-db/source/test_cache_db.d (100%) rename test/{ => integration}/pr2644-describe-artifact-path/.gitignore (100%) rename test/{ => integration}/pr2644-describe-artifact-path/.no_test (100%) rename test/{ => integration}/pr2644-describe-artifact-path/dub.sdl (100%) rename test/{ => integration}/pr2644-describe-artifact-path/source/describe_artifact_path.d (100%) rename test/{ => integration}/pr2647-build-deep/.gitignore (100%) rename test/{ => integration}/pr2647-build-deep/.no_test (100%) rename test/{ => integration}/pr2647-build-deep/dub.sdl (100%) rename test/{ => integration}/pr2647-build-deep/pack/dub.sdl (100%) rename test/{ => integration}/pr2647-build-deep/pack/source/lib.d (100%) rename test/{ => integration}/pr2647-build-deep/source/test_build_deep.d (100%) rename test/{ => integration}/removed-dub-obj.sh (100%) rename test/{ => integration}/removed-dub-obj/.no_build (100%) rename test/{ => integration}/removed-dub-obj/.no_run (100%) rename test/{ => integration}/removed-dub-obj/.no_test (100%) rename test/{ => integration}/removed-dub-obj/dub.sdl (100%) rename test/{ => integration}/removed-dub-obj/source/test.d (100%) rename test/{run-unittest.d => integration/run-test.d} (98%) rename test/{run-unittest.sh => integration/run-test.sh} (100%) rename test/{ => integration}/sdl-package-simple/dub.sdl (100%) rename test/{ => integration}/sdl-package-simple/source/app.d (100%) rename test/{ => integration}/single-file-sdl-default-name.d (100%) rename test/{ => integration}/single-file-sdl-default-name.sh (100%) rename test/{ => integration}/subpackage-common-with-sourcefile-globbing.sh (100%) rename test/{ => integration}/subpackage-common-with-sourcefile-globbing/.no_build (100%) rename test/{ => integration}/subpackage-common-with-sourcefile-globbing/code/mypackage/client/app.d (100%) rename test/{ => integration}/subpackage-common-with-sourcefile-globbing/code/mypackage/client/extra.d (100%) rename test/{ => integration}/subpackage-common-with-sourcefile-globbing/code/mypackage/common/blah.d (100%) rename test/{ => integration}/subpackage-common-with-sourcefile-globbing/code/mypackage/server/app.d (100%) rename test/{ => integration}/subpackage-common-with-sourcefile-globbing/code/mypackage/server/extra.d (100%) rename test/{ => integration}/subpackage-common-with-sourcefile-globbing/dub.sdl (100%) rename test/{ => integration}/subpackage-ref/dub.json (100%) rename test/{ => integration}/subpackage-ref/source/app.d (100%) rename test/{ => integration}/test-upgrade-subpackages.sh (100%) rename test/{ => integration}/test-version-opt.sh (100%) rename test/{ => integration}/test_registry.d (100%) rename test/{ => integration}/timeout.sh (100%) rename test/{ => integration}/unittest-cov-ctfe.sh (100%) rename test/{ => integration}/unittest-cov-ctfe/.no_build (100%) rename test/{ => integration}/unittest-cov-ctfe/.no_run (100%) rename test/{ => integration}/unittest-cov-ctfe/.no_test (100%) rename test/{ => integration}/unittest-cov-ctfe/dub.sdl (100%) rename test/{ => integration}/unittest-cov-ctfe/source/mod.d (100%) rename test/{ => integration}/use-c-sources/.min_frontend (100%) rename test/{ => integration}/use-c-sources/.no_build_gdc (100%) rename test/{ => integration}/use-c-sources/dub.json (100%) rename test/{ => integration}/use-c-sources/source/app.d (100%) rename test/{ => integration}/use-c-sources/source/some_c_code.c (100%) rename test/{ => integration}/use-c-sources/source/some_c_code.h (100%) rename test/{ => integration}/version-filters-diamond/.gitignore (100%) rename test/{ => integration}/version-filters-diamond/.no_build (100%) rename test/{ => integration}/version-filters-diamond/.no_run (100%) rename test/{ => integration}/version-filters-diamond/.no_test (100%) rename test/{ => integration}/version-filters-diamond/daughter/.gitignore (100%) rename test/{ => integration}/version-filters-diamond/daughter/dub.sdl (100%) rename test/{ => integration}/version-filters-diamond/daughter/source/dummy.d (100%) rename test/{ => integration}/version-filters-diamond/diamond/.gitignore (100%) rename test/{ => integration}/version-filters-diamond/diamond/dub.sdl (100%) rename test/{ => integration}/version-filters-diamond/diamond/source/dummy.d (100%) rename test/{ => integration}/version-filters-diamond/dub.sdl (100%) rename test/{ => integration}/version-filters-diamond/son/.gitignore (100%) rename test/{ => integration}/version-filters-diamond/son/dub.sdl (100%) rename test/{ => integration}/version-filters-diamond/son/source/dummy.d (100%) rename test/{ => integration}/version-filters-diamond/source/app.d (100%) rename test/{ => integration}/version-filters-none/.gitignore (100%) rename test/{ => integration}/version-filters-none/.no_build (100%) rename test/{ => integration}/version-filters-none/.no_run (100%) rename test/{ => integration}/version-filters-none/.no_test (100%) rename test/{ => integration}/version-filters-none/dub.sdl (100%) rename test/{ => integration}/version-filters-none/source/app.d (100%) rename test/{ => integration}/version-filters-source-dep/.gitignore (100%) rename test/{ => integration}/version-filters-source-dep/.no_build (100%) rename test/{ => integration}/version-filters-source-dep/.no_run (100%) rename test/{ => integration}/version-filters-source-dep/.no_test (100%) rename test/{ => integration}/version-filters-source-dep/dub.sdl (100%) rename test/{ => integration}/version-filters-source-dep/source-dep/dub.sdl (100%) rename test/{ => integration}/version-filters-source-dep/source-dep/source/dummy.d (100%) rename test/{ => integration}/version-filters-source-dep/source/app.d (100%) rename test/{ => integration}/version-filters.sh (100%) rename test/{ => integration}/version-filters/.gitignore (100%) rename test/{ => integration}/version-filters/.no_build (100%) rename test/{ => integration}/version-filters/.no_run (100%) rename test/{ => integration}/version-filters/.no_test (100%) rename test/{ => integration}/version-filters/daughter/.gitignore (100%) rename test/{ => integration}/version-filters/daughter/dub.sdl (100%) rename test/{ => integration}/version-filters/daughter/source/dummy.d (100%) rename test/{ => integration}/version-filters/dub.sdl (100%) rename test/{ => integration}/version-filters/son/.gitignore (100%) rename test/{ => integration}/version-filters/son/dub.sdl (100%) rename test/{ => integration}/version-filters/son/source/dummy.d (100%) rename test/{ => integration}/version-filters/source/app.d (100%) rename test/{ => integration}/version-spec.sh (100%) rename test/{ => integration}/version-spec/.no_build (100%) rename test/{ => integration}/version-spec/.no_run (100%) rename test/{ => integration}/version-spec/.no_test (100%) rename test/{ => integration}/version-spec/newfoo/dub.sdl (100%) rename test/{ => integration}/version-spec/newfoo/source/app.d (100%) rename test/{ => integration}/version-spec/oldfoo/dub.sdl (100%) rename test/{ => integration}/version-spec/oldfoo/source/app.d (100%) rename test/{ => integration}/win32_default.d (100%) rename test/{ => integration}/win32_default.script.d (100%) rename {source => test/unit}/dub/test/base.d (100%) rename {source => test/unit}/dub/test/dependencies.d (100%) rename {source => test/unit}/dub/test/others.d (100%) rename {source => test/unit}/dub/test/selections_from_parent_dir.d (100%) rename {source => test/unit}/dub/test/subpackages.d (100%) diff --git a/.dockerignore b/.dockerignore index dff9e6951d..28a3e4c299 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,4 +3,4 @@ *.a *.o .dub/ -test/*/.dub/ +test/integration/*/.dub/ diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ad9b767e8b..0a447f20f9 100644 --- a/.github/workflows/main.yml +++ b/.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 diff --git a/.gitignore b/.gitignore index d972db2ce1..e56079af14 100644 --- a/.gitignore +++ b/.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/ diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index 1ca99412e5..2031ec5a8e 100644 --- a/docker/Dockerfile.alpine +++ b/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" ] diff --git a/dub.sdl b/dub.sdl index d9bc0b6591..e8019c31c4 100644 --- a/dub.sdl +++ b/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" diff --git a/scripts/ci/ci.sh b/scripts/ci/ci.sh index bccfd811e7..d356f19ea0 100755 --- a/scripts/ci/ci.sh +++ b/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 diff --git a/test/dub-custom-root-2/source/app.d b/test/dub-custom-root-2/source/app.d deleted file mode 100644 index 5d07423ae0..0000000000 --- a/test/dub-custom-root-2/source/app.d +++ /dev/null @@ -1,12 +0,0 @@ -import std.file; -import std.path; -import std.stdio; -import std.string; - -void main() -{ - // run me from test/ with dub --root=dub-custom-root - string cwd = getcwd.chomp("/"); - assert(cwd.endsWith("test/dub-custom-root-2/source"), cwd); - writeln("ok"); -} diff --git a/test/dub-custom-root/source/app.d b/test/dub-custom-root/source/app.d deleted file mode 100644 index 612dfe01dc..0000000000 --- a/test/dub-custom-root/source/app.d +++ /dev/null @@ -1,10 +0,0 @@ -import std.file; -import std.path; -import std.stdio; - -void main() -{ - // run me from test/ with dub --root=test/dub-custom-root - assert(getcwd.baseName == "test", getcwd); - writeln("ok"); -} diff --git a/test/.gitignore b/test/integration/.gitignore similarity index 99% rename from test/.gitignore rename to test/integration/.gitignore index cfe8d612fc..78cdd93971 100644 --- a/test/.gitignore +++ b/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 diff --git a/test/0-init-fail-json.script.d b/test/integration/0-init-fail-json.script.d similarity index 100% rename from test/0-init-fail-json.script.d rename to test/integration/0-init-fail-json.script.d diff --git a/test/0-init-fail.sh b/test/integration/0-init-fail.sh similarity index 100% rename from test/0-init-fail.sh rename to test/integration/0-init-fail.sh diff --git a/test/0-init-interactive.default_name.dub.sdl b/test/integration/0-init-interactive.default_name.dub.sdl similarity index 100% rename from test/0-init-interactive.default_name.dub.sdl rename to test/integration/0-init-interactive.default_name.dub.sdl diff --git a/test/0-init-interactive.dub.json b/test/integration/0-init-interactive.dub.json similarity index 100% rename from test/0-init-interactive.dub.json rename to test/integration/0-init-interactive.dub.json diff --git a/test/0-init-interactive.dub.sdl b/test/integration/0-init-interactive.dub.sdl similarity index 100% rename from test/0-init-interactive.dub.sdl rename to test/integration/0-init-interactive.dub.sdl diff --git a/test/0-init-interactive.license_gpl3.dub.sdl b/test/integration/0-init-interactive.license_gpl3.dub.sdl similarity index 100% rename from test/0-init-interactive.license_gpl3.dub.sdl rename to test/integration/0-init-interactive.license_gpl3.dub.sdl diff --git a/test/0-init-interactive.license_mpl2.dub.sdl b/test/integration/0-init-interactive.license_mpl2.dub.sdl similarity index 100% rename from test/0-init-interactive.license_mpl2.dub.sdl rename to test/integration/0-init-interactive.license_mpl2.dub.sdl diff --git a/test/0-init-interactive.license_proprietary.dub.sdl b/test/integration/0-init-interactive.license_proprietary.dub.sdl similarity index 100% rename from test/0-init-interactive.license_proprietary.dub.sdl rename to test/integration/0-init-interactive.license_proprietary.dub.sdl diff --git a/test/0-init-interactive.sh b/test/integration/0-init-interactive.sh similarity index 100% rename from test/0-init-interactive.sh rename to test/integration/0-init-interactive.sh diff --git a/test/0-init-multi-json.sh b/test/integration/0-init-multi-json.sh similarity index 100% rename from test/0-init-multi-json.sh rename to test/integration/0-init-multi-json.sh diff --git a/test/0-init-multi.sh b/test/integration/0-init-multi.sh similarity index 100% rename from test/0-init-multi.sh rename to test/integration/0-init-multi.sh diff --git a/test/0-init-simple-json.sh b/test/integration/0-init-simple-json.sh similarity index 100% rename from test/0-init-simple-json.sh rename to test/integration/0-init-simple-json.sh diff --git a/test/0-init-simple.sh b/test/integration/0-init-simple.sh similarity index 100% rename from test/0-init-simple.sh rename to test/integration/0-init-simple.sh diff --git a/test/1-dynLib-simple/.no_build_gdc b/test/integration/1-dynLib-simple/.no_build_gdc similarity index 100% rename from test/1-dynLib-simple/.no_build_gdc rename to test/integration/1-dynLib-simple/.no_build_gdc diff --git a/test/1-dynLib-simple/.no_run b/test/integration/1-dynLib-simple/.no_run similarity index 100% rename from test/1-dynLib-simple/.no_run rename to test/integration/1-dynLib-simple/.no_run diff --git a/test/1-dynLib-simple/dub.json b/test/integration/1-dynLib-simple/dub.json similarity index 100% rename from test/1-dynLib-simple/dub.json rename to test/integration/1-dynLib-simple/dub.json diff --git a/test/1-dynLib-simple/source/dynlib/app.d b/test/integration/1-dynLib-simple/source/dynlib/app.d similarity index 100% rename from test/1-dynLib-simple/source/dynlib/app.d rename to test/integration/1-dynLib-simple/source/dynlib/app.d diff --git a/test/1-exec-simple-package-json/package.json b/test/integration/1-exec-simple-package-json/package.json similarity index 100% rename from test/1-exec-simple-package-json/package.json rename to test/integration/1-exec-simple-package-json/package.json diff --git a/test/1-exec-simple-package-json/source/app.d b/test/integration/1-exec-simple-package-json/source/app.d similarity index 100% rename from test/1-exec-simple-package-json/source/app.d rename to test/integration/1-exec-simple-package-json/source/app.d diff --git a/test/1-exec-simple/dub.json b/test/integration/1-exec-simple/dub.json similarity index 100% rename from test/1-exec-simple/dub.json rename to test/integration/1-exec-simple/dub.json diff --git a/test/1-exec-simple/source/app.d b/test/integration/1-exec-simple/source/app.d similarity index 100% rename from test/1-exec-simple/source/app.d rename to test/integration/1-exec-simple/source/app.d diff --git a/test/1-sourceLib-simple/.no_build b/test/integration/1-sourceLib-simple/.no_build similarity index 100% rename from test/1-sourceLib-simple/.no_build rename to test/integration/1-sourceLib-simple/.no_build diff --git a/test/1-sourceLib-simple/dub.json b/test/integration/1-sourceLib-simple/dub.json similarity index 100% rename from test/1-sourceLib-simple/dub.json rename to test/integration/1-sourceLib-simple/dub.json diff --git a/test/1-sourceLib-simple/source/sourcelib/app.d b/test/integration/1-sourceLib-simple/source/sourcelib/app.d similarity index 100% rename from test/1-sourceLib-simple/source/sourcelib/app.d rename to test/integration/1-sourceLib-simple/source/sourcelib/app.d diff --git a/test/1-staticLib-simple/.no_run b/test/integration/1-staticLib-simple/.no_run similarity index 100% rename from test/1-staticLib-simple/.no_run rename to test/integration/1-staticLib-simple/.no_run diff --git a/test/1-staticLib-simple/dub.json b/test/integration/1-staticLib-simple/dub.json similarity index 100% rename from test/1-staticLib-simple/dub.json rename to test/integration/1-staticLib-simple/dub.json diff --git a/test/1-staticLib-simple/source/staticlib/app.d b/test/integration/1-staticLib-simple/source/staticlib/app.d similarity index 100% rename from test/1-staticLib-simple/source/staticlib/app.d rename to test/integration/1-staticLib-simple/source/staticlib/app.d diff --git a/test/2-dynLib-dep/.no_build_windows b/test/integration/2-dynLib-dep/.no_build_windows similarity index 100% rename from test/2-dynLib-dep/.no_build_windows rename to test/integration/2-dynLib-dep/.no_build_windows diff --git a/test/2-dynLib-dep/dub.json b/test/integration/2-dynLib-dep/dub.json similarity index 100% rename from test/2-dynLib-dep/dub.json rename to test/integration/2-dynLib-dep/dub.json diff --git a/test/2-dynLib-dep/source/app.d b/test/integration/2-dynLib-dep/source/app.d similarity index 100% rename from test/2-dynLib-dep/source/app.d rename to test/integration/2-dynLib-dep/source/app.d diff --git a/test/2-dynLib-with-staticLib-dep/.no_build_gdc b/test/integration/2-dynLib-with-staticLib-dep/.no_build_gdc similarity index 100% rename from test/2-dynLib-with-staticLib-dep/.no_build_gdc rename to test/integration/2-dynLib-with-staticLib-dep/.no_build_gdc diff --git a/test/2-dynLib-with-staticLib-dep/.no_run b/test/integration/2-dynLib-with-staticLib-dep/.no_run similarity index 100% rename from test/2-dynLib-with-staticLib-dep/.no_run rename to test/integration/2-dynLib-with-staticLib-dep/.no_run diff --git a/test/2-dynLib-with-staticLib-dep/dub.json b/test/integration/2-dynLib-with-staticLib-dep/dub.json similarity index 100% rename from test/2-dynLib-with-staticLib-dep/dub.json rename to test/integration/2-dynLib-with-staticLib-dep/dub.json diff --git a/test/2-dynLib-with-staticLib-dep/source/dynlib/app.d b/test/integration/2-dynLib-with-staticLib-dep/source/dynlib/app.d similarity index 100% rename from test/2-dynLib-with-staticLib-dep/source/dynlib/app.d rename to test/integration/2-dynLib-with-staticLib-dep/source/dynlib/app.d diff --git a/test/2-sourceLib-dep/dub.json b/test/integration/2-sourceLib-dep/dub.json similarity index 100% rename from test/2-sourceLib-dep/dub.json rename to test/integration/2-sourceLib-dep/dub.json diff --git a/test/2-sourceLib-dep/source/app.d b/test/integration/2-sourceLib-dep/source/app.d similarity index 100% rename from test/2-sourceLib-dep/source/app.d rename to test/integration/2-sourceLib-dep/source/app.d diff --git a/test/2-staticLib-dep/dub.json b/test/integration/2-staticLib-dep/dub.json similarity index 100% rename from test/2-staticLib-dep/dub.json rename to test/integration/2-staticLib-dep/dub.json diff --git a/test/2-staticLib-dep/source/app.d b/test/integration/2-staticLib-dep/source/app.d similarity index 100% rename from test/2-staticLib-dep/source/app.d rename to test/integration/2-staticLib-dep/source/app.d diff --git a/test/3-copyFiles/.no_test b/test/integration/3-copyFiles/.no_test similarity index 100% rename from test/3-copyFiles/.no_test rename to test/integration/3-copyFiles/.no_test diff --git a/test/3-copyFiles/data/file_to_copy.txt b/test/integration/3-copyFiles/data/file_to_copy.txt similarity index 100% rename from test/3-copyFiles/data/file_to_copy.txt rename to test/integration/3-copyFiles/data/file_to_copy.txt diff --git a/test/3-copyFiles/data/file_to_copy_mask1.txt b/test/integration/3-copyFiles/data/file_to_copy_mask1.txt similarity index 100% rename from test/3-copyFiles/data/file_to_copy_mask1.txt rename to test/integration/3-copyFiles/data/file_to_copy_mask1.txt diff --git a/test/3-copyFiles/data/file_to_copy_mask2.txt b/test/integration/3-copyFiles/data/file_to_copy_mask2.txt similarity index 100% rename from test/3-copyFiles/data/file_to_copy_mask2.txt rename to test/integration/3-copyFiles/data/file_to_copy_mask2.txt diff --git a/test/3-copyFiles/data/res/.nocopy/file_inside_dot_prefixed_dir.txt b/test/integration/3-copyFiles/data/res/.nocopy/file_inside_dot_prefixed_dir.txt similarity index 100% rename from test/3-copyFiles/data/res/.nocopy/file_inside_dot_prefixed_dir.txt rename to test/integration/3-copyFiles/data/res/.nocopy/file_inside_dot_prefixed_dir.txt diff --git a/test/3-copyFiles/data/res/hdpi/file1.txt b/test/integration/3-copyFiles/data/res/hdpi/file1.txt similarity index 100% rename from test/3-copyFiles/data/res/hdpi/file1.txt rename to test/integration/3-copyFiles/data/res/hdpi/file1.txt diff --git a/test/3-copyFiles/data/res/hdpi/file2.txt b/test/integration/3-copyFiles/data/res/hdpi/file2.txt similarity index 100% rename from test/3-copyFiles/data/res/hdpi/file2.txt rename to test/integration/3-copyFiles/data/res/hdpi/file2.txt diff --git a/test/3-copyFiles/data/res/hdpi/file3.txt b/test/integration/3-copyFiles/data/res/hdpi/file3.txt similarity index 100% rename from test/3-copyFiles/data/res/hdpi/file3.txt rename to test/integration/3-copyFiles/data/res/hdpi/file3.txt diff --git a/test/3-copyFiles/data/res/hdpi/nested_dir/nested_file.txt b/test/integration/3-copyFiles/data/res/hdpi/nested_dir/nested_file.txt similarity index 100% rename from test/3-copyFiles/data/res/hdpi/nested_dir/nested_file.txt rename to test/integration/3-copyFiles/data/res/hdpi/nested_dir/nested_file.txt diff --git a/test/3-copyFiles/data/res/i18n/resource_en.txt b/test/integration/3-copyFiles/data/res/i18n/resource_en.txt similarity index 100% rename from test/3-copyFiles/data/res/i18n/resource_en.txt rename to test/integration/3-copyFiles/data/res/i18n/resource_en.txt diff --git a/test/3-copyFiles/data/res/i18n/resource_fr.txt b/test/integration/3-copyFiles/data/res/i18n/resource_fr.txt similarity index 100% rename from test/3-copyFiles/data/res/i18n/resource_fr.txt rename to test/integration/3-copyFiles/data/res/i18n/resource_fr.txt diff --git a/test/3-copyFiles/data/res/ldpi/file1.txt b/test/integration/3-copyFiles/data/res/ldpi/file1.txt similarity index 100% rename from test/3-copyFiles/data/res/ldpi/file1.txt rename to test/integration/3-copyFiles/data/res/ldpi/file1.txt diff --git a/test/3-copyFiles/data/res/ldpi/file2.txt b/test/integration/3-copyFiles/data/res/ldpi/file2.txt similarity index 100% rename from test/3-copyFiles/data/res/ldpi/file2.txt rename to test/integration/3-copyFiles/data/res/ldpi/file2.txt diff --git a/test/3-copyFiles/data/res/ldpi/file3.txt b/test/integration/3-copyFiles/data/res/ldpi/file3.txt similarity index 100% rename from test/3-copyFiles/data/res/ldpi/file3.txt rename to test/integration/3-copyFiles/data/res/ldpi/file3.txt diff --git a/test/3-copyFiles/data/res/mdpi/file1.txt b/test/integration/3-copyFiles/data/res/mdpi/file1.txt similarity index 100% rename from test/3-copyFiles/data/res/mdpi/file1.txt rename to test/integration/3-copyFiles/data/res/mdpi/file1.txt diff --git a/test/3-copyFiles/data/res/mdpi/file2.txt b/test/integration/3-copyFiles/data/res/mdpi/file2.txt similarity index 100% rename from test/3-copyFiles/data/res/mdpi/file2.txt rename to test/integration/3-copyFiles/data/res/mdpi/file2.txt diff --git a/test/3-copyFiles/data/res/mdpi/file3.txt b/test/integration/3-copyFiles/data/res/mdpi/file3.txt similarity index 100% rename from test/3-copyFiles/data/res/mdpi/file3.txt rename to test/integration/3-copyFiles/data/res/mdpi/file3.txt diff --git a/test/3-copyFiles/dub.json b/test/integration/3-copyFiles/dub.json similarity index 100% rename from test/3-copyFiles/dub.json rename to test/integration/3-copyFiles/dub.json diff --git a/test/3-copyFiles/source/app.d b/test/integration/3-copyFiles/source/app.d similarity index 100% rename from test/3-copyFiles/source/app.d rename to test/integration/3-copyFiles/source/app.d diff --git a/test/4-describe-data-1-list.sh b/test/integration/4-describe-data-1-list.sh similarity index 100% rename from test/4-describe-data-1-list.sh rename to test/integration/4-describe-data-1-list.sh diff --git a/test/4-describe-data-2-dmd.sh b/test/integration/4-describe-data-2-dmd.sh similarity index 100% rename from test/4-describe-data-2-dmd.sh rename to test/integration/4-describe-data-2-dmd.sh diff --git a/test/4-describe-data-3-zero-delim.sh b/test/integration/4-describe-data-3-zero-delim.sh similarity index 100% rename from test/4-describe-data-3-zero-delim.sh rename to test/integration/4-describe-data-3-zero-delim.sh diff --git a/test/4-describe-data-check-escape b/test/integration/4-describe-data-check-escape similarity index 100% rename from test/4-describe-data-check-escape rename to test/integration/4-describe-data-check-escape diff --git a/test/4-describe-import-paths.sh b/test/integration/4-describe-import-paths.sh similarity index 100% rename from test/4-describe-import-paths.sh rename to test/integration/4-describe-import-paths.sh diff --git a/test/4-describe-json.sh b/test/integration/4-describe-json.sh similarity index 100% rename from test/4-describe-json.sh rename to test/integration/4-describe-json.sh diff --git a/test/4-describe-string-import-paths.sh b/test/integration/4-describe-string-import-paths.sh similarity index 100% rename from test/4-describe-string-import-paths.sh rename to test/integration/4-describe-string-import-paths.sh diff --git a/test/5-convert-stdout.sh b/test/integration/5-convert-stdout.sh similarity index 100% rename from test/5-convert-stdout.sh rename to test/integration/5-convert-stdout.sh diff --git a/test/5-convert.sh b/test/integration/5-convert.sh similarity index 100% rename from test/5-convert.sh rename to test/integration/5-convert.sh diff --git a/test/5-convert/.no_build b/test/integration/5-convert/.no_build similarity index 100% rename from test/5-convert/.no_build rename to test/integration/5-convert/.no_build diff --git a/test/5-convert/dub.sdl b/test/integration/5-convert/dub.sdl similarity index 100% rename from test/5-convert/dub.sdl rename to test/integration/5-convert/dub.sdl diff --git a/test/cache-generated-test-config.sh b/test/integration/cache-generated-test-config.sh similarity index 100% rename from test/cache-generated-test-config.sh rename to test/integration/cache-generated-test-config.sh diff --git a/test/cache-generated-test-config/.no_build b/test/integration/cache-generated-test-config/.no_build similarity index 100% rename from test/cache-generated-test-config/.no_build rename to test/integration/cache-generated-test-config/.no_build diff --git a/test/cache-generated-test-config/.no_run b/test/integration/cache-generated-test-config/.no_run similarity index 100% rename from test/cache-generated-test-config/.no_run rename to test/integration/cache-generated-test-config/.no_run diff --git a/test/cache-generated-test-config/.no_test b/test/integration/cache-generated-test-config/.no_test similarity index 100% rename from test/cache-generated-test-config/.no_test rename to test/integration/cache-generated-test-config/.no_test diff --git a/test/cache-generated-test-config/dub.sdl b/test/integration/cache-generated-test-config/dub.sdl similarity index 100% rename from test/cache-generated-test-config/dub.sdl rename to test/integration/cache-generated-test-config/dub.sdl diff --git a/test/cache-generated-test-config/source/test.d b/test/integration/cache-generated-test-config/source/test.d similarity index 100% rename from test/cache-generated-test-config/source/test.d rename to test/integration/cache-generated-test-config/source/test.d diff --git a/test/colored-output.sh b/test/integration/colored-output.sh similarity index 100% rename from test/colored-output.sh rename to test/integration/colored-output.sh diff --git a/test/common.sh b/test/integration/common.sh similarity index 100% rename from test/common.sh rename to test/integration/common.sh diff --git a/test/common/.no_build b/test/integration/common/.no_build similarity index 100% rename from test/common/.no_build rename to test/integration/common/.no_build diff --git a/test/common/.no_run b/test/integration/common/.no_run similarity index 100% rename from test/common/.no_run rename to test/integration/common/.no_run diff --git a/test/common/.no_test b/test/integration/common/.no_test similarity index 100% rename from test/common/.no_test rename to test/integration/common/.no_test diff --git a/test/common/dub.sdl b/test/integration/common/dub.sdl similarity index 100% rename from test/common/dub.sdl rename to test/integration/common/dub.sdl diff --git a/test/common/source/common.d b/test/integration/common/source/common.d similarity index 100% rename from test/common/source/common.d rename to test/integration/common/source/common.d diff --git a/test/cov-ctfe.sh b/test/integration/cov-ctfe.sh similarity index 100% rename from test/cov-ctfe.sh rename to test/integration/cov-ctfe.sh diff --git a/test/cov-ctfe/.no_build b/test/integration/cov-ctfe/.no_build similarity index 100% rename from test/cov-ctfe/.no_build rename to test/integration/cov-ctfe/.no_build diff --git a/test/cov-ctfe/.no_run b/test/integration/cov-ctfe/.no_run similarity index 100% rename from test/cov-ctfe/.no_run rename to test/integration/cov-ctfe/.no_run diff --git a/test/cov-ctfe/.no_test b/test/integration/cov-ctfe/.no_test similarity index 100% rename from test/cov-ctfe/.no_test rename to test/integration/cov-ctfe/.no_test diff --git a/test/cov-ctfe/dub.sdl b/test/integration/cov-ctfe/dub.sdl similarity index 100% rename from test/cov-ctfe/dub.sdl rename to test/integration/cov-ctfe/dub.sdl diff --git a/test/cov-ctfe/test.d b/test/integration/cov-ctfe/test.d similarity index 100% rename from test/cov-ctfe/test.d rename to test/integration/cov-ctfe/test.d diff --git a/test/custom-source-main-bug487/.gitignore b/test/integration/custom-source-main-bug487/.gitignore similarity index 100% rename from test/custom-source-main-bug487/.gitignore rename to test/integration/custom-source-main-bug487/.gitignore diff --git a/test/custom-source-main-bug487/.no_run b/test/integration/custom-source-main-bug487/.no_run similarity index 100% rename from test/custom-source-main-bug487/.no_run rename to test/integration/custom-source-main-bug487/.no_run diff --git a/test/custom-source-main-bug487/.no_test b/test/integration/custom-source-main-bug487/.no_test similarity index 100% rename from test/custom-source-main-bug487/.no_test rename to test/integration/custom-source-main-bug487/.no_test diff --git a/test/custom-source-main-bug487/dub.json b/test/integration/custom-source-main-bug487/dub.json similarity index 100% rename from test/custom-source-main-bug487/dub.json rename to test/integration/custom-source-main-bug487/dub.json diff --git a/test/custom-source-main-bug487/mysrc/app.d b/test/integration/custom-source-main-bug487/mysrc/app.d similarity index 100% rename from test/custom-source-main-bug487/mysrc/app.d rename to test/integration/custom-source-main-bug487/mysrc/app.d diff --git a/test/custom-unittest/dub.json b/test/integration/custom-unittest/dub.json similarity index 100% rename from test/custom-unittest/dub.json rename to test/integration/custom-unittest/dub.json diff --git a/test/custom-unittest/source/app.d b/test/integration/custom-unittest/source/app.d similarity index 100% rename from test/custom-unittest/source/app.d rename to test/integration/custom-unittest/source/app.d diff --git a/test/custom-unittest/source/lib.d b/test/integration/custom-unittest/source/lib.d similarity index 100% rename from test/custom-unittest/source/lib.d rename to test/integration/custom-unittest/source/lib.d diff --git a/test/custom-unittest/test/main.d b/test/integration/custom-unittest/test/main.d similarity index 100% rename from test/custom-unittest/test/main.d rename to test/integration/custom-unittest/test/main.d diff --git a/test/d-versions.sh b/test/integration/d-versions.sh similarity index 100% rename from test/d-versions.sh rename to test/integration/d-versions.sh diff --git a/test/d-versions/.gitignore b/test/integration/d-versions/.gitignore similarity index 100% rename from test/d-versions/.gitignore rename to test/integration/d-versions/.gitignore diff --git a/test/d-versions/.no_build b/test/integration/d-versions/.no_build similarity index 100% rename from test/d-versions/.no_build rename to test/integration/d-versions/.no_build diff --git a/test/d-versions/.no_run b/test/integration/d-versions/.no_run similarity index 100% rename from test/d-versions/.no_run rename to test/integration/d-versions/.no_run diff --git a/test/d-versions/.no_test b/test/integration/d-versions/.no_test similarity index 100% rename from test/d-versions/.no_test rename to test/integration/d-versions/.no_test diff --git a/test/d-versions/dub.sdl b/test/integration/d-versions/dub.sdl similarity index 100% rename from test/d-versions/dub.sdl rename to test/integration/d-versions/dub.sdl diff --git a/test/d-versions/source/app.d b/test/integration/d-versions/source/app.d similarity index 100% rename from test/d-versions/source/app.d rename to test/integration/d-versions/source/app.d diff --git a/test/dc-env.sh b/test/integration/dc-env.sh similarity index 100% rename from test/dc-env.sh rename to test/integration/dc-env.sh diff --git a/test/ddox.sh b/test/integration/ddox.sh similarity index 100% rename from test/ddox.sh rename to test/integration/ddox.sh diff --git a/test/ddox.sh.min_frontend b/test/integration/ddox.sh.min_frontend similarity index 100% rename from test/ddox.sh.min_frontend rename to test/integration/ddox.sh.min_frontend diff --git a/test/ddox/.no_build b/test/integration/ddox/.no_build similarity index 100% rename from test/ddox/.no_build rename to test/integration/ddox/.no_build diff --git a/test/ddox/custom-tool/.gitignore b/test/integration/ddox/custom-tool/.gitignore similarity index 100% rename from test/ddox/custom-tool/.gitignore rename to test/integration/ddox/custom-tool/.gitignore diff --git a/test/ddox/custom-tool/dub.sdl b/test/integration/ddox/custom-tool/dub.sdl similarity index 100% rename from test/ddox/custom-tool/dub.sdl rename to test/integration/ddox/custom-tool/dub.sdl diff --git a/test/ddox/custom-tool/public/copied b/test/integration/ddox/custom-tool/public/copied similarity index 100% rename from test/ddox/custom-tool/public/copied rename to test/integration/ddox/custom-tool/public/copied diff --git a/test/ddox/custom-tool/source/app.d b/test/integration/ddox/custom-tool/source/app.d similarity index 100% rename from test/ddox/custom-tool/source/app.d rename to test/integration/ddox/custom-tool/source/app.d diff --git a/test/ddox/custom/.gitignore b/test/integration/ddox/custom/.gitignore similarity index 100% rename from test/ddox/custom/.gitignore rename to test/integration/ddox/custom/.gitignore diff --git a/test/ddox/custom/dub.sdl b/test/integration/ddox/custom/dub.sdl similarity index 100% rename from test/ddox/custom/dub.sdl rename to test/integration/ddox/custom/dub.sdl diff --git a/test/ddox/custom/source/ddox_project.d b/test/integration/ddox/custom/source/ddox_project.d similarity index 100% rename from test/ddox/custom/source/ddox_project.d rename to test/integration/ddox/custom/source/ddox_project.d diff --git a/test/ddox/default/.gitignore b/test/integration/ddox/default/.gitignore similarity index 100% rename from test/ddox/default/.gitignore rename to test/integration/ddox/default/.gitignore diff --git a/test/ddox/default/dub.sdl b/test/integration/ddox/default/dub.sdl similarity index 100% rename from test/ddox/default/dub.sdl rename to test/integration/ddox/default/dub.sdl diff --git a/test/ddox/default/source/ddox_project.d b/test/integration/ddox/default/source/ddox_project.d similarity index 100% rename from test/ddox/default/source/ddox_project.d rename to test/integration/ddox/default/source/ddox_project.d diff --git a/test/depen-build-settings/.gitignore b/test/integration/depen-build-settings/.gitignore similarity index 100% rename from test/depen-build-settings/.gitignore rename to test/integration/depen-build-settings/.gitignore diff --git a/test/depen-build-settings/.no_build_dmd b/test/integration/depen-build-settings/.no_build_dmd similarity index 100% rename from test/depen-build-settings/.no_build_dmd rename to test/integration/depen-build-settings/.no_build_dmd diff --git a/test/depen-build-settings/.no_build_gdc b/test/integration/depen-build-settings/.no_build_gdc similarity index 100% rename from test/depen-build-settings/.no_build_gdc rename to test/integration/depen-build-settings/.no_build_gdc diff --git a/test/depen-build-settings/.no_test b/test/integration/depen-build-settings/.no_test similarity index 100% rename from test/depen-build-settings/.no_test rename to test/integration/depen-build-settings/.no_test diff --git a/test/depen-build-settings/depend/depend2/dub.json b/test/integration/depen-build-settings/depend/depend2/dub.json similarity index 100% rename from test/depen-build-settings/depend/depend2/dub.json rename to test/integration/depen-build-settings/depend/depend2/dub.json diff --git a/test/depen-build-settings/depend/depend2/source/depend2.d b/test/integration/depen-build-settings/depend/depend2/source/depend2.d similarity index 100% rename from test/depen-build-settings/depend/depend2/source/depend2.d rename to test/integration/depen-build-settings/depend/depend2/source/depend2.d diff --git a/test/depen-build-settings/depend/dub.json b/test/integration/depen-build-settings/depend/dub.json similarity index 100% rename from test/depen-build-settings/depend/dub.json rename to test/integration/depen-build-settings/depend/dub.json diff --git a/test/depen-build-settings/depend/source/depend.d b/test/integration/depen-build-settings/depend/source/depend.d similarity index 100% rename from test/depen-build-settings/depend/source/depend.d rename to test/integration/depen-build-settings/depend/source/depend.d diff --git a/test/depen-build-settings/dub.json b/test/integration/depen-build-settings/dub.json similarity index 100% rename from test/depen-build-settings/dub.json rename to test/integration/depen-build-settings/dub.json diff --git a/test/depen-build-settings/dub.selections.json b/test/integration/depen-build-settings/dub.selections.json similarity index 100% rename from test/depen-build-settings/dub.selections.json rename to test/integration/depen-build-settings/dub.selections.json diff --git a/test/depen-build-settings/source/app.d b/test/integration/depen-build-settings/source/app.d similarity index 100% rename from test/depen-build-settings/source/app.d rename to test/integration/depen-build-settings/source/app.d diff --git a/test/describe-dependency-1/.no_build b/test/integration/describe-dependency-1/.no_build similarity index 100% rename from test/describe-dependency-1/.no_build rename to test/integration/describe-dependency-1/.no_build diff --git a/test/describe-dependency-1/data/dummy-dep1.dat b/test/integration/describe-dependency-1/data/dummy-dep1.dat similarity index 100% rename from test/describe-dependency-1/data/dummy-dep1.dat rename to test/integration/describe-dependency-1/data/dummy-dep1.dat diff --git a/test/describe-dependency-1/dependency-postGenerateCommands.sh b/test/integration/describe-dependency-1/dependency-postGenerateCommands.sh similarity index 100% rename from test/describe-dependency-1/dependency-postGenerateCommands.sh rename to test/integration/describe-dependency-1/dependency-postGenerateCommands.sh diff --git a/test/describe-dependency-1/dependency-preGenerateCommands.sh b/test/integration/describe-dependency-1/dependency-preGenerateCommands.sh similarity index 100% rename from test/describe-dependency-1/dependency-preGenerateCommands.sh rename to test/integration/describe-dependency-1/dependency-preGenerateCommands.sh diff --git a/test/describe-dependency-1/dub.json b/test/integration/describe-dependency-1/dub.json similarity index 100% rename from test/describe-dependency-1/dub.json rename to test/integration/describe-dependency-1/dub.json diff --git a/test/describe-dependency-1/otherdir/dummy.d b/test/integration/describe-dependency-1/otherdir/dummy.d similarity index 100% rename from test/describe-dependency-1/otherdir/dummy.d rename to test/integration/describe-dependency-1/otherdir/dummy.d diff --git a/test/describe-dependency-1/source/dummy.d b/test/integration/describe-dependency-1/source/dummy.d similarity index 100% rename from test/describe-dependency-1/source/dummy.d rename to test/integration/describe-dependency-1/source/dummy.d diff --git a/test/describe-dependency-2/.no_build b/test/integration/describe-dependency-2/.no_build similarity index 100% rename from test/describe-dependency-2/.no_build rename to test/integration/describe-dependency-2/.no_build diff --git a/test/describe-dependency-2/dub.json b/test/integration/describe-dependency-2/dub.json similarity index 100% rename from test/describe-dependency-2/dub.json rename to test/integration/describe-dependency-2/dub.json diff --git a/test/describe-dependency-2/some-extra-string-import-path/dummy.d b/test/integration/describe-dependency-2/some-extra-string-import-path/dummy.d similarity index 100% rename from test/describe-dependency-2/some-extra-string-import-path/dummy.d rename to test/integration/describe-dependency-2/some-extra-string-import-path/dummy.d diff --git a/test/describe-dependency-2/some-path/dummy.d b/test/integration/describe-dependency-2/some-path/dummy.d similarity index 100% rename from test/describe-dependency-2/some-path/dummy.d rename to test/integration/describe-dependency-2/some-path/dummy.d diff --git a/test/describe-dependency-3/.no_build b/test/integration/describe-dependency-3/.no_build similarity index 100% rename from test/describe-dependency-3/.no_build rename to test/integration/describe-dependency-3/.no_build diff --git a/test/describe-dependency-3/dep3-source/dummy.d b/test/integration/describe-dependency-3/dep3-source/dummy.d similarity index 100% rename from test/describe-dependency-3/dep3-source/dummy.d rename to test/integration/describe-dependency-3/dep3-source/dummy.d diff --git a/test/describe-dependency-3/dep3-string-import-path/dummy.d b/test/integration/describe-dependency-3/dep3-string-import-path/dummy.d similarity index 100% rename from test/describe-dependency-3/dep3-string-import-path/dummy.d rename to test/integration/describe-dependency-3/dep3-string-import-path/dummy.d diff --git a/test/describe-dependency-3/dub.json b/test/integration/describe-dependency-3/dub.json similarity index 100% rename from test/describe-dependency-3/dub.json rename to test/integration/describe-dependency-3/dub.json diff --git a/test/describe-project/.no_build b/test/integration/describe-project/.no_build similarity index 100% rename from test/describe-project/.no_build rename to test/integration/describe-project/.no_build diff --git a/test/describe-project/data/dummy.dat b/test/integration/describe-project/data/dummy.dat similarity index 100% rename from test/describe-project/data/dummy.dat rename to test/integration/describe-project/data/dummy.dat diff --git a/test/describe-project/do-postGenerateCommands.sh b/test/integration/describe-project/do-postGenerateCommands.sh similarity index 100% rename from test/describe-project/do-postGenerateCommands.sh rename to test/integration/describe-project/do-postGenerateCommands.sh diff --git a/test/describe-project/do-preGenerateCommands.sh b/test/integration/describe-project/do-preGenerateCommands.sh similarity index 100% rename from test/describe-project/do-preGenerateCommands.sh rename to test/integration/describe-project/do-preGenerateCommands.sh diff --git a/test/describe-project/dub.json b/test/integration/describe-project/dub.json similarity index 100% rename from test/describe-project/dub.json rename to test/integration/describe-project/dub.json diff --git a/test/describe-project/src/dummy.d b/test/integration/describe-project/src/dummy.d similarity index 100% rename from test/describe-project/src/dummy.d rename to test/integration/describe-project/src/dummy.d diff --git a/test/describe-project/views/dummy.d b/test/integration/describe-project/views/dummy.d similarity index 100% rename from test/describe-project/views/dummy.d rename to test/integration/describe-project/views/dummy.d diff --git a/test/dpath-variable.sh b/test/integration/dpath-variable.sh similarity index 100% rename from test/dpath-variable.sh rename to test/integration/dpath-variable.sh diff --git a/test/dpath-variable/.gitignore b/test/integration/dpath-variable/.gitignore similarity index 100% rename from test/dpath-variable/.gitignore rename to test/integration/dpath-variable/.gitignore diff --git a/test/dpath-variable/dub.json b/test/integration/dpath-variable/dub.json similarity index 100% rename from test/dpath-variable/dub.json rename to test/integration/dpath-variable/dub.json diff --git a/test/dpath-variable/source/app.d b/test/integration/dpath-variable/source/app.d similarity index 100% rename from test/dpath-variable/source/app.d rename to test/integration/dpath-variable/source/app.d diff --git a/test/dub-as-a-library-cwd.sh b/test/integration/dub-as-a-library-cwd.sh similarity index 100% rename from test/dub-as-a-library-cwd.sh rename to test/integration/dub-as-a-library-cwd.sh diff --git a/test/dub-as-a-library-cwd/.gitignore b/test/integration/dub-as-a-library-cwd/.gitignore similarity index 100% rename from test/dub-as-a-library-cwd/.gitignore rename to test/integration/dub-as-a-library-cwd/.gitignore diff --git a/test/dub-as-a-library-cwd/.no_test b/test/integration/dub-as-a-library-cwd/.no_test similarity index 100% rename from test/dub-as-a-library-cwd/.no_test rename to test/integration/dub-as-a-library-cwd/.no_test diff --git a/test/dub-as-a-library-cwd/dub.json b/test/integration/dub-as-a-library-cwd/dub.json similarity index 81% rename from test/dub-as-a-library-cwd/dub.json rename to test/integration/dub-as-a-library-cwd/dub.json index 958f419329..cb49357c6b 100644 --- a/test/dub-as-a-library-cwd/dub.json +++ b/test/integration/dub-as-a-library-cwd/dub.json @@ -3,7 +3,7 @@ "workingDirectory": ".", "dependencies": { "dub": { - "path": "../.." + "path": "../../../" } } } diff --git a/test/dub-as-a-library-cwd/source/app.d b/test/integration/dub-as-a-library-cwd/source/app.d similarity index 100% rename from test/dub-as-a-library-cwd/source/app.d rename to test/integration/dub-as-a-library-cwd/source/app.d diff --git a/test/dub-as-a-library-cwd/subproject/dub.sdl b/test/integration/dub-as-a-library-cwd/subproject/dub.sdl similarity index 100% rename from test/dub-as-a-library-cwd/subproject/dub.sdl rename to test/integration/dub-as-a-library-cwd/subproject/dub.sdl diff --git a/test/dub-as-a-library-cwd/subproject/source/app.d b/test/integration/dub-as-a-library-cwd/subproject/source/app.d similarity index 100% rename from test/dub-as-a-library-cwd/subproject/source/app.d rename to test/integration/dub-as-a-library-cwd/subproject/source/app.d diff --git a/test/dub-custom-root-2/.gitignore b/test/integration/dub-custom-root-2/.gitignore similarity index 100% rename from test/dub-custom-root-2/.gitignore rename to test/integration/dub-custom-root-2/.gitignore diff --git a/test/dub-custom-root-2/.no_run b/test/integration/dub-custom-root-2/.no_run similarity index 100% rename from test/dub-custom-root-2/.no_run rename to test/integration/dub-custom-root-2/.no_run diff --git a/test/dub-custom-root-2/.no_test b/test/integration/dub-custom-root-2/.no_test similarity index 100% rename from test/dub-custom-root-2/.no_test rename to test/integration/dub-custom-root-2/.no_test diff --git a/test/dub-custom-root-2/dub.json b/test/integration/dub-custom-root-2/dub.json similarity index 100% rename from test/dub-custom-root-2/dub.json rename to test/integration/dub-custom-root-2/dub.json diff --git a/test/integration/dub-custom-root-2/source/app.d b/test/integration/dub-custom-root-2/source/app.d new file mode 100644 index 0000000000..1b0d2f529b --- /dev/null +++ b/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"); +} diff --git a/test/dub-custom-root.sh b/test/integration/dub-custom-root.sh similarity index 100% rename from test/dub-custom-root.sh rename to test/integration/dub-custom-root.sh diff --git a/test/dub-custom-root/.gitignore b/test/integration/dub-custom-root/.gitignore similarity index 100% rename from test/dub-custom-root/.gitignore rename to test/integration/dub-custom-root/.gitignore diff --git a/test/dub-custom-root/.no_run b/test/integration/dub-custom-root/.no_run similarity index 100% rename from test/dub-custom-root/.no_run rename to test/integration/dub-custom-root/.no_run diff --git a/test/dub-custom-root/.no_test b/test/integration/dub-custom-root/.no_test similarity index 100% rename from test/dub-custom-root/.no_test rename to test/integration/dub-custom-root/.no_test diff --git a/test/dub-custom-root/dub.json b/test/integration/dub-custom-root/dub.json similarity index 100% rename from test/dub-custom-root/dub.json rename to test/integration/dub-custom-root/dub.json diff --git a/test/integration/dub-custom-root/source/app.d b/test/integration/dub-custom-root/source/app.d new file mode 100644 index 0000000000..ac1cc34428 --- /dev/null +++ b/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"); +} diff --git a/test/dub_test_root.sh b/test/integration/dub_test_root.sh similarity index 100% rename from test/dub_test_root.sh rename to test/integration/dub_test_root.sh diff --git a/test/dustmite-no-redirect-test/.no_build b/test/integration/dustmite-no-redirect-test/.no_build similarity index 100% rename from test/dustmite-no-redirect-test/.no_build rename to test/integration/dustmite-no-redirect-test/.no_build diff --git a/test/dustmite-no-redirect-test/project/dub.json b/test/integration/dustmite-no-redirect-test/project/dub.json similarity index 100% rename from test/dustmite-no-redirect-test/project/dub.json rename to test/integration/dustmite-no-redirect-test/project/dub.json diff --git a/test/dustmite-no-redirect-test/project/source/app.d b/test/integration/dustmite-no-redirect-test/project/source/app.d similarity index 100% rename from test/dustmite-no-redirect-test/project/source/app.d rename to test/integration/dustmite-no-redirect-test/project/source/app.d diff --git a/test/dustmite-no-redirect.sh b/test/integration/dustmite-no-redirect.sh similarity index 100% rename from test/dustmite-no-redirect.sh rename to test/integration/dustmite-no-redirect.sh diff --git a/test/environment-variables.script.d b/test/integration/environment-variables.script.d similarity index 100% rename from test/environment-variables.script.d rename to test/integration/environment-variables.script.d diff --git a/test/environment-variables/.gitignore b/test/integration/environment-variables/.gitignore similarity index 100% rename from test/environment-variables/.gitignore rename to test/integration/environment-variables/.gitignore diff --git a/test/environment-variables/.no_build b/test/integration/environment-variables/.no_build similarity index 100% rename from test/environment-variables/.no_build rename to test/integration/environment-variables/.no_build diff --git a/test/environment-variables/.no_run b/test/integration/environment-variables/.no_run similarity index 100% rename from test/environment-variables/.no_run rename to test/integration/environment-variables/.no_run diff --git a/test/environment-variables/.no_test b/test/integration/environment-variables/.no_test similarity index 100% rename from test/environment-variables/.no_test rename to test/integration/environment-variables/.no_test diff --git a/test/environment-variables/deppkg/dub.json b/test/integration/environment-variables/deppkg/dub.json similarity index 100% rename from test/environment-variables/deppkg/dub.json rename to test/integration/environment-variables/deppkg/dub.json diff --git a/test/environment-variables/deppkg/source/deppkg/foo.d b/test/integration/environment-variables/deppkg/source/deppkg/foo.d similarity index 100% rename from test/environment-variables/deppkg/source/deppkg/foo.d rename to test/integration/environment-variables/deppkg/source/deppkg/foo.d diff --git a/test/environment-variables/dub.json b/test/integration/environment-variables/dub.json similarity index 100% rename from test/environment-variables/dub.json rename to test/integration/environment-variables/dub.json diff --git a/test/environment-variables/dub.settings.json b/test/integration/environment-variables/dub.settings.json similarity index 100% rename from test/environment-variables/dub.settings.json rename to test/integration/environment-variables/dub.settings.json diff --git a/test/environment-variables/source/app.d b/test/integration/environment-variables/source/app.d similarity index 100% rename from test/environment-variables/source/app.d rename to test/integration/environment-variables/source/app.d diff --git a/test/expected-issue1037-output b/test/integration/expected-issue1037-output similarity index 100% rename from test/expected-issue1037-output rename to test/integration/expected-issue1037-output diff --git a/test/feat663-search.sh b/test/integration/feat663-search.sh similarity index 100% rename from test/feat663-search.sh rename to test/integration/feat663-search.sh diff --git a/test/fetchzip.sh b/test/integration/fetchzip.sh similarity index 100% rename from test/fetchzip.sh rename to test/integration/fetchzip.sh diff --git a/test/fetchzip.sh.min_frontend b/test/integration/fetchzip.sh.min_frontend similarity index 100% rename from test/fetchzip.sh.min_frontend rename to test/integration/fetchzip.sh.min_frontend diff --git a/test/filesystem-version-with-buildinfo.sh b/test/integration/filesystem-version-with-buildinfo.sh similarity index 100% rename from test/filesystem-version-with-buildinfo.sh rename to test/integration/filesystem-version-with-buildinfo.sh diff --git a/test/filesystem-version-with-buildinfo/.no_build b/test/integration/filesystem-version-with-buildinfo/.no_build similarity index 100% rename from test/filesystem-version-with-buildinfo/.no_build rename to test/integration/filesystem-version-with-buildinfo/.no_build diff --git a/test/filesystem-version-with-buildinfo/fs-json-dubpackage-1.0.7+build-9-9-9.zip b/test/integration/filesystem-version-with-buildinfo/fs-json-dubpackage-1.0.7+build-9-9-9.zip similarity index 100% rename from test/filesystem-version-with-buildinfo/fs-json-dubpackage-1.0.7+build-9-9-9.zip rename to test/integration/filesystem-version-with-buildinfo/fs-json-dubpackage-1.0.7+build-9-9-9.zip diff --git a/test/git-dependency/dub.json b/test/integration/git-dependency/dub.json similarity index 100% rename from test/git-dependency/dub.json rename to test/integration/git-dependency/dub.json diff --git a/test/git-dependency/src/app.d b/test/integration/git-dependency/src/app.d similarity index 100% rename from test/git-dependency/src/app.d rename to test/integration/git-dependency/src/app.d diff --git a/test/help.sh b/test/integration/help.sh similarity index 100% rename from test/help.sh rename to test/integration/help.sh diff --git a/test/ignore-hidden-1/.gitignore b/test/integration/ignore-hidden-1/.gitignore similarity index 100% rename from test/ignore-hidden-1/.gitignore rename to test/integration/ignore-hidden-1/.gitignore diff --git a/test/ignore-hidden-1/.no_run b/test/integration/ignore-hidden-1/.no_run similarity index 100% rename from test/ignore-hidden-1/.no_run rename to test/integration/ignore-hidden-1/.no_run diff --git a/test/ignore-hidden-1/.no_test b/test/integration/ignore-hidden-1/.no_test similarity index 100% rename from test/ignore-hidden-1/.no_test rename to test/integration/ignore-hidden-1/.no_test diff --git a/test/ignore-hidden-1/dub.json b/test/integration/ignore-hidden-1/dub.json similarity index 100% rename from test/ignore-hidden-1/dub.json rename to test/integration/ignore-hidden-1/dub.json diff --git a/test/ignore-hidden-1/source/.hidden.d b/test/integration/ignore-hidden-1/source/.hidden.d similarity index 100% rename from test/ignore-hidden-1/source/.hidden.d rename to test/integration/ignore-hidden-1/source/.hidden.d diff --git a/test/ignore-hidden-1/source/app.d b/test/integration/ignore-hidden-1/source/app.d similarity index 100% rename from test/ignore-hidden-1/source/app.d rename to test/integration/ignore-hidden-1/source/app.d diff --git a/test/ignore-hidden-2/.gitignore b/test/integration/ignore-hidden-2/.gitignore similarity index 100% rename from test/ignore-hidden-2/.gitignore rename to test/integration/ignore-hidden-2/.gitignore diff --git a/test/ignore-hidden-2/.no_run b/test/integration/ignore-hidden-2/.no_run similarity index 100% rename from test/ignore-hidden-2/.no_run rename to test/integration/ignore-hidden-2/.no_run diff --git a/test/ignore-hidden-2/.no_test b/test/integration/ignore-hidden-2/.no_test similarity index 100% rename from test/ignore-hidden-2/.no_test rename to test/integration/ignore-hidden-2/.no_test diff --git a/test/ignore-hidden-2/dub.json b/test/integration/ignore-hidden-2/dub.json similarity index 100% rename from test/ignore-hidden-2/dub.json rename to test/integration/ignore-hidden-2/dub.json diff --git a/test/ignore-hidden-2/source/.hidden.d b/test/integration/ignore-hidden-2/source/.hidden.d similarity index 100% rename from test/ignore-hidden-2/source/.hidden.d rename to test/integration/ignore-hidden-2/source/.hidden.d diff --git a/test/ignore-hidden-2/source/app.d b/test/integration/ignore-hidden-2/source/app.d similarity index 100% rename from test/ignore-hidden-2/source/app.d rename to test/integration/ignore-hidden-2/source/app.d diff --git a/test/ignore-useless-arch-switch/.no_test b/test/integration/ignore-useless-arch-switch/.no_test similarity index 100% rename from test/ignore-useless-arch-switch/.no_test rename to test/integration/ignore-useless-arch-switch/.no_test diff --git a/test/ignore-useless-arch-switch/dub.sdl b/test/integration/ignore-useless-arch-switch/dub.sdl similarity index 100% rename from test/ignore-useless-arch-switch/dub.sdl rename to test/integration/ignore-useless-arch-switch/dub.sdl diff --git a/test/ignore-useless-arch-switch/source/app.d b/test/integration/ignore-useless-arch-switch/source/app.d similarity index 100% rename from test/ignore-useless-arch-switch/source/app.d rename to test/integration/ignore-useless-arch-switch/source/app.d diff --git a/test/injected-from-dependency/.no_test b/test/integration/injected-from-dependency/.no_test similarity index 100% rename from test/injected-from-dependency/.no_test rename to test/integration/injected-from-dependency/.no_test diff --git a/test/injected-from-dependency/ahook.d b/test/integration/injected-from-dependency/ahook.d similarity index 100% rename from test/injected-from-dependency/ahook.d rename to test/integration/injected-from-dependency/ahook.d diff --git a/test/injected-from-dependency/dub.json b/test/integration/injected-from-dependency/dub.json similarity index 100% rename from test/injected-from-dependency/dub.json rename to test/integration/injected-from-dependency/dub.json diff --git a/test/injected-from-dependency/source/entry.d b/test/integration/injected-from-dependency/source/entry.d similarity index 100% rename from test/injected-from-dependency/source/entry.d rename to test/integration/injected-from-dependency/source/entry.d diff --git a/test/injected-from-dependency/toload/vars.d b/test/integration/injected-from-dependency/toload/vars.d similarity index 100% rename from test/injected-from-dependency/toload/vars.d rename to test/integration/injected-from-dependency/toload/vars.d diff --git a/test/interactive-remove.sh b/test/integration/interactive-remove.sh similarity index 100% rename from test/interactive-remove.sh rename to test/integration/interactive-remove.sh diff --git a/test/issue1003-check-empty-ld-flags.sh b/test/integration/issue1003-check-empty-ld-flags.sh similarity index 100% rename from test/issue1003-check-empty-ld-flags.sh rename to test/integration/issue1003-check-empty-ld-flags.sh diff --git a/test/issue1003-check-empty-ld-flags/dub.json b/test/integration/issue1003-check-empty-ld-flags/dub.json similarity index 100% rename from test/issue1003-check-empty-ld-flags/dub.json rename to test/integration/issue1003-check-empty-ld-flags/dub.json diff --git a/test/issue1003-check-empty-ld-flags/source/app.d b/test/integration/issue1003-check-empty-ld-flags/source/app.d similarity index 100% rename from test/issue1003-check-empty-ld-flags/source/app.d rename to test/integration/issue1003-check-empty-ld-flags/source/app.d diff --git a/test/issue1004-override-config.sh b/test/integration/issue1004-override-config.sh similarity index 100% rename from test/issue1004-override-config.sh rename to test/integration/issue1004-override-config.sh diff --git a/test/issue1004-override-config/.no_build b/test/integration/issue1004-override-config/.no_build similarity index 100% rename from test/issue1004-override-config/.no_build rename to test/integration/issue1004-override-config/.no_build diff --git a/test/issue1004-override-config/a/a.d b/test/integration/issue1004-override-config/a/a.d similarity index 100% rename from test/issue1004-override-config/a/a.d rename to test/integration/issue1004-override-config/a/a.d diff --git a/test/issue1004-override-config/a/dub.sdl b/test/integration/issue1004-override-config/a/dub.sdl similarity index 100% rename from test/issue1004-override-config/a/dub.sdl rename to test/integration/issue1004-override-config/a/dub.sdl diff --git a/test/issue1004-override-config/main/dub.sdl b/test/integration/issue1004-override-config/main/dub.sdl similarity index 100% rename from test/issue1004-override-config/main/dub.sdl rename to test/integration/issue1004-override-config/main/dub.sdl diff --git a/test/issue1004-override-config/main/source/main.d b/test/integration/issue1004-override-config/main/source/main.d similarity index 100% rename from test/issue1004-override-config/main/source/main.d rename to test/integration/issue1004-override-config/main/source/main.d diff --git a/test/issue1005-configuration-resolution.sh b/test/integration/issue1005-configuration-resolution.sh similarity index 100% rename from test/issue1005-configuration-resolution.sh rename to test/integration/issue1005-configuration-resolution.sh diff --git a/test/issue1005-configuration-resolution/.no_build b/test/integration/issue1005-configuration-resolution/.no_build similarity index 100% rename from test/issue1005-configuration-resolution/.no_build rename to test/integration/issue1005-configuration-resolution/.no_build diff --git a/test/issue1005-configuration-resolution/a/dub.sdl b/test/integration/issue1005-configuration-resolution/a/dub.sdl similarity index 100% rename from test/issue1005-configuration-resolution/a/dub.sdl rename to test/integration/issue1005-configuration-resolution/a/dub.sdl diff --git a/test/issue1005-configuration-resolution/b/dub.sdl b/test/integration/issue1005-configuration-resolution/b/dub.sdl similarity index 100% rename from test/issue1005-configuration-resolution/b/dub.sdl rename to test/integration/issue1005-configuration-resolution/b/dub.sdl diff --git a/test/issue1005-configuration-resolution/b/source/b.d b/test/integration/issue1005-configuration-resolution/b/source/b.d similarity index 100% rename from test/issue1005-configuration-resolution/b/source/b.d rename to test/integration/issue1005-configuration-resolution/b/source/b.d diff --git a/test/issue1005-configuration-resolution/c/dub.sdl b/test/integration/issue1005-configuration-resolution/c/dub.sdl similarity index 100% rename from test/issue1005-configuration-resolution/c/dub.sdl rename to test/integration/issue1005-configuration-resolution/c/dub.sdl diff --git a/test/issue1005-configuration-resolution/main/dub.sdl b/test/integration/issue1005-configuration-resolution/main/dub.sdl similarity index 100% rename from test/issue1005-configuration-resolution/main/dub.sdl rename to test/integration/issue1005-configuration-resolution/main/dub.sdl diff --git a/test/issue1005-configuration-resolution/main/source/app.d b/test/integration/issue1005-configuration-resolution/main/source/app.d similarity index 100% rename from test/issue1005-configuration-resolution/main/source/app.d rename to test/integration/issue1005-configuration-resolution/main/source/app.d diff --git a/test/issue1024-selective-upgrade.sh b/test/integration/issue1024-selective-upgrade.sh similarity index 100% rename from test/issue1024-selective-upgrade.sh rename to test/integration/issue1024-selective-upgrade.sh diff --git a/test/issue1024-selective-upgrade/.no_build b/test/integration/issue1024-selective-upgrade/.no_build similarity index 100% rename from test/issue1024-selective-upgrade/.no_build rename to test/integration/issue1024-selective-upgrade/.no_build diff --git a/test/issue1024-selective-upgrade/a-1.0.0/dub.sdl b/test/integration/issue1024-selective-upgrade/a-1.0.0/dub.sdl similarity index 100% rename from test/issue1024-selective-upgrade/a-1.0.0/dub.sdl rename to test/integration/issue1024-selective-upgrade/a-1.0.0/dub.sdl diff --git a/test/issue1024-selective-upgrade/a-1.0.1/dub.sdl b/test/integration/issue1024-selective-upgrade/a-1.0.1/dub.sdl similarity index 100% rename from test/issue1024-selective-upgrade/a-1.0.1/dub.sdl rename to test/integration/issue1024-selective-upgrade/a-1.0.1/dub.sdl diff --git a/test/issue1024-selective-upgrade/b-1.0.0/dub.sdl b/test/integration/issue1024-selective-upgrade/b-1.0.0/dub.sdl similarity index 100% rename from test/issue1024-selective-upgrade/b-1.0.0/dub.sdl rename to test/integration/issue1024-selective-upgrade/b-1.0.0/dub.sdl diff --git a/test/issue1024-selective-upgrade/b-1.0.1/dub.sdl b/test/integration/issue1024-selective-upgrade/b-1.0.1/dub.sdl similarity index 100% rename from test/issue1024-selective-upgrade/b-1.0.1/dub.sdl rename to test/integration/issue1024-selective-upgrade/b-1.0.1/dub.sdl diff --git a/test/issue1024-selective-upgrade/main/dub.sdl b/test/integration/issue1024-selective-upgrade/main/dub.sdl similarity index 100% rename from test/issue1024-selective-upgrade/main/dub.sdl rename to test/integration/issue1024-selective-upgrade/main/dub.sdl diff --git a/test/issue103-single-file-package-json.d b/test/integration/issue103-single-file-package-json.d similarity index 100% rename from test/issue103-single-file-package-json.d rename to test/integration/issue103-single-file-package-json.d diff --git a/test/issue103-single-file-package-no-ext b/test/integration/issue103-single-file-package-no-ext similarity index 92% rename from test/issue103-single-file-package-no-ext rename to test/integration/issue103-single-file-package-no-ext index 8c766389a0..bcc3f883d0 100755 --- a/test/issue103-single-file-package-no-ext +++ b/test/integration/issue103-single-file-package-no-ext @@ -1,4 +1,4 @@ -#!../bin/dub +#!../../bin/dub /+ dub.sdl: name "single-file-test" +/ diff --git a/test/issue103-single-file-package-w-dep.d b/test/integration/issue103-single-file-package-w-dep.d similarity index 100% rename from test/issue103-single-file-package-w-dep.d rename to test/integration/issue103-single-file-package-w-dep.d diff --git a/test/issue103-single-file-package.d b/test/integration/issue103-single-file-package.d similarity index 92% rename from test/issue103-single-file-package.d rename to test/integration/issue103-single-file-package.d index 8c766389a0..bcc3f883d0 100755 --- a/test/issue103-single-file-package.d +++ b/test/integration/issue103-single-file-package.d @@ -1,4 +1,4 @@ -#!../bin/dub +#!../../bin/dub /+ dub.sdl: name "single-file-test" +/ diff --git a/test/issue103-single-file-package.sh b/test/integration/issue103-single-file-package.sh similarity index 100% rename from test/issue103-single-file-package.sh rename to test/integration/issue103-single-file-package.sh diff --git a/test/issue1037-better-dependency-messages.sh b/test/integration/issue1037-better-dependency-messages.sh similarity index 100% rename from test/issue1037-better-dependency-messages.sh rename to test/integration/issue1037-better-dependency-messages.sh diff --git a/test/issue1037-better-dependency-messages/.no_build b/test/integration/issue1037-better-dependency-messages/.no_build similarity index 100% rename from test/issue1037-better-dependency-messages/.no_build rename to test/integration/issue1037-better-dependency-messages/.no_build diff --git a/test/issue1037-better-dependency-messages/.no_run b/test/integration/issue1037-better-dependency-messages/.no_run similarity index 100% rename from test/issue1037-better-dependency-messages/.no_run rename to test/integration/issue1037-better-dependency-messages/.no_run diff --git a/test/issue1037-better-dependency-messages/.no_test b/test/integration/issue1037-better-dependency-messages/.no_test similarity index 100% rename from test/issue1037-better-dependency-messages/.no_test rename to test/integration/issue1037-better-dependency-messages/.no_test diff --git a/test/issue1037-better-dependency-messages/b/dub.json b/test/integration/issue1037-better-dependency-messages/b/dub.json similarity index 100% rename from test/issue1037-better-dependency-messages/b/dub.json rename to test/integration/issue1037-better-dependency-messages/b/dub.json diff --git a/test/issue1037-better-dependency-messages/dub.json b/test/integration/issue1037-better-dependency-messages/dub.json similarity index 100% rename from test/issue1037-better-dependency-messages/dub.json rename to test/integration/issue1037-better-dependency-messages/dub.json diff --git a/test/issue1040-run-with-ver.sh b/test/integration/issue1040-run-with-ver.sh similarity index 100% rename from test/issue1040-run-with-ver.sh rename to test/integration/issue1040-run-with-ver.sh diff --git a/test/issue1053-extra-files-visuald.sh b/test/integration/issue1053-extra-files-visuald.sh similarity index 100% rename from test/issue1053-extra-files-visuald.sh rename to test/integration/issue1053-extra-files-visuald.sh diff --git a/test/issue1053-extra-files-visuald/dub.json b/test/integration/issue1053-extra-files-visuald/dub.json similarity index 100% rename from test/issue1053-extra-files-visuald/dub.json rename to test/integration/issue1053-extra-files-visuald/dub.json diff --git a/test/issue1053-extra-files-visuald/shaders/saturate.vert b/test/integration/issue1053-extra-files-visuald/shaders/saturate.vert similarity index 100% rename from test/issue1053-extra-files-visuald/shaders/saturate.vert rename to test/integration/issue1053-extra-files-visuald/shaders/saturate.vert diff --git a/test/issue1053-extra-files-visuald/shaders/warp.geom b/test/integration/issue1053-extra-files-visuald/shaders/warp.geom similarity index 100% rename from test/issue1053-extra-files-visuald/shaders/warp.geom rename to test/integration/issue1053-extra-files-visuald/shaders/warp.geom diff --git a/test/issue1053-extra-files-visuald/source/app.d b/test/integration/issue1053-extra-files-visuald/source/app.d similarity index 100% rename from test/issue1053-extra-files-visuald/source/app.d rename to test/integration/issue1053-extra-files-visuald/source/app.d diff --git a/test/issue1053-extra-files-visuald/text/LICENSE.txt b/test/integration/issue1053-extra-files-visuald/text/LICENSE.txt similarity index 100% rename from test/issue1053-extra-files-visuald/text/LICENSE.txt rename to test/integration/issue1053-extra-files-visuald/text/LICENSE.txt diff --git a/test/issue1053-extra-files-visuald/text/README.txt b/test/integration/issue1053-extra-files-visuald/text/README.txt similarity index 100% rename from test/issue1053-extra-files-visuald/text/README.txt rename to test/integration/issue1053-extra-files-visuald/text/README.txt diff --git a/test/issue1070-init-mistakes-dirs-as-files.sh b/test/integration/issue1070-init-mistakes-dirs-as-files.sh similarity index 100% rename from test/issue1070-init-mistakes-dirs-as-files.sh rename to test/integration/issue1070-init-mistakes-dirs-as-files.sh diff --git a/test/issue1070-init-mistakes-dirs-as-files/.no_build b/test/integration/issue1070-init-mistakes-dirs-as-files/.no_build similarity index 100% rename from test/issue1070-init-mistakes-dirs-as-files/.no_build rename to test/integration/issue1070-init-mistakes-dirs-as-files/.no_build diff --git a/test/issue1070-init-mistakes-dirs-as-files/.no_run b/test/integration/issue1070-init-mistakes-dirs-as-files/.no_run similarity index 100% rename from test/issue1070-init-mistakes-dirs-as-files/.no_run rename to test/integration/issue1070-init-mistakes-dirs-as-files/.no_run diff --git a/test/issue1070-init-mistakes-dirs-as-files/.no_test b/test/integration/issue1070-init-mistakes-dirs-as-files/.no_test similarity index 100% rename from test/issue1070-init-mistakes-dirs-as-files/.no_test rename to test/integration/issue1070-init-mistakes-dirs-as-files/.no_test diff --git a/test/issue1070-init-mistakes-dirs-as-files/source/.empty b/test/integration/issue1070-init-mistakes-dirs-as-files/source/.empty similarity index 100% rename from test/issue1070-init-mistakes-dirs-as-files/source/.empty rename to test/integration/issue1070-init-mistakes-dirs-as-files/source/.empty diff --git a/test/issue1091-bogus-rebuild.sh b/test/integration/issue1091-bogus-rebuild.sh similarity index 100% rename from test/issue1091-bogus-rebuild.sh rename to test/integration/issue1091-bogus-rebuild.sh diff --git a/test/issue1117-extra-dependency-files.sh b/test/integration/issue1117-extra-dependency-files.sh similarity index 100% rename from test/issue1117-extra-dependency-files.sh rename to test/integration/issue1117-extra-dependency-files.sh diff --git a/test/issue1117-extra-dependency-files/.gitignore b/test/integration/issue1117-extra-dependency-files/.gitignore similarity index 100% rename from test/issue1117-extra-dependency-files/.gitignore rename to test/integration/issue1117-extra-dependency-files/.gitignore diff --git a/test/issue1117-extra-dependency-files/.no_build b/test/integration/issue1117-extra-dependency-files/.no_build similarity index 100% rename from test/issue1117-extra-dependency-files/.no_build rename to test/integration/issue1117-extra-dependency-files/.no_build diff --git a/test/issue1117-extra-dependency-files/dependency.txt b/test/integration/issue1117-extra-dependency-files/dependency.txt similarity index 100% rename from test/issue1117-extra-dependency-files/dependency.txt rename to test/integration/issue1117-extra-dependency-files/dependency.txt diff --git a/test/issue1117-extra-dependency-files/dub.json b/test/integration/issue1117-extra-dependency-files/dub.json similarity index 100% rename from test/issue1117-extra-dependency-files/dub.json rename to test/integration/issue1117-extra-dependency-files/dub.json diff --git a/test/issue1117-extra-dependency-files/source/app.d b/test/integration/issue1117-extra-dependency-files/source/app.d similarity index 100% rename from test/issue1117-extra-dependency-files/source/app.d rename to test/integration/issue1117-extra-dependency-files/source/app.d diff --git a/test/issue1136-temp-copy-files.sh b/test/integration/issue1136-temp-copy-files.sh similarity index 100% rename from test/issue1136-temp-copy-files.sh rename to test/integration/issue1136-temp-copy-files.sh diff --git a/test/issue1136-temp-copy-files/.no_build b/test/integration/issue1136-temp-copy-files/.no_build similarity index 100% rename from test/issue1136-temp-copy-files/.no_build rename to test/integration/issue1136-temp-copy-files/.no_build diff --git a/test/issue1136-temp-copy-files/app.d b/test/integration/issue1136-temp-copy-files/app.d similarity index 100% rename from test/issue1136-temp-copy-files/app.d rename to test/integration/issue1136-temp-copy-files/app.d diff --git a/test/issue1136-temp-copy-files/mylib/dub.sdl b/test/integration/issue1136-temp-copy-files/mylib/dub.sdl similarity index 100% rename from test/issue1136-temp-copy-files/mylib/dub.sdl rename to test/integration/issue1136-temp-copy-files/mylib/dub.sdl diff --git a/test/issue1136-temp-copy-files/mylib/helloworld.txt b/test/integration/issue1136-temp-copy-files/mylib/helloworld.txt similarity index 100% rename from test/issue1136-temp-copy-files/mylib/helloworld.txt rename to test/integration/issue1136-temp-copy-files/mylib/helloworld.txt diff --git a/test/issue1158-stdin-for-single-files.sh b/test/integration/issue1158-stdin-for-single-files.sh similarity index 100% rename from test/issue1158-stdin-for-single-files.sh rename to test/integration/issue1158-stdin-for-single-files.sh diff --git a/test/issue1158-stdin-for-single-files/.no_build b/test/integration/issue1158-stdin-for-single-files/.no_build similarity index 100% rename from test/issue1158-stdin-for-single-files/.no_build rename to test/integration/issue1158-stdin-for-single-files/.no_build diff --git a/test/issue1158-stdin-for-single-files/stdin.d b/test/integration/issue1158-stdin-for-single-files/stdin.d similarity index 100% rename from test/issue1158-stdin-for-single-files/stdin.d rename to test/integration/issue1158-stdin-for-single-files/stdin.d diff --git a/test/issue1180-local-cache-broken.sh b/test/integration/issue1180-local-cache-broken.sh similarity index 100% rename from test/issue1180-local-cache-broken.sh rename to test/integration/issue1180-local-cache-broken.sh diff --git a/test/issue1180-local-cache-broken.sh.min_frontend b/test/integration/issue1180-local-cache-broken.sh.min_frontend similarity index 100% rename from test/issue1180-local-cache-broken.sh.min_frontend rename to test/integration/issue1180-local-cache-broken.sh.min_frontend diff --git a/test/issue1180-local-cache-broken/.gitignore b/test/integration/issue1180-local-cache-broken/.gitignore similarity index 100% rename from test/issue1180-local-cache-broken/.gitignore rename to test/integration/issue1180-local-cache-broken/.gitignore diff --git a/test/issue1180-local-cache-broken/.no_build b/test/integration/issue1180-local-cache-broken/.no_build similarity index 100% rename from test/issue1180-local-cache-broken/.no_build rename to test/integration/issue1180-local-cache-broken/.no_build diff --git a/test/issue1180-local-cache-broken/dub.json b/test/integration/issue1180-local-cache-broken/dub.json similarity index 100% rename from test/issue1180-local-cache-broken/dub.json rename to test/integration/issue1180-local-cache-broken/dub.json diff --git a/test/issue1180-local-cache-broken/source/app.d b/test/integration/issue1180-local-cache-broken/source/app.d similarity index 100% rename from test/issue1180-local-cache-broken/source/app.d rename to test/integration/issue1180-local-cache-broken/source/app.d diff --git a/test/issue1194-warn-wrong-subconfig.sh b/test/integration/issue1194-warn-wrong-subconfig.sh similarity index 100% rename from test/issue1194-warn-wrong-subconfig.sh rename to test/integration/issue1194-warn-wrong-subconfig.sh diff --git a/test/issue1194-warn-wrong-subconfig/.no_build b/test/integration/issue1194-warn-wrong-subconfig/.no_build similarity index 100% rename from test/issue1194-warn-wrong-subconfig/.no_build rename to test/integration/issue1194-warn-wrong-subconfig/.no_build diff --git a/test/issue1194-warn-wrong-subconfig/dub.sdl b/test/integration/issue1194-warn-wrong-subconfig/dub.sdl similarity index 100% rename from test/issue1194-warn-wrong-subconfig/dub.sdl rename to test/integration/issue1194-warn-wrong-subconfig/dub.sdl diff --git a/test/issue1194-warn-wrong-subconfig/source/app.d b/test/integration/issue1194-warn-wrong-subconfig/source/app.d similarity index 100% rename from test/issue1194-warn-wrong-subconfig/source/app.d rename to test/integration/issue1194-warn-wrong-subconfig/source/app.d diff --git a/test/issue1262-version-inheritance-diamond/.gitignore b/test/integration/issue1262-version-inheritance-diamond/.gitignore similarity index 100% rename from test/issue1262-version-inheritance-diamond/.gitignore rename to test/integration/issue1262-version-inheritance-diamond/.gitignore diff --git a/test/issue1262-version-inheritance-diamond/.no_run b/test/integration/issue1262-version-inheritance-diamond/.no_run similarity index 100% rename from test/issue1262-version-inheritance-diamond/.no_run rename to test/integration/issue1262-version-inheritance-diamond/.no_run diff --git a/test/issue1262-version-inheritance-diamond/.no_test b/test/integration/issue1262-version-inheritance-diamond/.no_test similarity index 100% rename from test/issue1262-version-inheritance-diamond/.no_test rename to test/integration/issue1262-version-inheritance-diamond/.no_test diff --git a/test/issue1262-version-inheritance-diamond/daughter/.gitignore b/test/integration/issue1262-version-inheritance-diamond/daughter/.gitignore similarity index 100% rename from test/issue1262-version-inheritance-diamond/daughter/.gitignore rename to test/integration/issue1262-version-inheritance-diamond/daughter/.gitignore diff --git a/test/issue1262-version-inheritance-diamond/daughter/dub.sdl b/test/integration/issue1262-version-inheritance-diamond/daughter/dub.sdl similarity index 100% rename from test/issue1262-version-inheritance-diamond/daughter/dub.sdl rename to test/integration/issue1262-version-inheritance-diamond/daughter/dub.sdl diff --git a/test/issue1262-version-inheritance-diamond/daughter/source/dummy.d b/test/integration/issue1262-version-inheritance-diamond/daughter/source/dummy.d similarity index 100% rename from test/issue1262-version-inheritance-diamond/daughter/source/dummy.d rename to test/integration/issue1262-version-inheritance-diamond/daughter/source/dummy.d diff --git a/test/issue1262-version-inheritance-diamond/diamond/.gitignore b/test/integration/issue1262-version-inheritance-diamond/diamond/.gitignore similarity index 100% rename from test/issue1262-version-inheritance-diamond/diamond/.gitignore rename to test/integration/issue1262-version-inheritance-diamond/diamond/.gitignore diff --git a/test/issue1262-version-inheritance-diamond/diamond/dub.sdl b/test/integration/issue1262-version-inheritance-diamond/diamond/dub.sdl similarity index 100% rename from test/issue1262-version-inheritance-diamond/diamond/dub.sdl rename to test/integration/issue1262-version-inheritance-diamond/diamond/dub.sdl diff --git a/test/issue1262-version-inheritance-diamond/diamond/source/dummy.d b/test/integration/issue1262-version-inheritance-diamond/diamond/source/dummy.d similarity index 100% rename from test/issue1262-version-inheritance-diamond/diamond/source/dummy.d rename to test/integration/issue1262-version-inheritance-diamond/diamond/source/dummy.d diff --git a/test/issue1262-version-inheritance-diamond/dub.sdl b/test/integration/issue1262-version-inheritance-diamond/dub.sdl similarity index 100% rename from test/issue1262-version-inheritance-diamond/dub.sdl rename to test/integration/issue1262-version-inheritance-diamond/dub.sdl diff --git a/test/issue1262-version-inheritance-diamond/son/.gitignore b/test/integration/issue1262-version-inheritance-diamond/son/.gitignore similarity index 100% rename from test/issue1262-version-inheritance-diamond/son/.gitignore rename to test/integration/issue1262-version-inheritance-diamond/son/.gitignore diff --git a/test/issue1262-version-inheritance-diamond/son/dub.sdl b/test/integration/issue1262-version-inheritance-diamond/son/dub.sdl similarity index 100% rename from test/issue1262-version-inheritance-diamond/son/dub.sdl rename to test/integration/issue1262-version-inheritance-diamond/son/dub.sdl diff --git a/test/issue1262-version-inheritance-diamond/son/source/dummy.d b/test/integration/issue1262-version-inheritance-diamond/son/source/dummy.d similarity index 100% rename from test/issue1262-version-inheritance-diamond/son/source/dummy.d rename to test/integration/issue1262-version-inheritance-diamond/son/source/dummy.d diff --git a/test/issue1262-version-inheritance-diamond/source/app.d b/test/integration/issue1262-version-inheritance-diamond/source/app.d similarity index 100% rename from test/issue1262-version-inheritance-diamond/source/app.d rename to test/integration/issue1262-version-inheritance-diamond/source/app.d diff --git a/test/issue1262-version-inheritance/.gitignore b/test/integration/issue1262-version-inheritance/.gitignore similarity index 100% rename from test/issue1262-version-inheritance/.gitignore rename to test/integration/issue1262-version-inheritance/.gitignore diff --git a/test/issue1262-version-inheritance/.no_run b/test/integration/issue1262-version-inheritance/.no_run similarity index 100% rename from test/issue1262-version-inheritance/.no_run rename to test/integration/issue1262-version-inheritance/.no_run diff --git a/test/issue1262-version-inheritance/.no_test b/test/integration/issue1262-version-inheritance/.no_test similarity index 100% rename from test/issue1262-version-inheritance/.no_test rename to test/integration/issue1262-version-inheritance/.no_test diff --git a/test/issue1262-version-inheritance/daughter/.gitignore b/test/integration/issue1262-version-inheritance/daughter/.gitignore similarity index 100% rename from test/issue1262-version-inheritance/daughter/.gitignore rename to test/integration/issue1262-version-inheritance/daughter/.gitignore diff --git a/test/issue1262-version-inheritance/daughter/dub.sdl b/test/integration/issue1262-version-inheritance/daughter/dub.sdl similarity index 100% rename from test/issue1262-version-inheritance/daughter/dub.sdl rename to test/integration/issue1262-version-inheritance/daughter/dub.sdl diff --git a/test/issue1262-version-inheritance/daughter/source/dummy.d b/test/integration/issue1262-version-inheritance/daughter/source/dummy.d similarity index 100% rename from test/issue1262-version-inheritance/daughter/source/dummy.d rename to test/integration/issue1262-version-inheritance/daughter/source/dummy.d diff --git a/test/issue1262-version-inheritance/dub.sdl b/test/integration/issue1262-version-inheritance/dub.sdl similarity index 100% rename from test/issue1262-version-inheritance/dub.sdl rename to test/integration/issue1262-version-inheritance/dub.sdl diff --git a/test/issue1262-version-inheritance/son/.gitignore b/test/integration/issue1262-version-inheritance/son/.gitignore similarity index 100% rename from test/issue1262-version-inheritance/son/.gitignore rename to test/integration/issue1262-version-inheritance/son/.gitignore diff --git a/test/issue1262-version-inheritance/son/dub.sdl b/test/integration/issue1262-version-inheritance/son/dub.sdl similarity index 100% rename from test/issue1262-version-inheritance/son/dub.sdl rename to test/integration/issue1262-version-inheritance/son/dub.sdl diff --git a/test/issue1262-version-inheritance/son/source/dummy.d b/test/integration/issue1262-version-inheritance/son/source/dummy.d similarity index 100% rename from test/issue1262-version-inheritance/son/source/dummy.d rename to test/integration/issue1262-version-inheritance/son/source/dummy.d diff --git a/test/issue1262-version-inheritance/source/app.d b/test/integration/issue1262-version-inheritance/source/app.d similarity index 100% rename from test/issue1262-version-inheritance/source/app.d rename to test/integration/issue1262-version-inheritance/source/app.d diff --git a/test/issue1277.sh b/test/integration/issue1277.sh similarity index 100% rename from test/issue1277.sh rename to test/integration/issue1277.sh diff --git a/test/issue1277/.no_build b/test/integration/issue1277/.no_build similarity index 100% rename from test/issue1277/.no_build rename to test/integration/issue1277/.no_build diff --git a/test/issue1277/source/app.d b/test/integration/issue1277/source/app.d similarity index 100% rename from test/issue1277/source/app.d rename to test/integration/issue1277/source/app.d diff --git "a/test/issue130-unicode-\320\241\320\235\320\220\320\257\320\220\320\241\320\242\320\225\320\257\320\205/dub.sdl" "b/test/integration/issue130-unicode-\320\241\320\235\320\220\320\257\320\220\320\241\320\242\320\225\320\257\320\205/dub.sdl" similarity index 100% rename from "test/issue130-unicode-\320\241\320\235\320\220\320\257\320\220\320\241\320\242\320\225\320\257\320\205/dub.sdl" rename to "test/integration/issue130-unicode-\320\241\320\235\320\220\320\257\320\220\320\241\320\242\320\225\320\257\320\205/dub.sdl" diff --git "a/test/issue130-unicode-\320\241\320\235\320\220\320\257\320\220\320\241\320\242\320\225\320\257\320\205/source/app.d" "b/test/integration/issue130-unicode-\320\241\320\235\320\220\320\257\320\220\320\241\320\242\320\225\320\257\320\205/source/app.d" similarity index 100% rename from "test/issue130-unicode-\320\241\320\235\320\220\320\257\320\220\320\241\320\242\320\225\320\257\320\205/source/app.d" rename to "test/integration/issue130-unicode-\320\241\320\235\320\220\320\257\320\220\320\241\320\242\320\225\320\257\320\205/source/app.d" diff --git a/test/issue1336-registry/.gitignore b/test/integration/issue1336-registry/.gitignore similarity index 100% rename from test/issue1336-registry/.gitignore rename to test/integration/issue1336-registry/.gitignore diff --git a/test/issue1336-registry/.no_build b/test/integration/issue1336-registry/.no_build similarity index 100% rename from test/issue1336-registry/.no_build rename to test/integration/issue1336-registry/.no_build diff --git a/test/issue1336-registry/api/packages/infos__packages=%5B%22gitcompatibledubpackage%22%5D&include_dependencies=true&minimize=true b/test/integration/issue1336-registry/api/packages/infos__packages=%5B%22gitcompatibledubpackage%22%5D&include_dependencies=true&minimize=true similarity index 100% rename from test/issue1336-registry/api/packages/infos__packages=%5B%22gitcompatibledubpackage%22%5D&include_dependencies=true&minimize=true rename to test/integration/issue1336-registry/api/packages/infos__packages=%5B%22gitcompatibledubpackage%22%5D&include_dependencies=true&minimize=true diff --git a/test/issue1336-registry/packages/gitcompatibledubpackage/1.0.2.zip b/test/integration/issue1336-registry/packages/gitcompatibledubpackage/1.0.2.zip similarity index 100% rename from test/issue1336-registry/packages/gitcompatibledubpackage/1.0.2.zip rename to test/integration/issue1336-registry/packages/gitcompatibledubpackage/1.0.2.zip diff --git a/test/issue1336-registry/packages/gitcompatibledubpackage/1.0.3.zip b/test/integration/issue1336-registry/packages/gitcompatibledubpackage/1.0.3.zip similarity index 100% rename from test/issue1336-registry/packages/gitcompatibledubpackage/1.0.3.zip rename to test/integration/issue1336-registry/packages/gitcompatibledubpackage/1.0.3.zip diff --git a/test/issue1336-registry/packages/gitcompatibledubpackage/1.0.4.zip b/test/integration/issue1336-registry/packages/gitcompatibledubpackage/1.0.4.zip similarity index 100% rename from test/issue1336-registry/packages/gitcompatibledubpackage/1.0.4.zip rename to test/integration/issue1336-registry/packages/gitcompatibledubpackage/1.0.4.zip diff --git a/test/issue1350-transitive-none-deps/.gitignore b/test/integration/issue1350-transitive-none-deps/.gitignore similarity index 100% rename from test/issue1350-transitive-none-deps/.gitignore rename to test/integration/issue1350-transitive-none-deps/.gitignore diff --git a/test/issue1350-transitive-none-deps/.no_run b/test/integration/issue1350-transitive-none-deps/.no_run similarity index 100% rename from test/issue1350-transitive-none-deps/.no_run rename to test/integration/issue1350-transitive-none-deps/.no_run diff --git a/test/issue1350-transitive-none-deps/.no_test b/test/integration/issue1350-transitive-none-deps/.no_test similarity index 100% rename from test/issue1350-transitive-none-deps/.no_test rename to test/integration/issue1350-transitive-none-deps/.no_test diff --git a/test/issue1350-transitive-none-deps/common-dep/common.d b/test/integration/issue1350-transitive-none-deps/common-dep/common.d similarity index 100% rename from test/issue1350-transitive-none-deps/common-dep/common.d rename to test/integration/issue1350-transitive-none-deps/common-dep/common.d diff --git a/test/issue1350-transitive-none-deps/common-dep/dub.sdl b/test/integration/issue1350-transitive-none-deps/common-dep/dub.sdl similarity index 100% rename from test/issue1350-transitive-none-deps/common-dep/dub.sdl rename to test/integration/issue1350-transitive-none-deps/common-dep/dub.sdl diff --git a/test/issue1350-transitive-none-deps/common-none/dub.sdl b/test/integration/issue1350-transitive-none-deps/common-none/dub.sdl similarity index 100% rename from test/issue1350-transitive-none-deps/common-none/dub.sdl rename to test/integration/issue1350-transitive-none-deps/common-none/dub.sdl diff --git a/test/issue1350-transitive-none-deps/dep1/dep1.d b/test/integration/issue1350-transitive-none-deps/dep1/dep1.d similarity index 100% rename from test/issue1350-transitive-none-deps/dep1/dep1.d rename to test/integration/issue1350-transitive-none-deps/dep1/dep1.d diff --git a/test/issue1350-transitive-none-deps/dep1/dub.sdl b/test/integration/issue1350-transitive-none-deps/dep1/dub.sdl similarity index 100% rename from test/issue1350-transitive-none-deps/dep1/dub.sdl rename to test/integration/issue1350-transitive-none-deps/dep1/dub.sdl diff --git a/test/issue1350-transitive-none-deps/dep2/dep2.d b/test/integration/issue1350-transitive-none-deps/dep2/dep2.d similarity index 100% rename from test/issue1350-transitive-none-deps/dep2/dep2.d rename to test/integration/issue1350-transitive-none-deps/dep2/dep2.d diff --git a/test/issue1350-transitive-none-deps/dep2/dub.sdl b/test/integration/issue1350-transitive-none-deps/dep2/dub.sdl similarity index 100% rename from test/issue1350-transitive-none-deps/dep2/dub.sdl rename to test/integration/issue1350-transitive-none-deps/dep2/dub.sdl diff --git a/test/issue1350-transitive-none-deps/dub.sdl b/test/integration/issue1350-transitive-none-deps/dub.sdl similarity index 100% rename from test/issue1350-transitive-none-deps/dub.sdl rename to test/integration/issue1350-transitive-none-deps/dub.sdl diff --git a/test/issue1350-transitive-none-deps/test.d b/test/integration/issue1350-transitive-none-deps/test.d similarity index 100% rename from test/issue1350-transitive-none-deps/test.d rename to test/integration/issue1350-transitive-none-deps/test.d diff --git a/test/issue1372-ignore-files-in-hidden-dirs.sh b/test/integration/issue1372-ignore-files-in-hidden-dirs.sh similarity index 100% rename from test/issue1372-ignore-files-in-hidden-dirs.sh rename to test/integration/issue1372-ignore-files-in-hidden-dirs.sh diff --git a/test/issue1372-ignore-files-in-hidden-dirs/.hiddensource/hello.d b/test/integration/issue1372-ignore-files-in-hidden-dirs/.hiddensource/hello.d similarity index 100% rename from test/issue1372-ignore-files-in-hidden-dirs/.hiddensource/hello.d rename to test/integration/issue1372-ignore-files-in-hidden-dirs/.hiddensource/hello.d diff --git a/test/issue1372-ignore-files-in-hidden-dirs/dub.json b/test/integration/issue1372-ignore-files-in-hidden-dirs/dub.json similarity index 100% rename from test/issue1372-ignore-files-in-hidden-dirs/dub.json rename to test/integration/issue1372-ignore-files-in-hidden-dirs/dub.json diff --git a/test/issue1372-ignore-files-in-hidden-dirs/source/.AppleDouble/app.d b/test/integration/issue1372-ignore-files-in-hidden-dirs/source/.AppleDouble/app.d similarity index 100% rename from test/issue1372-ignore-files-in-hidden-dirs/source/.AppleDouble/app.d rename to test/integration/issue1372-ignore-files-in-hidden-dirs/source/.AppleDouble/app.d diff --git a/test/issue1372-ignore-files-in-hidden-dirs/source/.compileMe/hello.d b/test/integration/issue1372-ignore-files-in-hidden-dirs/source/.compileMe/hello.d similarity index 100% rename from test/issue1372-ignore-files-in-hidden-dirs/source/.compileMe/hello.d rename to test/integration/issue1372-ignore-files-in-hidden-dirs/source/.compileMe/hello.d diff --git a/test/issue1372-ignore-files-in-hidden-dirs/source/app.d b/test/integration/issue1372-ignore-files-in-hidden-dirs/source/app.d similarity index 100% rename from test/issue1372-ignore-files-in-hidden-dirs/source/app.d rename to test/integration/issue1372-ignore-files-in-hidden-dirs/source/app.d diff --git a/test/issue1396-pre-post-run-commands.sh b/test/integration/issue1396-pre-post-run-commands.sh similarity index 100% rename from test/issue1396-pre-post-run-commands.sh rename to test/integration/issue1396-pre-post-run-commands.sh diff --git a/test/issue1396-pre-post-run-commands/.no_build b/test/integration/issue1396-pre-post-run-commands/.no_build similarity index 100% rename from test/issue1396-pre-post-run-commands/.no_build rename to test/integration/issue1396-pre-post-run-commands/.no_build diff --git a/test/issue1396-pre-post-run-commands/dub.sdl b/test/integration/issue1396-pre-post-run-commands/dub.sdl similarity index 100% rename from test/issue1396-pre-post-run-commands/dub.sdl rename to test/integration/issue1396-pre-post-run-commands/dub.sdl diff --git a/test/issue1396-pre-post-run-commands/post-run.sh b/test/integration/issue1396-pre-post-run-commands/post-run.sh similarity index 100% rename from test/issue1396-pre-post-run-commands/post-run.sh rename to test/integration/issue1396-pre-post-run-commands/post-run.sh diff --git a/test/issue1396-pre-post-run-commands/source/app.d b/test/integration/issue1396-pre-post-run-commands/source/app.d similarity index 100% rename from test/issue1396-pre-post-run-commands/source/app.d rename to test/integration/issue1396-pre-post-run-commands/source/app.d diff --git a/test/issue1401-file-system-pkg-supplier/.no_build b/test/integration/issue1401-file-system-pkg-supplier/.no_build similarity index 100% rename from test/issue1401-file-system-pkg-supplier/.no_build rename to test/integration/issue1401-file-system-pkg-supplier/.no_build diff --git a/test/issue1401-file-system-pkg-supplier/fs-json-dubpackage-1.0.7.zip b/test/integration/issue1401-file-system-pkg-supplier/fs-json-dubpackage-1.0.7.zip similarity index 100% rename from test/issue1401-file-system-pkg-supplier/fs-json-dubpackage-1.0.7.zip rename to test/integration/issue1401-file-system-pkg-supplier/fs-json-dubpackage-1.0.7.zip diff --git a/test/issue1401-file-system-pkg-supplier/fs-sdl-dubpackage-1.0.5.zip b/test/integration/issue1401-file-system-pkg-supplier/fs-sdl-dubpackage-1.0.5.zip similarity index 100% rename from test/issue1401-file-system-pkg-supplier/fs-sdl-dubpackage-1.0.5.zip rename to test/integration/issue1401-file-system-pkg-supplier/fs-sdl-dubpackage-1.0.5.zip diff --git a/test/issue1401-file-system-pkg-supplier/fs-sdl-dubpackage-1.0.6.zip b/test/integration/issue1401-file-system-pkg-supplier/fs-sdl-dubpackage-1.0.6.zip similarity index 100% rename from test/issue1401-file-system-pkg-supplier/fs-sdl-dubpackage-1.0.6.zip rename to test/integration/issue1401-file-system-pkg-supplier/fs-sdl-dubpackage-1.0.6.zip diff --git a/test/issue1401-filesystem-supplier.sh b/test/integration/issue1401-filesystem-supplier.sh similarity index 100% rename from test/issue1401-filesystem-supplier.sh rename to test/integration/issue1401-filesystem-supplier.sh diff --git a/test/issue1408-inherit-linker-files/.no_run b/test/integration/issue1408-inherit-linker-files/.no_run similarity index 100% rename from test/issue1408-inherit-linker-files/.no_run rename to test/integration/issue1408-inherit-linker-files/.no_run diff --git a/test/issue1408-inherit-linker-files/.no_test b/test/integration/issue1408-inherit-linker-files/.no_test similarity index 100% rename from test/issue1408-inherit-linker-files/.no_test rename to test/integration/issue1408-inherit-linker-files/.no_test diff --git a/test/issue1408-inherit-linker-files/dep.d b/test/integration/issue1408-inherit-linker-files/dep.d similarity index 100% rename from test/issue1408-inherit-linker-files/dep.d rename to test/integration/issue1408-inherit-linker-files/dep.d diff --git a/test/issue1408-inherit-linker-files/dub.sdl b/test/integration/issue1408-inherit-linker-files/dub.sdl similarity index 100% rename from test/issue1408-inherit-linker-files/dub.sdl rename to test/integration/issue1408-inherit-linker-files/dub.sdl diff --git a/test/issue1408-inherit-linker-files/lib.d b/test/integration/issue1408-inherit-linker-files/lib.d similarity index 100% rename from test/issue1408-inherit-linker-files/lib.d rename to test/integration/issue1408-inherit-linker-files/lib.d diff --git a/test/issue1408-inherit-linker-files/lib/dub.sdl b/test/integration/issue1408-inherit-linker-files/lib/dub.sdl similarity index 100% rename from test/issue1408-inherit-linker-files/lib/dub.sdl rename to test/integration/issue1408-inherit-linker-files/lib/dub.sdl diff --git a/test/issue1408-inherit-linker-files/lib/lib.d b/test/integration/issue1408-inherit-linker-files/lib/lib.d similarity index 100% rename from test/issue1408-inherit-linker-files/lib/lib.d rename to test/integration/issue1408-inherit-linker-files/lib/lib.d diff --git a/test/issue1408-inherit-linker-files/main.d b/test/integration/issue1408-inherit-linker-files/main.d similarity index 100% rename from test/issue1408-inherit-linker-files/main.d rename to test/integration/issue1408-inherit-linker-files/main.d diff --git a/test/issue1416-maven-repo-pkg-supplier.sh b/test/integration/issue1416-maven-repo-pkg-supplier.sh similarity index 100% rename from test/issue1416-maven-repo-pkg-supplier.sh rename to test/integration/issue1416-maven-repo-pkg-supplier.sh diff --git a/test/issue1416-maven-repo-pkg-supplier.sh.min_frontend b/test/integration/issue1416-maven-repo-pkg-supplier.sh.min_frontend similarity index 100% rename from test/issue1416-maven-repo-pkg-supplier.sh.min_frontend rename to test/integration/issue1416-maven-repo-pkg-supplier.sh.min_frontend diff --git a/test/issue1416-maven-repo-pkg-supplier/.gitignore b/test/integration/issue1416-maven-repo-pkg-supplier/.gitignore similarity index 100% rename from test/issue1416-maven-repo-pkg-supplier/.gitignore rename to test/integration/issue1416-maven-repo-pkg-supplier/.gitignore diff --git a/test/issue1416-maven-repo-pkg-supplier/.no_build b/test/integration/issue1416-maven-repo-pkg-supplier/.no_build similarity index 100% rename from test/issue1416-maven-repo-pkg-supplier/.no_build rename to test/integration/issue1416-maven-repo-pkg-supplier/.no_build diff --git a/test/issue1416-maven-repo-pkg-supplier/maven/release/dubpackages/maven-dubpackage/1.0.5/maven-dubpackage-1.0.5.zip b/test/integration/issue1416-maven-repo-pkg-supplier/maven/release/dubpackages/maven-dubpackage/1.0.5/maven-dubpackage-1.0.5.zip similarity index 100% rename from test/issue1416-maven-repo-pkg-supplier/maven/release/dubpackages/maven-dubpackage/1.0.5/maven-dubpackage-1.0.5.zip rename to test/integration/issue1416-maven-repo-pkg-supplier/maven/release/dubpackages/maven-dubpackage/1.0.5/maven-dubpackage-1.0.5.zip diff --git a/test/issue1416-maven-repo-pkg-supplier/maven/release/dubpackages/maven-dubpackage/1.0.6/maven-dubpackage-1.0.6.zip b/test/integration/issue1416-maven-repo-pkg-supplier/maven/release/dubpackages/maven-dubpackage/1.0.6/maven-dubpackage-1.0.6.zip similarity index 100% rename from test/issue1416-maven-repo-pkg-supplier/maven/release/dubpackages/maven-dubpackage/1.0.6/maven-dubpackage-1.0.6.zip rename to test/integration/issue1416-maven-repo-pkg-supplier/maven/release/dubpackages/maven-dubpackage/1.0.6/maven-dubpackage-1.0.6.zip diff --git a/test/issue1416-maven-repo-pkg-supplier/maven/release/dubpackages/maven-dubpackage/maven-metadata.xml b/test/integration/issue1416-maven-repo-pkg-supplier/maven/release/dubpackages/maven-dubpackage/maven-metadata.xml similarity index 100% rename from test/issue1416-maven-repo-pkg-supplier/maven/release/dubpackages/maven-dubpackage/maven-metadata.xml rename to test/integration/issue1416-maven-repo-pkg-supplier/maven/release/dubpackages/maven-dubpackage/maven-metadata.xml diff --git a/test/issue1427-betterC/.gitignore b/test/integration/issue1427-betterC/.gitignore similarity index 100% rename from test/issue1427-betterC/.gitignore rename to test/integration/issue1427-betterC/.gitignore diff --git a/test/issue1427-betterC/.min_frontend b/test/integration/issue1427-betterC/.min_frontend similarity index 100% rename from test/issue1427-betterC/.min_frontend rename to test/integration/issue1427-betterC/.min_frontend diff --git a/test/issue1427-betterC/.no_run b/test/integration/issue1427-betterC/.no_run similarity index 100% rename from test/issue1427-betterC/.no_run rename to test/integration/issue1427-betterC/.no_run diff --git a/test/issue1427-betterC/.no_test b/test/integration/issue1427-betterC/.no_test similarity index 100% rename from test/issue1427-betterC/.no_test rename to test/integration/issue1427-betterC/.no_test diff --git a/test/issue1427-betterC/dub.json b/test/integration/issue1427-betterC/dub.json similarity index 100% rename from test/issue1427-betterC/dub.json rename to test/integration/issue1427-betterC/dub.json diff --git a/test/issue1427-betterC/source/app.d b/test/integration/issue1427-betterC/source/app.d similarity index 100% rename from test/issue1427-betterC/source/app.d rename to test/integration/issue1427-betterC/source/app.d diff --git a/test/issue1447-build-settings-vars.sh b/test/integration/issue1447-build-settings-vars.sh similarity index 100% rename from test/issue1447-build-settings-vars.sh rename to test/integration/issue1447-build-settings-vars.sh diff --git a/test/issue1447-build-settings-vars/.no_run b/test/integration/issue1447-build-settings-vars/.no_run similarity index 100% rename from test/issue1447-build-settings-vars/.no_run rename to test/integration/issue1447-build-settings-vars/.no_run diff --git a/test/issue1447-build-settings-vars/.no_test b/test/integration/issue1447-build-settings-vars/.no_test similarity index 100% rename from test/issue1447-build-settings-vars/.no_test rename to test/integration/issue1447-build-settings-vars/.no_test diff --git a/test/issue1447-build-settings-vars/dub.json b/test/integration/issue1447-build-settings-vars/dub.json similarity index 100% rename from test/issue1447-build-settings-vars/dub.json rename to test/integration/issue1447-build-settings-vars/dub.json diff --git a/test/issue1447-build-settings-vars/source/app.d b/test/integration/issue1447-build-settings-vars/source/app.d similarity index 100% rename from test/issue1447-build-settings-vars/source/app.d rename to test/integration/issue1447-build-settings-vars/source/app.d diff --git a/test/issue1447-build-settings-vars/view-aarch64/arch b/test/integration/issue1447-build-settings-vars/view-aarch64/arch similarity index 100% rename from test/issue1447-build-settings-vars/view-aarch64/arch rename to test/integration/issue1447-build-settings-vars/view-aarch64/arch diff --git a/test/issue1447-build-settings-vars/view-x86/arch b/test/integration/issue1447-build-settings-vars/view-x86/arch similarity index 100% rename from test/issue1447-build-settings-vars/view-x86/arch rename to test/integration/issue1447-build-settings-vars/view-x86/arch diff --git a/test/issue1447-build-settings-vars/view-x86_64/arch b/test/integration/issue1447-build-settings-vars/view-x86_64/arch similarity index 100% rename from test/issue1447-build-settings-vars/view-x86_64/arch rename to test/integration/issue1447-build-settings-vars/view-x86_64/arch diff --git a/test/issue1474-generate-source.script.d b/test/integration/issue1474-generate-source.script.d similarity index 100% rename from test/issue1474-generate-source.script.d rename to test/integration/issue1474-generate-source.script.d diff --git a/test/issue1474/.no_build b/test/integration/issue1474/.no_build similarity index 100% rename from test/issue1474/.no_build rename to test/integration/issue1474/.no_build diff --git a/test/issue1474/dub.json b/test/integration/issue1474/dub.json similarity index 100% rename from test/issue1474/dub.json rename to test/integration/issue1474/dub.json diff --git a/test/issue1474/ext/kekw.d b/test/integration/issue1474/ext/kekw.d similarity index 100% rename from test/issue1474/ext/kekw.d rename to test/integration/issue1474/ext/kekw.d diff --git a/test/issue1474/source/app.d b/test/integration/issue1474/source/app.d similarity index 100% rename from test/issue1474/source/app.d rename to test/integration/issue1474/source/app.d diff --git a/test/issue1477-subpackage-visuald-paths.sh b/test/integration/issue1477-subpackage-visuald-paths.sh similarity index 100% rename from test/issue1477-subpackage-visuald-paths.sh rename to test/integration/issue1477-subpackage-visuald-paths.sh diff --git a/test/issue1477-subpackage-visuald-paths/.no_build b/test/integration/issue1477-subpackage-visuald-paths/.no_build similarity index 100% rename from test/issue1477-subpackage-visuald-paths/.no_build rename to test/integration/issue1477-subpackage-visuald-paths/.no_build diff --git a/test/issue1477-subpackage-visuald-paths/dub.sdl b/test/integration/issue1477-subpackage-visuald-paths/dub.sdl similarity index 100% rename from test/issue1477-subpackage-visuald-paths/dub.sdl rename to test/integration/issue1477-subpackage-visuald-paths/dub.sdl diff --git a/test/issue1477-subpackage-visuald-paths/source/library.d b/test/integration/issue1477-subpackage-visuald-paths/source/library.d similarity index 100% rename from test/issue1477-subpackage-visuald-paths/source/library.d rename to test/integration/issue1477-subpackage-visuald-paths/source/library.d diff --git a/test/issue1477-subpackage-visuald-paths/sub/subpackage_a/dub.sdl b/test/integration/issue1477-subpackage-visuald-paths/sub/subpackage_a/dub.sdl similarity index 100% rename from test/issue1477-subpackage-visuald-paths/sub/subpackage_a/dub.sdl rename to test/integration/issue1477-subpackage-visuald-paths/sub/subpackage_a/dub.sdl diff --git a/test/issue1477-subpackage-visuald-paths/sub/subpackage_a/source/subpackage_a.d b/test/integration/issue1477-subpackage-visuald-paths/sub/subpackage_a/source/subpackage_a.d similarity index 100% rename from test/issue1477-subpackage-visuald-paths/sub/subpackage_a/source/subpackage_a.d rename to test/integration/issue1477-subpackage-visuald-paths/sub/subpackage_a/source/subpackage_a.d diff --git a/test/issue1504-envvar-in-path.sh b/test/integration/issue1504-envvar-in-path.sh similarity index 100% rename from test/issue1504-envvar-in-path.sh rename to test/integration/issue1504-envvar-in-path.sh diff --git a/test/issue1504-envvar-in-path/.no_build b/test/integration/issue1504-envvar-in-path/.no_build similarity index 100% rename from test/issue1504-envvar-in-path/.no_build rename to test/integration/issue1504-envvar-in-path/.no_build diff --git a/test/issue1504-envvar-in-path/dub.json b/test/integration/issue1504-envvar-in-path/dub.json similarity index 100% rename from test/issue1504-envvar-in-path/dub.json rename to test/integration/issue1504-envvar-in-path/dub.json diff --git a/test/issue1504-envvar-in-path/source/app.d b/test/integration/issue1504-envvar-in-path/source/app.d similarity index 100% rename from test/issue1504-envvar-in-path/source/app.d rename to test/integration/issue1504-envvar-in-path/source/app.d diff --git a/test/issue1504-envvar-in-path/teststrings/message.txt b/test/integration/issue1504-envvar-in-path/teststrings/message.txt similarity index 100% rename from test/issue1504-envvar-in-path/teststrings/message.txt rename to test/integration/issue1504-envvar-in-path/teststrings/message.txt diff --git a/test/issue1505-single-file-package-dynamic-library.d b/test/integration/issue1505-single-file-package-dynamic-library.d similarity index 100% rename from test/issue1505-single-file-package-dynamic-library.d rename to test/integration/issue1505-single-file-package-dynamic-library.d diff --git a/test/issue1505-single-file-package-dynamic-library.sh b/test/integration/issue1505-single-file-package-dynamic-library.sh similarity index 100% rename from test/issue1505-single-file-package-dynamic-library.sh rename to test/integration/issue1505-single-file-package-dynamic-library.sh diff --git a/test/issue1524-maven-upgrade-dependency-tree.sh b/test/integration/issue1524-maven-upgrade-dependency-tree.sh similarity index 100% rename from test/issue1524-maven-upgrade-dependency-tree.sh rename to test/integration/issue1524-maven-upgrade-dependency-tree.sh diff --git a/test/issue1524-maven-upgrade-dependency-tree.sh.min_frontend b/test/integration/issue1524-maven-upgrade-dependency-tree.sh.min_frontend similarity index 100% rename from test/issue1524-maven-upgrade-dependency-tree.sh.min_frontend rename to test/integration/issue1524-maven-upgrade-dependency-tree.sh.min_frontend diff --git a/test/issue1524-maven-upgrade-dependency-tree/.gitignore b/test/integration/issue1524-maven-upgrade-dependency-tree/.gitignore similarity index 100% rename from test/issue1524-maven-upgrade-dependency-tree/.gitignore rename to test/integration/issue1524-maven-upgrade-dependency-tree/.gitignore diff --git a/test/issue1524-maven-upgrade-dependency-tree/.no_build b/test/integration/issue1524-maven-upgrade-dependency-tree/.no_build similarity index 100% rename from test/issue1524-maven-upgrade-dependency-tree/.no_build rename to test/integration/issue1524-maven-upgrade-dependency-tree/.no_build diff --git a/test/issue1524-maven-upgrade-dependency-tree/dub.json b/test/integration/issue1524-maven-upgrade-dependency-tree/dub.json similarity index 100% rename from test/issue1524-maven-upgrade-dependency-tree/dub.json rename to test/integration/issue1524-maven-upgrade-dependency-tree/dub.json diff --git a/test/issue1524-maven-upgrade-dependency-tree/maven/release/dubpackages/maven-dubpackage-a/1.0.5/maven-dubpackage-a-1.0.5.zip b/test/integration/issue1524-maven-upgrade-dependency-tree/maven/release/dubpackages/maven-dubpackage-a/1.0.5/maven-dubpackage-a-1.0.5.zip similarity index 100% rename from test/issue1524-maven-upgrade-dependency-tree/maven/release/dubpackages/maven-dubpackage-a/1.0.5/maven-dubpackage-a-1.0.5.zip rename to test/integration/issue1524-maven-upgrade-dependency-tree/maven/release/dubpackages/maven-dubpackage-a/1.0.5/maven-dubpackage-a-1.0.5.zip diff --git a/test/issue1524-maven-upgrade-dependency-tree/maven/release/dubpackages/maven-dubpackage-a/maven-metadata.xml b/test/integration/issue1524-maven-upgrade-dependency-tree/maven/release/dubpackages/maven-dubpackage-a/maven-metadata.xml similarity index 100% rename from test/issue1524-maven-upgrade-dependency-tree/maven/release/dubpackages/maven-dubpackage-a/maven-metadata.xml rename to test/integration/issue1524-maven-upgrade-dependency-tree/maven/release/dubpackages/maven-dubpackage-a/maven-metadata.xml diff --git a/test/issue1524-maven-upgrade-dependency-tree/maven/release/dubpackages/maven-dubpackage-b/1.0.6/maven-dubpackage-b-1.0.6.zip b/test/integration/issue1524-maven-upgrade-dependency-tree/maven/release/dubpackages/maven-dubpackage-b/1.0.6/maven-dubpackage-b-1.0.6.zip similarity index 100% rename from test/issue1524-maven-upgrade-dependency-tree/maven/release/dubpackages/maven-dubpackage-b/1.0.6/maven-dubpackage-b-1.0.6.zip rename to test/integration/issue1524-maven-upgrade-dependency-tree/maven/release/dubpackages/maven-dubpackage-b/1.0.6/maven-dubpackage-b-1.0.6.zip diff --git a/test/issue1524-maven-upgrade-dependency-tree/maven/release/dubpackages/maven-dubpackage-b/maven-metadata.xml b/test/integration/issue1524-maven-upgrade-dependency-tree/maven/release/dubpackages/maven-dubpackage-b/maven-metadata.xml similarity index 100% rename from test/issue1524-maven-upgrade-dependency-tree/maven/release/dubpackages/maven-dubpackage-b/maven-metadata.xml rename to test/integration/issue1524-maven-upgrade-dependency-tree/maven/release/dubpackages/maven-dubpackage-b/maven-metadata.xml diff --git a/test/issue1524-maven-upgrade-dependency-tree/source/app.d b/test/integration/issue1524-maven-upgrade-dependency-tree/source/app.d similarity index 100% rename from test/issue1524-maven-upgrade-dependency-tree/source/app.d rename to test/integration/issue1524-maven-upgrade-dependency-tree/source/app.d diff --git a/test/issue1531-toolchain-requirements.sh b/test/integration/issue1531-toolchain-requirements.sh similarity index 100% rename from test/issue1531-toolchain-requirements.sh rename to test/integration/issue1531-toolchain-requirements.sh diff --git a/test/issue1551-var-escaping/dub.json b/test/integration/issue1551-var-escaping/dub.json similarity index 100% rename from test/issue1551-var-escaping/dub.json rename to test/integration/issue1551-var-escaping/dub.json diff --git a/test/issue1551-var-escaping/source/app.d b/test/integration/issue1551-var-escaping/source/app.d similarity index 100% rename from test/issue1551-var-escaping/source/app.d rename to test/integration/issue1551-var-escaping/source/app.d diff --git a/test/issue1556-fetch-and-build-pkgs/.no_build b/test/integration/issue1556-fetch-and-build-pkgs/.no_build similarity index 100% rename from test/issue1556-fetch-and-build-pkgs/.no_build rename to test/integration/issue1556-fetch-and-build-pkgs/.no_build diff --git a/test/issue1556-fetch-and-build-pkgs/dependency-package-1.0.0.zip b/test/integration/issue1556-fetch-and-build-pkgs/dependency-package-1.0.0.zip similarity index 100% rename from test/issue1556-fetch-and-build-pkgs/dependency-package-1.0.0.zip rename to test/integration/issue1556-fetch-and-build-pkgs/dependency-package-1.0.0.zip diff --git a/test/issue1556-fetch-and-build-pkgs/main-package-1.0.0.zip b/test/integration/issue1556-fetch-and-build-pkgs/main-package-1.0.0.zip similarity index 100% rename from test/issue1556-fetch-and-build-pkgs/main-package-1.0.0.zip rename to test/integration/issue1556-fetch-and-build-pkgs/main-package-1.0.0.zip diff --git a/test/issue1556-fetch-and-build.sh b/test/integration/issue1556-fetch-and-build.sh similarity index 100% rename from test/issue1556-fetch-and-build.sh rename to test/integration/issue1556-fetch-and-build.sh diff --git a/test/issue1567-fetch-sub-package.sh b/test/integration/issue1567-fetch-sub-package.sh similarity index 100% rename from test/issue1567-fetch-sub-package.sh rename to test/integration/issue1567-fetch-sub-package.sh diff --git a/test/issue1567-fetch-sub-package/.no_build b/test/integration/issue1567-fetch-sub-package/.no_build similarity index 100% rename from test/issue1567-fetch-sub-package/.no_build rename to test/integration/issue1567-fetch-sub-package/.no_build diff --git a/test/issue1567-fetch-sub-package/.no_run b/test/integration/issue1567-fetch-sub-package/.no_run similarity index 100% rename from test/issue1567-fetch-sub-package/.no_run rename to test/integration/issue1567-fetch-sub-package/.no_run diff --git a/test/issue1567-fetch-sub-package/.no_test b/test/integration/issue1567-fetch-sub-package/.no_test similarity index 100% rename from test/issue1567-fetch-sub-package/.no_test rename to test/integration/issue1567-fetch-sub-package/.no_test diff --git a/test/issue1567-fetch-sub-package/fetch-sub-package-dubpackage-1.0.1.zip b/test/integration/issue1567-fetch-sub-package/fetch-sub-package-dubpackage-1.0.1.zip similarity index 100% rename from test/issue1567-fetch-sub-package/fetch-sub-package-dubpackage-1.0.1.zip rename to test/integration/issue1567-fetch-sub-package/fetch-sub-package-dubpackage-1.0.1.zip diff --git a/test/issue1574-addcommand.sh b/test/integration/issue1574-addcommand.sh similarity index 100% rename from test/issue1574-addcommand.sh rename to test/integration/issue1574-addcommand.sh diff --git a/test/issue1574-addcommand.sh.min_frontend b/test/integration/issue1574-addcommand.sh.min_frontend similarity index 100% rename from test/issue1574-addcommand.sh.min_frontend rename to test/integration/issue1574-addcommand.sh.min_frontend diff --git a/test/issue1636-betterC-dub-test.sh b/test/integration/issue1636-betterC-dub-test.sh similarity index 100% rename from test/issue1636-betterC-dub-test.sh rename to test/integration/issue1636-betterC-dub-test.sh diff --git a/test/issue1636-betterC-dub-test/.gitignore b/test/integration/issue1636-betterC-dub-test/.gitignore similarity index 100% rename from test/issue1636-betterC-dub-test/.gitignore rename to test/integration/issue1636-betterC-dub-test/.gitignore diff --git a/test/issue1636-betterC-dub-test/.min_frontend b/test/integration/issue1636-betterC-dub-test/.min_frontend similarity index 100% rename from test/issue1636-betterC-dub-test/.min_frontend rename to test/integration/issue1636-betterC-dub-test/.min_frontend diff --git a/test/issue1636-betterC-dub-test/.no_run b/test/integration/issue1636-betterC-dub-test/.no_run similarity index 100% rename from test/issue1636-betterC-dub-test/.no_run rename to test/integration/issue1636-betterC-dub-test/.no_run diff --git a/test/issue1636-betterC-dub-test/dub.json b/test/integration/issue1636-betterC-dub-test/dub.json similarity index 100% rename from test/issue1636-betterC-dub-test/dub.json rename to test/integration/issue1636-betterC-dub-test/dub.json diff --git a/test/issue1636-betterC-dub-test/source/lib.d b/test/integration/issue1636-betterC-dub-test/source/lib.d similarity index 100% rename from test/issue1636-betterC-dub-test/source/lib.d rename to test/integration/issue1636-betterC-dub-test/source/lib.d diff --git a/test/issue1645-dflags-build.sh b/test/integration/issue1645-dflags-build.sh similarity index 100% rename from test/issue1645-dflags-build.sh rename to test/integration/issue1645-dflags-build.sh diff --git a/test/issue1651-custom-dub-init-type.sh b/test/integration/issue1651-custom-dub-init-type.sh similarity index 100% rename from test/issue1651-custom-dub-init-type.sh rename to test/integration/issue1651-custom-dub-init-type.sh diff --git a/test/issue1651-custom-dub-init-type/.no_build b/test/integration/issue1651-custom-dub-init-type/.no_build similarity index 100% rename from test/issue1651-custom-dub-init-type/.no_build rename to test/integration/issue1651-custom-dub-init-type/.no_build diff --git a/test/issue1651-custom-dub-init-type/.no_run b/test/integration/issue1651-custom-dub-init-type/.no_run similarity index 100% rename from test/issue1651-custom-dub-init-type/.no_run rename to test/integration/issue1651-custom-dub-init-type/.no_run diff --git a/test/issue1651-custom-dub-init-type/.no_test b/test/integration/issue1651-custom-dub-init-type/.no_test similarity index 100% rename from test/issue1651-custom-dub-init-type/.no_test rename to test/integration/issue1651-custom-dub-init-type/.no_test diff --git a/test/issue1651-custom-dub-init-type/custom-dub-init-dubpackage-1.0.1.zip b/test/integration/issue1651-custom-dub-init-type/custom-dub-init-dubpackage-1.0.1.zip similarity index 100% rename from test/issue1651-custom-dub-init-type/custom-dub-init-dubpackage-1.0.1.zip rename to test/integration/issue1651-custom-dub-init-type/custom-dub-init-dubpackage-1.0.1.zip diff --git a/test/issue1691-build-subpkg.sh b/test/integration/issue1691-build-subpkg.sh similarity index 100% rename from test/issue1691-build-subpkg.sh rename to test/integration/issue1691-build-subpkg.sh diff --git a/test/issue1691-build-subpkg/.gitignore b/test/integration/issue1691-build-subpkg/.gitignore similarity index 100% rename from test/issue1691-build-subpkg/.gitignore rename to test/integration/issue1691-build-subpkg/.gitignore diff --git a/test/issue1691-build-subpkg/.no_build b/test/integration/issue1691-build-subpkg/.no_build similarity index 100% rename from test/issue1691-build-subpkg/.no_build rename to test/integration/issue1691-build-subpkg/.no_build diff --git a/test/issue1691-build-subpkg/dub.sdl b/test/integration/issue1691-build-subpkg/dub.sdl similarity index 100% rename from test/issue1691-build-subpkg/dub.sdl rename to test/integration/issue1691-build-subpkg/dub.sdl diff --git a/test/issue1691-build-subpkg/source/app.d b/test/integration/issue1691-build-subpkg/source/app.d similarity index 100% rename from test/issue1691-build-subpkg/source/app.d rename to test/integration/issue1691-build-subpkg/source/app.d diff --git a/test/issue1691-build-subpkg/subpkg/dub.sdl b/test/integration/issue1691-build-subpkg/subpkg/dub.sdl similarity index 100% rename from test/issue1691-build-subpkg/subpkg/dub.sdl rename to test/integration/issue1691-build-subpkg/subpkg/dub.sdl diff --git a/test/issue1691-build-subpkg/subpkg/source/subpkg.d b/test/integration/issue1691-build-subpkg/subpkg/source/subpkg.d similarity index 100% rename from test/issue1691-build-subpkg/subpkg/source/subpkg.d rename to test/integration/issue1691-build-subpkg/subpkg/source/subpkg.d diff --git a/test/issue1739-project-settings-file.sh b/test/integration/issue1739-project-settings-file.sh similarity index 100% rename from test/issue1739-project-settings-file.sh rename to test/integration/issue1739-project-settings-file.sh diff --git a/test/issue1773-lint.sh b/test/integration/issue1773-lint.sh similarity index 100% rename from test/issue1773-lint.sh rename to test/integration/issue1773-lint.sh diff --git a/test/issue1773-lint/.gitignore b/test/integration/issue1773-lint/.gitignore similarity index 100% rename from test/issue1773-lint/.gitignore rename to test/integration/issue1773-lint/.gitignore diff --git a/test/issue1773-lint/.no_build b/test/integration/issue1773-lint/.no_build similarity index 100% rename from test/issue1773-lint/.no_build rename to test/integration/issue1773-lint/.no_build diff --git a/test/issue1773-lint/dub.json b/test/integration/issue1773-lint/dub.json similarity index 100% rename from test/issue1773-lint/dub.json rename to test/integration/issue1773-lint/dub.json diff --git a/test/issue1773-lint/source/app.d b/test/integration/issue1773-lint/source/app.d similarity index 100% rename from test/issue1773-lint/source/app.d rename to test/integration/issue1773-lint/source/app.d diff --git a/test/issue1775/.no_run b/test/integration/issue1775/.no_run similarity index 100% rename from test/issue1775/.no_run rename to test/integration/issue1775/.no_run diff --git a/test/issue1775/.no_test b/test/integration/issue1775/.no_test similarity index 100% rename from test/issue1775/.no_test rename to test/integration/issue1775/.no_test diff --git a/test/issue1775/dub.json b/test/integration/issue1775/dub.json similarity index 100% rename from test/issue1775/dub.json rename to test/integration/issue1775/dub.json diff --git a/test/issue1775/issue1775.marker b/test/integration/issue1775/issue1775.marker similarity index 100% rename from test/issue1775/issue1775.marker rename to test/integration/issue1775/issue1775.marker diff --git a/test/issue1775/source/app.d b/test/integration/issue1775/source/app.d similarity index 100% rename from test/issue1775/source/app.d rename to test/integration/issue1775/source/app.d diff --git a/test/issue1788-incomplete-string-import-override/b/dub.sdl b/test/integration/issue1788-incomplete-string-import-override/b/dub.sdl similarity index 100% rename from test/issue1788-incomplete-string-import-override/b/dub.sdl rename to test/integration/issue1788-incomplete-string-import-override/b/dub.sdl diff --git a/test/issue1788-incomplete-string-import-override/b/source/b/foo.d b/test/integration/issue1788-incomplete-string-import-override/b/source/b/foo.d similarity index 100% rename from test/issue1788-incomplete-string-import-override/b/source/b/foo.d rename to test/integration/issue1788-incomplete-string-import-override/b/source/b/foo.d diff --git a/test/issue1788-incomplete-string-import-override/b/views/layout.diet b/test/integration/issue1788-incomplete-string-import-override/b/views/layout.diet similarity index 100% rename from test/issue1788-incomplete-string-import-override/b/views/layout.diet rename to test/integration/issue1788-incomplete-string-import-override/b/views/layout.diet diff --git a/test/issue1788-incomplete-string-import-override/c/dub.sdl b/test/integration/issue1788-incomplete-string-import-override/c/dub.sdl similarity index 100% rename from test/issue1788-incomplete-string-import-override/c/dub.sdl rename to test/integration/issue1788-incomplete-string-import-override/c/dub.sdl diff --git a/test/issue1788-incomplete-string-import-override/c/source/dummy.d b/test/integration/issue1788-incomplete-string-import-override/c/source/dummy.d similarity index 100% rename from test/issue1788-incomplete-string-import-override/c/source/dummy.d rename to test/integration/issue1788-incomplete-string-import-override/c/source/dummy.d diff --git a/test/issue1788-incomplete-string-import-override/c/views/fancylayout.diet b/test/integration/issue1788-incomplete-string-import-override/c/views/fancylayout.diet similarity index 100% rename from test/issue1788-incomplete-string-import-override/c/views/fancylayout.diet rename to test/integration/issue1788-incomplete-string-import-override/c/views/fancylayout.diet diff --git a/test/issue1788-incomplete-string-import-override/dub.sdl b/test/integration/issue1788-incomplete-string-import-override/dub.sdl similarity index 100% rename from test/issue1788-incomplete-string-import-override/dub.sdl rename to test/integration/issue1788-incomplete-string-import-override/dub.sdl diff --git a/test/issue1788-incomplete-string-import-override/source/app.d b/test/integration/issue1788-incomplete-string-import-override/source/app.d similarity index 100% rename from test/issue1788-incomplete-string-import-override/source/app.d rename to test/integration/issue1788-incomplete-string-import-override/source/app.d diff --git a/test/issue1788-incomplete-string-import-override/views/layout.diet b/test/integration/issue1788-incomplete-string-import-override/views/layout.diet similarity index 100% rename from test/issue1788-incomplete-string-import-override/views/layout.diet rename to test/integration/issue1788-incomplete-string-import-override/views/layout.diet diff --git a/test/issue1856-build-unittest.sh b/test/integration/issue1856-build-unittest.sh similarity index 100% rename from test/issue1856-build-unittest.sh rename to test/integration/issue1856-build-unittest.sh diff --git a/test/issue1867-lowmem.sh b/test/integration/issue1867-lowmem.sh similarity index 100% rename from test/issue1867-lowmem.sh rename to test/integration/issue1867-lowmem.sh diff --git a/test/issue1867-lowmem/.gitignore b/test/integration/issue1867-lowmem/.gitignore similarity index 100% rename from test/issue1867-lowmem/.gitignore rename to test/integration/issue1867-lowmem/.gitignore diff --git a/test/issue1867-lowmem/.no_build b/test/integration/issue1867-lowmem/.no_build similarity index 100% rename from test/issue1867-lowmem/.no_build rename to test/integration/issue1867-lowmem/.no_build diff --git a/test/issue1867-lowmem/.no_run b/test/integration/issue1867-lowmem/.no_run similarity index 100% rename from test/issue1867-lowmem/.no_run rename to test/integration/issue1867-lowmem/.no_run diff --git a/test/issue1867-lowmem/.no_test b/test/integration/issue1867-lowmem/.no_test similarity index 100% rename from test/issue1867-lowmem/.no_test rename to test/integration/issue1867-lowmem/.no_test diff --git a/test/issue1867-lowmem/dub.sdl b/test/integration/issue1867-lowmem/dub.sdl similarity index 100% rename from test/issue1867-lowmem/dub.sdl rename to test/integration/issue1867-lowmem/dub.sdl diff --git a/test/issue1867-lowmem/dub.settings.json b/test/integration/issue1867-lowmem/dub.settings.json similarity index 100% rename from test/issue1867-lowmem/dub.settings.json rename to test/integration/issue1867-lowmem/dub.settings.json diff --git a/test/issue1867-lowmem/source/app.d b/test/integration/issue1867-lowmem/source/app.d similarity index 100% rename from test/issue1867-lowmem/source/app.d rename to test/integration/issue1867-lowmem/source/app.d diff --git a/test/issue2012-dc-env/.no_build b/test/integration/issue2012-dc-env/.no_build similarity index 100% rename from test/issue2012-dc-env/.no_build rename to test/integration/issue2012-dc-env/.no_build diff --git a/test/issue2012-dc-env/app.d b/test/integration/issue2012-dc-env/app.d similarity index 100% rename from test/issue2012-dc-env/app.d rename to test/integration/issue2012-dc-env/app.d diff --git a/test/issue2046-ignored-optional-with-path/.no_build b/test/integration/issue2046-ignored-optional-with-path/.no_build similarity index 100% rename from test/issue2046-ignored-optional-with-path/.no_build rename to test/integration/issue2046-ignored-optional-with-path/.no_build diff --git a/test/issue2046-ignored-optional-with-path/.no_run b/test/integration/issue2046-ignored-optional-with-path/.no_run similarity index 100% rename from test/issue2046-ignored-optional-with-path/.no_run rename to test/integration/issue2046-ignored-optional-with-path/.no_run diff --git a/test/issue2046-ignored-optional-with-path/.no_test b/test/integration/issue2046-ignored-optional-with-path/.no_test similarity index 100% rename from test/issue2046-ignored-optional-with-path/.no_test rename to test/integration/issue2046-ignored-optional-with-path/.no_test diff --git a/test/issue2046-ignored-optional-with-path/dub.json b/test/integration/issue2046-ignored-optional-with-path/dub.json similarity index 100% rename from test/issue2046-ignored-optional-with-path/dub.json rename to test/integration/issue2046-ignored-optional-with-path/dub.json diff --git a/test/issue2046-ignored-optional-with-path/dub.selections.json-nofoo b/test/integration/issue2046-ignored-optional-with-path/dub.selections.json-nofoo similarity index 100% rename from test/issue2046-ignored-optional-with-path/dub.selections.json-nofoo rename to test/integration/issue2046-ignored-optional-with-path/dub.selections.json-nofoo diff --git a/test/issue2046-ignored-optional-with-path/dub.selections.json-usefoo b/test/integration/issue2046-ignored-optional-with-path/dub.selections.json-usefoo similarity index 100% rename from test/issue2046-ignored-optional-with-path/dub.selections.json-usefoo rename to test/integration/issue2046-ignored-optional-with-path/dub.selections.json-usefoo diff --git a/test/issue2046-ignored-optional-with-path/libbar/dub.json b/test/integration/issue2046-ignored-optional-with-path/libbar/dub.json similarity index 100% rename from test/issue2046-ignored-optional-with-path/libbar/dub.json rename to test/integration/issue2046-ignored-optional-with-path/libbar/dub.json diff --git a/test/issue2046-ignored-optional-with-path/libbar/source/libbar/bar.d b/test/integration/issue2046-ignored-optional-with-path/libbar/source/libbar/bar.d similarity index 100% rename from test/issue2046-ignored-optional-with-path/libbar/source/libbar/bar.d rename to test/integration/issue2046-ignored-optional-with-path/libbar/source/libbar/bar.d diff --git a/test/issue2046-ignored-optional-with-path/libfoo/dub.json b/test/integration/issue2046-ignored-optional-with-path/libfoo/dub.json similarity index 100% rename from test/issue2046-ignored-optional-with-path/libfoo/dub.json rename to test/integration/issue2046-ignored-optional-with-path/libfoo/dub.json diff --git a/test/issue2046-ignored-optional-with-path/libfoo/source/libfoo/foo.d b/test/integration/issue2046-ignored-optional-with-path/libfoo/source/libfoo/foo.d similarity index 100% rename from test/issue2046-ignored-optional-with-path/libfoo/source/libfoo/foo.d rename to test/integration/issue2046-ignored-optional-with-path/libfoo/source/libfoo/foo.d diff --git a/test/issue2046-ignored-optional-with-path/source/app.d b/test/integration/issue2046-ignored-optional-with-path/source/app.d similarity index 100% rename from test/issue2046-ignored-optional-with-path/source/app.d rename to test/integration/issue2046-ignored-optional-with-path/source/app.d diff --git a/test/issue2051_running_unittests_from_dub_single_file_packages_fails.d b/test/integration/issue2051_running_unittests_from_dub_single_file_packages_fails.d similarity index 100% rename from test/issue2051_running_unittests_from_dub_single_file_packages_fails.d rename to test/integration/issue2051_running_unittests_from_dub_single_file_packages_fails.d diff --git a/test/issue2085-target-none-visuald.sh b/test/integration/issue2085-target-none-visuald.sh similarity index 100% rename from test/issue2085-target-none-visuald.sh rename to test/integration/issue2085-target-none-visuald.sh diff --git a/test/issue2085-target-none-visuald/.no_build b/test/integration/issue2085-target-none-visuald/.no_build similarity index 100% rename from test/issue2085-target-none-visuald/.no_build rename to test/integration/issue2085-target-none-visuald/.no_build diff --git a/test/issue2085-target-none-visuald/.no_run b/test/integration/issue2085-target-none-visuald/.no_run similarity index 100% rename from test/issue2085-target-none-visuald/.no_run rename to test/integration/issue2085-target-none-visuald/.no_run diff --git a/test/issue2085-target-none-visuald/dub.json b/test/integration/issue2085-target-none-visuald/dub.json similarity index 100% rename from test/issue2085-target-none-visuald/dub.json rename to test/integration/issue2085-target-none-visuald/dub.json diff --git a/test/issue2085-target-none-visuald/sub/dub.json b/test/integration/issue2085-target-none-visuald/sub/dub.json similarity index 100% rename from test/issue2085-target-none-visuald/sub/dub.json rename to test/integration/issue2085-target-none-visuald/sub/dub.json diff --git a/test/issue2085-target-none-visuald/sub/source/app.d b/test/integration/issue2085-target-none-visuald/sub/source/app.d similarity index 100% rename from test/issue2085-target-none-visuald/sub/source/app.d rename to test/integration/issue2085-target-none-visuald/sub/source/app.d diff --git a/test/issue2086-copyfiles-subpackage-targetpath.sh b/test/integration/issue2086-copyfiles-subpackage-targetpath.sh similarity index 100% rename from test/issue2086-copyfiles-subpackage-targetpath.sh rename to test/integration/issue2086-copyfiles-subpackage-targetpath.sh diff --git a/test/issue2086-copyfiles-subpackage-targetpath/.no_run b/test/integration/issue2086-copyfiles-subpackage-targetpath/.no_run similarity index 100% rename from test/issue2086-copyfiles-subpackage-targetpath/.no_run rename to test/integration/issue2086-copyfiles-subpackage-targetpath/.no_run diff --git a/test/issue2086-copyfiles-subpackage-targetpath/.no_test b/test/integration/issue2086-copyfiles-subpackage-targetpath/.no_test similarity index 100% rename from test/issue2086-copyfiles-subpackage-targetpath/.no_test rename to test/integration/issue2086-copyfiles-subpackage-targetpath/.no_test diff --git a/test/issue2086-copyfiles-subpackage-targetpath/dub.json b/test/integration/issue2086-copyfiles-subpackage-targetpath/dub.json similarity index 100% rename from test/issue2086-copyfiles-subpackage-targetpath/dub.json rename to test/integration/issue2086-copyfiles-subpackage-targetpath/dub.json diff --git a/test/issue2086-copyfiles-subpackage-targetpath/sub/dub.json b/test/integration/issue2086-copyfiles-subpackage-targetpath/sub/dub.json similarity index 100% rename from test/issue2086-copyfiles-subpackage-targetpath/sub/dub.json rename to test/integration/issue2086-copyfiles-subpackage-targetpath/sub/dub.json diff --git a/test/issue2086-copyfiles-subpackage-targetpath/sub/files/to_be_deployed.txt b/test/integration/issue2086-copyfiles-subpackage-targetpath/sub/files/to_be_deployed.txt similarity index 100% rename from test/issue2086-copyfiles-subpackage-targetpath/sub/files/to_be_deployed.txt rename to test/integration/issue2086-copyfiles-subpackage-targetpath/sub/files/to_be_deployed.txt diff --git a/test/issue2086-copyfiles-subpackage-targetpath/sub/source/app.d b/test/integration/issue2086-copyfiles-subpackage-targetpath/sub/source/app.d similarity index 100% rename from test/issue2086-copyfiles-subpackage-targetpath/sub/source/app.d rename to test/integration/issue2086-copyfiles-subpackage-targetpath/sub/source/app.d diff --git a/test/issue2190-unset-TEMP.script.d b/test/integration/issue2190-unset-TEMP.script.d similarity index 100% rename from test/issue2190-unset-TEMP.script.d rename to test/integration/issue2190-unset-TEMP.script.d diff --git a/test/issue2192-environment-variables.sh b/test/integration/issue2192-environment-variables.sh similarity index 100% rename from test/issue2192-environment-variables.sh rename to test/integration/issue2192-environment-variables.sh diff --git a/test/issue2192-environment-variables/.no_run b/test/integration/issue2192-environment-variables/.no_run similarity index 100% rename from test/issue2192-environment-variables/.no_run rename to test/integration/issue2192-environment-variables/.no_run diff --git a/test/issue2192-environment-variables/dub.sdl b/test/integration/issue2192-environment-variables/dub.sdl similarity index 100% rename from test/issue2192-environment-variables/dub.sdl rename to test/integration/issue2192-environment-variables/dub.sdl diff --git a/test/issue2192-environment-variables/source/lib.d b/test/integration/issue2192-environment-variables/source/lib.d similarity index 100% rename from test/issue2192-environment-variables/source/lib.d rename to test/integration/issue2192-environment-variables/source/lib.d diff --git a/test/issue2234-copy-read-only-files.script.d b/test/integration/issue2234-copy-read-only-files.script.d similarity index 100% rename from test/issue2234-copy-read-only-files.script.d rename to test/integration/issue2234-copy-read-only-files.script.d diff --git a/test/issue2234-copy-read-only-files/.gitignore b/test/integration/issue2234-copy-read-only-files/.gitignore similarity index 100% rename from test/issue2234-copy-read-only-files/.gitignore rename to test/integration/issue2234-copy-read-only-files/.gitignore diff --git a/test/issue2234-copy-read-only-files/dub.json b/test/integration/issue2234-copy-read-only-files/dub.json similarity index 100% rename from test/issue2234-copy-read-only-files/dub.json rename to test/integration/issue2234-copy-read-only-files/dub.json diff --git a/test/issue2234-copy-read-only-files/files/images/to_be_deployed.img b/test/integration/issue2234-copy-read-only-files/files/images/to_be_deployed.img similarity index 100% rename from test/issue2234-copy-read-only-files/files/images/to_be_deployed.img rename to test/integration/issue2234-copy-read-only-files/files/images/to_be_deployed.img diff --git a/test/issue2234-copy-read-only-files/files/to_be_deployed.bin b/test/integration/issue2234-copy-read-only-files/files/to_be_deployed.bin similarity index 100% rename from test/issue2234-copy-read-only-files/files/to_be_deployed.bin rename to test/integration/issue2234-copy-read-only-files/files/to_be_deployed.bin diff --git a/test/issue2234-copy-read-only-files/source/app.d b/test/integration/issue2234-copy-read-only-files/source/app.d similarity index 100% rename from test/issue2234-copy-read-only-files/source/app.d rename to test/integration/issue2234-copy-read-only-files/source/app.d diff --git a/test/issue2258-dynLib-exe-dep/.no_build_dmd b/test/integration/issue2258-dynLib-exe-dep/.no_build_dmd similarity index 100% rename from test/issue2258-dynLib-exe-dep/.no_build_dmd rename to test/integration/issue2258-dynLib-exe-dep/.no_build_dmd diff --git a/test/issue2258-dynLib-exe-dep/.no_build_gdc b/test/integration/issue2258-dynLib-exe-dep/.no_build_gdc similarity index 100% rename from test/issue2258-dynLib-exe-dep/.no_build_gdc rename to test/integration/issue2258-dynLib-exe-dep/.no_build_gdc diff --git a/test/issue2258-dynLib-exe-dep/dub.json b/test/integration/issue2258-dynLib-exe-dep/dub.json similarity index 100% rename from test/issue2258-dynLib-exe-dep/dub.json rename to test/integration/issue2258-dynLib-exe-dep/dub.json diff --git a/test/issue2258-dynLib-exe-dep/source/app.d b/test/integration/issue2258-dynLib-exe-dep/source/app.d similarity index 100% rename from test/issue2258-dynLib-exe-dep/source/app.d rename to test/integration/issue2258-dynLib-exe-dep/source/app.d diff --git a/test/issue2262-exact-cached-version-match.sh b/test/integration/issue2262-exact-cached-version-match.sh similarity index 100% rename from test/issue2262-exact-cached-version-match.sh rename to test/integration/issue2262-exact-cached-version-match.sh diff --git a/test/issue2262-exact-cached-version-match/.no_build b/test/integration/issue2262-exact-cached-version-match/.no_build similarity index 100% rename from test/issue2262-exact-cached-version-match/.no_build rename to test/integration/issue2262-exact-cached-version-match/.no_build diff --git a/test/issue2262-exact-cached-version-match/dub.sdl b/test/integration/issue2262-exact-cached-version-match/dub.sdl similarity index 100% rename from test/issue2262-exact-cached-version-match/dub.sdl rename to test/integration/issue2262-exact-cached-version-match/dub.sdl diff --git a/test/issue2262-exact-cached-version-match/source/app.d b/test/integration/issue2262-exact-cached-version-match/source/app.d similarity index 100% rename from test/issue2262-exact-cached-version-match/source/app.d rename to test/integration/issue2262-exact-cached-version-match/source/app.d diff --git a/test/issue2348-postbuildcommands.script.d b/test/integration/issue2348-postbuildcommands.script.d similarity index 100% rename from test/issue2348-postbuildcommands.script.d rename to test/integration/issue2348-postbuildcommands.script.d diff --git a/test/issue2377-dynLib-dep-extra-files.script.d b/test/integration/issue2377-dynLib-dep-extra-files.script.d similarity index 100% rename from test/issue2377-dynLib-dep-extra-files.script.d rename to test/integration/issue2377-dynLib-dep-extra-files.script.d diff --git a/test/issue2377-dynLib-dep-extra-files/.gitignore b/test/integration/issue2377-dynLib-dep-extra-files/.gitignore similarity index 100% rename from test/issue2377-dynLib-dep-extra-files/.gitignore rename to test/integration/issue2377-dynLib-dep-extra-files/.gitignore diff --git a/test/issue2377-dynLib-dep-extra-files/.no_build b/test/integration/issue2377-dynLib-dep-extra-files/.no_build similarity index 100% rename from test/issue2377-dynLib-dep-extra-files/.no_build rename to test/integration/issue2377-dynLib-dep-extra-files/.no_build diff --git a/test/issue2377-dynLib-dep-extra-files/dep1/dub.sdl b/test/integration/issue2377-dynLib-dep-extra-files/dep1/dub.sdl similarity index 100% rename from test/issue2377-dynLib-dep-extra-files/dep1/dub.sdl rename to test/integration/issue2377-dynLib-dep-extra-files/dep1/dub.sdl diff --git a/test/issue2377-dynLib-dep-extra-files/dep1/source/dep1.d b/test/integration/issue2377-dynLib-dep-extra-files/dep1/source/dep1.d similarity index 100% rename from test/issue2377-dynLib-dep-extra-files/dep1/source/dep1.d rename to test/integration/issue2377-dynLib-dep-extra-files/dep1/source/dep1.d diff --git a/test/issue2377-dynLib-dep-extra-files/dep2/dub.sdl b/test/integration/issue2377-dynLib-dep-extra-files/dep2/dub.sdl similarity index 100% rename from test/issue2377-dynLib-dep-extra-files/dep2/dub.sdl rename to test/integration/issue2377-dynLib-dep-extra-files/dep2/dub.sdl diff --git a/test/issue2377-dynLib-dep-extra-files/dep2/source/dep2.d b/test/integration/issue2377-dynLib-dep-extra-files/dep2/source/dep2.d similarity index 100% rename from test/issue2377-dynLib-dep-extra-files/dep2/source/dep2.d rename to test/integration/issue2377-dynLib-dep-extra-files/dep2/source/dep2.d diff --git a/test/issue2377-dynLib-dep-extra-files/framework/dub.sdl b/test/integration/issue2377-dynLib-dep-extra-files/framework/dub.sdl similarity index 100% rename from test/issue2377-dynLib-dep-extra-files/framework/dub.sdl rename to test/integration/issue2377-dynLib-dep-extra-files/framework/dub.sdl diff --git a/test/issue2377-dynLib-dep-extra-files/parent/dub.sdl b/test/integration/issue2377-dynLib-dep-extra-files/parent/dub.sdl similarity index 100% rename from test/issue2377-dynLib-dep-extra-files/parent/dub.sdl rename to test/integration/issue2377-dynLib-dep-extra-files/parent/dub.sdl diff --git a/test/issue2377-dynLib-dep-extra-files/parent/source/app.d b/test/integration/issue2377-dynLib-dep-extra-files/parent/source/app.d similarity index 100% rename from test/issue2377-dynLib-dep-extra-files/parent/source/app.d rename to test/integration/issue2377-dynLib-dep-extra-files/parent/source/app.d diff --git a/test/issue2377-dynLib-dep-extra-files/parent/source/parent.d b/test/integration/issue2377-dynLib-dep-extra-files/parent/source/parent.d similarity index 100% rename from test/issue2377-dynLib-dep-extra-files/parent/source/parent.d rename to test/integration/issue2377-dynLib-dep-extra-files/parent/source/parent.d diff --git a/test/issue2448/dub.json b/test/integration/issue2448/dub.json similarity index 100% rename from test/issue2448/dub.json rename to test/integration/issue2448/dub.json diff --git a/test/issue2448/ext/kekw.d b/test/integration/issue2448/ext/kekw.d similarity index 100% rename from test/issue2448/ext/kekw.d rename to test/integration/issue2448/ext/kekw.d diff --git a/test/issue2448/source/app.d b/test/integration/issue2448/source/app.d similarity index 100% rename from test/issue2448/source/app.d rename to test/integration/issue2448/source/app.d diff --git a/test/issue2452/.no_test b/test/integration/issue2452/.no_test similarity index 100% rename from test/issue2452/.no_test rename to test/integration/issue2452/.no_test diff --git a/test/issue2452/dub.json b/test/integration/issue2452/dub.json similarity index 100% rename from test/issue2452/dub.json rename to test/integration/issue2452/dub.json diff --git a/test/issue2452/source/app.d b/test/integration/issue2452/source/app.d similarity index 100% rename from test/issue2452/source/app.d rename to test/integration/issue2452/source/app.d diff --git a/test/issue2574-mistyping-commands.sh b/test/integration/issue2574-mistyping-commands.sh similarity index 100% rename from test/issue2574-mistyping-commands.sh rename to test/integration/issue2574-mistyping-commands.sh diff --git a/test/issue2587-subpackage-dependency-resolution.sh b/test/integration/issue2587-subpackage-dependency-resolution.sh similarity index 100% rename from test/issue2587-subpackage-dependency-resolution.sh rename to test/integration/issue2587-subpackage-dependency-resolution.sh diff --git a/test/issue2587-subpackage-dependency-resolution/.no_build b/test/integration/issue2587-subpackage-dependency-resolution/.no_build similarity index 100% rename from test/issue2587-subpackage-dependency-resolution/.no_build rename to test/integration/issue2587-subpackage-dependency-resolution/.no_build diff --git a/test/issue2587-subpackage-dependency-resolution/.no_run b/test/integration/issue2587-subpackage-dependency-resolution/.no_run similarity index 100% rename from test/issue2587-subpackage-dependency-resolution/.no_run rename to test/integration/issue2587-subpackage-dependency-resolution/.no_run diff --git a/test/issue2587-subpackage-dependency-resolution/.no_test b/test/integration/issue2587-subpackage-dependency-resolution/.no_test similarity index 100% rename from test/issue2587-subpackage-dependency-resolution/.no_test rename to test/integration/issue2587-subpackage-dependency-resolution/.no_test diff --git a/test/issue2587-subpackage-dependency-resolution/a/.gitignore b/test/integration/issue2587-subpackage-dependency-resolution/a/.gitignore similarity index 100% rename from test/issue2587-subpackage-dependency-resolution/a/.gitignore rename to test/integration/issue2587-subpackage-dependency-resolution/a/.gitignore diff --git a/test/issue2587-subpackage-dependency-resolution/a/dub.json b/test/integration/issue2587-subpackage-dependency-resolution/a/dub.json similarity index 100% rename from test/issue2587-subpackage-dependency-resolution/a/dub.json rename to test/integration/issue2587-subpackage-dependency-resolution/a/dub.json diff --git a/test/issue2587-subpackage-dependency-resolution/a/source/app.d b/test/integration/issue2587-subpackage-dependency-resolution/a/source/app.d similarity index 100% rename from test/issue2587-subpackage-dependency-resolution/a/source/app.d rename to test/integration/issue2587-subpackage-dependency-resolution/a/source/app.d diff --git a/test/issue2587-subpackage-dependency-resolution/b/.gitignore b/test/integration/issue2587-subpackage-dependency-resolution/b/.gitignore similarity index 100% rename from test/issue2587-subpackage-dependency-resolution/b/.gitignore rename to test/integration/issue2587-subpackage-dependency-resolution/b/.gitignore diff --git a/test/issue2587-subpackage-dependency-resolution/b/dub.json b/test/integration/issue2587-subpackage-dependency-resolution/b/dub.json similarity index 100% rename from test/issue2587-subpackage-dependency-resolution/b/dub.json rename to test/integration/issue2587-subpackage-dependency-resolution/b/dub.json diff --git a/test/issue2587-subpackage-dependency-resolution/b/source/b.d b/test/integration/issue2587-subpackage-dependency-resolution/b/source/b.d similarity index 100% rename from test/issue2587-subpackage-dependency-resolution/b/source/b.d rename to test/integration/issue2587-subpackage-dependency-resolution/b/source/b.d diff --git a/test/issue2587-subpackage-dependency-resolution/c/.gitignore b/test/integration/issue2587-subpackage-dependency-resolution/c/.gitignore similarity index 100% rename from test/issue2587-subpackage-dependency-resolution/c/.gitignore rename to test/integration/issue2587-subpackage-dependency-resolution/c/.gitignore diff --git a/test/issue2587-subpackage-dependency-resolution/c/dub.json b/test/integration/issue2587-subpackage-dependency-resolution/c/dub.json similarity index 100% rename from test/issue2587-subpackage-dependency-resolution/c/dub.json rename to test/integration/issue2587-subpackage-dependency-resolution/c/dub.json diff --git a/test/issue2587-subpackage-dependency-resolution/c/source/c.d b/test/integration/issue2587-subpackage-dependency-resolution/c/source/c.d similarity index 100% rename from test/issue2587-subpackage-dependency-resolution/c/source/c.d rename to test/integration/issue2587-subpackage-dependency-resolution/c/source/c.d diff --git a/test/issue2650-deprecated-modules/.no_build b/test/integration/issue2650-deprecated-modules/.no_build similarity index 100% rename from test/issue2650-deprecated-modules/.no_build rename to test/integration/issue2650-deprecated-modules/.no_build diff --git a/test/issue2650-deprecated-modules/.no_run b/test/integration/issue2650-deprecated-modules/.no_run similarity index 100% rename from test/issue2650-deprecated-modules/.no_run rename to test/integration/issue2650-deprecated-modules/.no_run diff --git a/test/issue2650-deprecated-modules/dub.sdl b/test/integration/issue2650-deprecated-modules/dub.sdl similarity index 100% rename from test/issue2650-deprecated-modules/dub.sdl rename to test/integration/issue2650-deprecated-modules/dub.sdl diff --git a/test/issue2650-deprecated-modules/source/test.d b/test/integration/issue2650-deprecated-modules/source/test.d similarity index 100% rename from test/issue2650-deprecated-modules/source/test.d rename to test/integration/issue2650-deprecated-modules/source/test.d diff --git a/test/issue2684-recipe-file.sh b/test/integration/issue2684-recipe-file.sh similarity index 100% rename from test/issue2684-recipe-file.sh rename to test/integration/issue2684-recipe-file.sh diff --git a/test/issue2684-recipe-file/.gitignore b/test/integration/issue2684-recipe-file/.gitignore similarity index 100% rename from test/issue2684-recipe-file/.gitignore rename to test/integration/issue2684-recipe-file/.gitignore diff --git a/test/issue2684-recipe-file/anotherSource/app.d b/test/integration/issue2684-recipe-file/anotherSource/app.d similarity index 100% rename from test/issue2684-recipe-file/anotherSource/app.d rename to test/integration/issue2684-recipe-file/anotherSource/app.d diff --git a/test/issue2684-recipe-file/dub.json b/test/integration/issue2684-recipe-file/dub.json similarity index 100% rename from test/issue2684-recipe-file/dub.json rename to test/integration/issue2684-recipe-file/dub.json diff --git a/test/issue2684-recipe-file/dubWithAnotherSource.json b/test/integration/issue2684-recipe-file/dubWithAnotherSource.json similarity index 100% rename from test/issue2684-recipe-file/dubWithAnotherSource.json rename to test/integration/issue2684-recipe-file/dubWithAnotherSource.json diff --git a/test/issue2684-recipe-file/source/app.d b/test/integration/issue2684-recipe-file/source/app.d similarity index 100% rename from test/issue2684-recipe-file/source/app.d rename to test/integration/issue2684-recipe-file/source/app.d diff --git a/test/issue2698-cimportpaths-broken-with-dmd-ldc/c_headers/foo.h b/test/integration/issue2698-cimportpaths-broken-with-dmd-ldc/c_headers/foo.h similarity index 100% rename from test/issue2698-cimportpaths-broken-with-dmd-ldc/c_headers/foo.h rename to test/integration/issue2698-cimportpaths-broken-with-dmd-ldc/c_headers/foo.h diff --git a/test/issue2698-cimportpaths-broken-with-dmd-ldc/dub.sdl b/test/integration/issue2698-cimportpaths-broken-with-dmd-ldc/dub.sdl similarity index 100% rename from test/issue2698-cimportpaths-broken-with-dmd-ldc/dub.sdl rename to test/integration/issue2698-cimportpaths-broken-with-dmd-ldc/dub.sdl diff --git a/test/issue2698-cimportpaths-broken-with-dmd-ldc/source/app.d b/test/integration/issue2698-cimportpaths-broken-with-dmd-ldc/source/app.d similarity index 100% rename from test/issue2698-cimportpaths-broken-with-dmd-ldc/source/app.d rename to test/integration/issue2698-cimportpaths-broken-with-dmd-ldc/source/app.d diff --git a/test/issue2698-cimportpaths-broken-with-dmd-ldc/source/foo.c b/test/integration/issue2698-cimportpaths-broken-with-dmd-ldc/source/foo.c similarity index 100% rename from test/issue2698-cimportpaths-broken-with-dmd-ldc/source/foo.c rename to test/integration/issue2698-cimportpaths-broken-with-dmd-ldc/source/foo.c diff --git a/test/issue2840-build-collision.sh b/test/integration/issue2840-build-collision.sh similarity index 100% rename from test/issue2840-build-collision.sh rename to test/integration/issue2840-build-collision.sh diff --git a/test/issue2840-build-collision/.no_build b/test/integration/issue2840-build-collision/.no_build similarity index 100% rename from test/issue2840-build-collision/.no_build rename to test/integration/issue2840-build-collision/.no_build diff --git a/test/issue2840-build-collision/build.d b/test/integration/issue2840-build-collision/build.d similarity index 100% rename from test/issue2840-build-collision/build.d rename to test/integration/issue2840-build-collision/build.d diff --git a/test/issue346-redundant-flags.sh b/test/integration/issue346-redundant-flags.sh similarity index 100% rename from test/issue346-redundant-flags.sh rename to test/integration/issue346-redundant-flags.sh diff --git a/test/issue346-redundant-flags/.no_build b/test/integration/issue346-redundant-flags/.no_build similarity index 100% rename from test/issue346-redundant-flags/.no_build rename to test/integration/issue346-redundant-flags/.no_build diff --git a/test/issue346-redundant-flags/.no_run b/test/integration/issue346-redundant-flags/.no_run similarity index 100% rename from test/issue346-redundant-flags/.no_run rename to test/integration/issue346-redundant-flags/.no_run diff --git a/test/issue346-redundant-flags/.no_test b/test/integration/issue346-redundant-flags/.no_test similarity index 100% rename from test/issue346-redundant-flags/.no_test rename to test/integration/issue346-redundant-flags/.no_test diff --git a/test/issue346-redundant-flags/a/dub.json b/test/integration/issue346-redundant-flags/a/dub.json similarity index 100% rename from test/issue346-redundant-flags/a/dub.json rename to test/integration/issue346-redundant-flags/a/dub.json diff --git a/test/issue346-redundant-flags/a/source/a.d b/test/integration/issue346-redundant-flags/a/source/a.d similarity index 100% rename from test/issue346-redundant-flags/a/source/a.d rename to test/integration/issue346-redundant-flags/a/source/a.d diff --git a/test/issue346-redundant-flags/b/dub.json b/test/integration/issue346-redundant-flags/b/dub.json similarity index 100% rename from test/issue346-redundant-flags/b/dub.json rename to test/integration/issue346-redundant-flags/b/dub.json diff --git a/test/issue346-redundant-flags/b/source/b.d b/test/integration/issue346-redundant-flags/b/source/b.d similarity index 100% rename from test/issue346-redundant-flags/b/source/b.d rename to test/integration/issue346-redundant-flags/b/source/b.d diff --git a/test/issue346-redundant-flags/main/dub.json b/test/integration/issue346-redundant-flags/main/dub.json similarity index 100% rename from test/issue346-redundant-flags/main/dub.json rename to test/integration/issue346-redundant-flags/main/dub.json diff --git a/test/issue346-redundant-flags/main/source/main.d b/test/integration/issue346-redundant-flags/main/source/main.d similarity index 100% rename from test/issue346-redundant-flags/main/source/main.d rename to test/integration/issue346-redundant-flags/main/source/main.d diff --git a/test/issue361-optional-deps.sh b/test/integration/issue361-optional-deps.sh similarity index 100% rename from test/issue361-optional-deps.sh rename to test/integration/issue361-optional-deps.sh diff --git a/test/issue361-optional-deps/.no_build b/test/integration/issue361-optional-deps/.no_build similarity index 100% rename from test/issue361-optional-deps/.no_build rename to test/integration/issue361-optional-deps/.no_build diff --git a/test/issue361-optional-deps/a/dub.sdl b/test/integration/issue361-optional-deps/a/dub.sdl similarity index 100% rename from test/issue361-optional-deps/a/dub.sdl rename to test/integration/issue361-optional-deps/a/dub.sdl diff --git a/test/issue361-optional-deps/a/src/a.d b/test/integration/issue361-optional-deps/a/src/a.d similarity index 100% rename from test/issue361-optional-deps/a/src/a.d rename to test/integration/issue361-optional-deps/a/src/a.d diff --git a/test/issue361-optional-deps/b/dub.sdl b/test/integration/issue361-optional-deps/b/dub.sdl similarity index 100% rename from test/issue361-optional-deps/b/dub.sdl rename to test/integration/issue361-optional-deps/b/dub.sdl diff --git a/test/issue361-optional-deps/b/src/b.d b/test/integration/issue361-optional-deps/b/src/b.d similarity index 100% rename from test/issue361-optional-deps/b/src/b.d rename to test/integration/issue361-optional-deps/b/src/b.d diff --git a/test/issue361-optional-deps/main1/dub.sdl b/test/integration/issue361-optional-deps/main1/dub.sdl similarity index 100% rename from test/issue361-optional-deps/main1/dub.sdl rename to test/integration/issue361-optional-deps/main1/dub.sdl diff --git a/test/issue361-optional-deps/main1/src/main1.d b/test/integration/issue361-optional-deps/main1/src/main1.d similarity index 100% rename from test/issue361-optional-deps/main1/src/main1.d rename to test/integration/issue361-optional-deps/main1/src/main1.d diff --git a/test/issue361-optional-deps/main2/dub.sdl b/test/integration/issue361-optional-deps/main2/dub.sdl similarity index 100% rename from test/issue361-optional-deps/main2/dub.sdl rename to test/integration/issue361-optional-deps/main2/dub.sdl diff --git a/test/issue361-optional-deps/main2/dub.selections.json b/test/integration/issue361-optional-deps/main2/dub.selections.json similarity index 100% rename from test/issue361-optional-deps/main2/dub.selections.json rename to test/integration/issue361-optional-deps/main2/dub.selections.json diff --git a/test/issue361-optional-deps/main2/src/main2.d b/test/integration/issue361-optional-deps/main2/src/main2.d similarity index 100% rename from test/issue361-optional-deps/main2/src/main2.d rename to test/integration/issue361-optional-deps/main2/src/main2.d diff --git a/test/issue502-root-import/dub.json b/test/integration/issue502-root-import/dub.json similarity index 100% rename from test/issue502-root-import/dub.json rename to test/integration/issue502-root-import/dub.json diff --git a/test/issue502-root-import/source/app.d b/test/integration/issue502-root-import/source/app.d similarity index 100% rename from test/issue502-root-import/source/app.d rename to test/integration/issue502-root-import/source/app.d diff --git a/test/issue564-invalid-upgrade-dependency.sh b/test/integration/issue564-invalid-upgrade-dependency.sh similarity index 100% rename from test/issue564-invalid-upgrade-dependency.sh rename to test/integration/issue564-invalid-upgrade-dependency.sh diff --git a/test/issue564-invalid-upgrade-dependency/.no_build b/test/integration/issue564-invalid-upgrade-dependency/.no_build similarity index 100% rename from test/issue564-invalid-upgrade-dependency/.no_build rename to test/integration/issue564-invalid-upgrade-dependency/.no_build diff --git a/test/issue564-invalid-upgrade-dependency/.no_run b/test/integration/issue564-invalid-upgrade-dependency/.no_run similarity index 100% rename from test/issue564-invalid-upgrade-dependency/.no_run rename to test/integration/issue564-invalid-upgrade-dependency/.no_run diff --git a/test/issue564-invalid-upgrade-dependency/.no_test b/test/integration/issue564-invalid-upgrade-dependency/.no_test similarity index 100% rename from test/issue564-invalid-upgrade-dependency/.no_test rename to test/integration/issue564-invalid-upgrade-dependency/.no_test diff --git a/test/issue564-invalid-upgrade-dependency/a-1.0.0/dub.json b/test/integration/issue564-invalid-upgrade-dependency/a-1.0.0/dub.json similarity index 100% rename from test/issue564-invalid-upgrade-dependency/a-1.0.0/dub.json rename to test/integration/issue564-invalid-upgrade-dependency/a-1.0.0/dub.json diff --git a/test/issue564-invalid-upgrade-dependency/a-1.0.0/source/a.d b/test/integration/issue564-invalid-upgrade-dependency/a-1.0.0/source/a.d similarity index 100% rename from test/issue564-invalid-upgrade-dependency/a-1.0.0/source/a.d rename to test/integration/issue564-invalid-upgrade-dependency/a-1.0.0/source/a.d diff --git a/test/issue564-invalid-upgrade-dependency/a-1.1.0/dub.json b/test/integration/issue564-invalid-upgrade-dependency/a-1.1.0/dub.json similarity index 100% rename from test/issue564-invalid-upgrade-dependency/a-1.1.0/dub.json rename to test/integration/issue564-invalid-upgrade-dependency/a-1.1.0/dub.json diff --git a/test/issue564-invalid-upgrade-dependency/a-1.1.0/source/a.d b/test/integration/issue564-invalid-upgrade-dependency/a-1.1.0/source/a.d similarity index 100% rename from test/issue564-invalid-upgrade-dependency/a-1.1.0/source/a.d rename to test/integration/issue564-invalid-upgrade-dependency/a-1.1.0/source/a.d diff --git a/test/issue564-invalid-upgrade-dependency/main/dub.json b/test/integration/issue564-invalid-upgrade-dependency/main/dub.json similarity index 100% rename from test/issue564-invalid-upgrade-dependency/main/dub.json rename to test/integration/issue564-invalid-upgrade-dependency/main/dub.json diff --git a/test/issue564-invalid-upgrade-dependency/main/dub.selections.json b/test/integration/issue564-invalid-upgrade-dependency/main/dub.selections.json similarity index 100% rename from test/issue564-invalid-upgrade-dependency/main/dub.selections.json rename to test/integration/issue564-invalid-upgrade-dependency/main/dub.selections.json diff --git a/test/issue564-invalid-upgrade-dependency/main/source/app.d b/test/integration/issue564-invalid-upgrade-dependency/main/source/app.d similarity index 100% rename from test/issue564-invalid-upgrade-dependency/main/source/app.d rename to test/integration/issue564-invalid-upgrade-dependency/main/source/app.d diff --git a/test/issue586-subpack-dep.sh b/test/integration/issue586-subpack-dep.sh similarity index 100% rename from test/issue586-subpack-dep.sh rename to test/integration/issue586-subpack-dep.sh diff --git a/test/issue586-subpack-dep/.no_build b/test/integration/issue586-subpack-dep/.no_build similarity index 100% rename from test/issue586-subpack-dep/.no_build rename to test/integration/issue586-subpack-dep/.no_build diff --git a/test/issue586-subpack-dep/.no_run b/test/integration/issue586-subpack-dep/.no_run similarity index 100% rename from test/issue586-subpack-dep/.no_run rename to test/integration/issue586-subpack-dep/.no_run diff --git a/test/issue586-subpack-dep/.no_test b/test/integration/issue586-subpack-dep/.no_test similarity index 100% rename from test/issue586-subpack-dep/.no_test rename to test/integration/issue586-subpack-dep/.no_test diff --git a/test/issue586-subpack-dep/a/b/dub.sdl b/test/integration/issue586-subpack-dep/a/b/dub.sdl similarity index 100% rename from test/issue586-subpack-dep/a/b/dub.sdl rename to test/integration/issue586-subpack-dep/a/b/dub.sdl diff --git a/test/issue586-subpack-dep/a/b/source/b.d b/test/integration/issue586-subpack-dep/a/b/source/b.d similarity index 100% rename from test/issue586-subpack-dep/a/b/source/b.d rename to test/integration/issue586-subpack-dep/a/b/source/b.d diff --git a/test/issue586-subpack-dep/a/dub.sdl b/test/integration/issue586-subpack-dep/a/dub.sdl similarity index 100% rename from test/issue586-subpack-dep/a/dub.sdl rename to test/integration/issue586-subpack-dep/a/dub.sdl diff --git a/test/issue586-subpack-dep/a/source/a.d b/test/integration/issue586-subpack-dep/a/source/a.d similarity index 100% rename from test/issue586-subpack-dep/a/source/a.d rename to test/integration/issue586-subpack-dep/a/source/a.d diff --git a/test/issue586-subpack-dep/main/dub.sdl b/test/integration/issue586-subpack-dep/main/dub.sdl similarity index 100% rename from test/issue586-subpack-dep/main/dub.sdl rename to test/integration/issue586-subpack-dep/main/dub.sdl diff --git a/test/issue586-subpack-dep/main/dub.selections.json b/test/integration/issue586-subpack-dep/main/dub.selections.json similarity index 100% rename from test/issue586-subpack-dep/main/dub.selections.json rename to test/integration/issue586-subpack-dep/main/dub.selections.json diff --git a/test/issue586-subpack-dep/main/source/c.d b/test/integration/issue586-subpack-dep/main/source/c.d similarity index 100% rename from test/issue586-subpack-dep/main/source/c.d rename to test/integration/issue586-subpack-dep/main/source/c.d diff --git a/test/issue613-dynlib-pic.sh b/test/integration/issue613-dynlib-pic.sh similarity index 100% rename from test/issue613-dynlib-pic.sh rename to test/integration/issue613-dynlib-pic.sh diff --git a/test/issue613-dynlib-pic/.gitignore b/test/integration/issue613-dynlib-pic/.gitignore similarity index 100% rename from test/issue613-dynlib-pic/.gitignore rename to test/integration/issue613-dynlib-pic/.gitignore diff --git a/test/issue613-dynlib-pic/.no_build b/test/integration/issue613-dynlib-pic/.no_build similarity index 100% rename from test/issue613-dynlib-pic/.no_build rename to test/integration/issue613-dynlib-pic/.no_build diff --git a/test/issue613-dynlib-pic/.no_run b/test/integration/issue613-dynlib-pic/.no_run similarity index 100% rename from test/issue613-dynlib-pic/.no_run rename to test/integration/issue613-dynlib-pic/.no_run diff --git a/test/issue613-dynlib-pic/.no_test b/test/integration/issue613-dynlib-pic/.no_test similarity index 100% rename from test/issue613-dynlib-pic/.no_test rename to test/integration/issue613-dynlib-pic/.no_test diff --git a/test/issue613-dynlib-pic/dub.sdl b/test/integration/issue613-dynlib-pic/dub.sdl similarity index 100% rename from test/issue613-dynlib-pic/dub.sdl rename to test/integration/issue613-dynlib-pic/dub.sdl diff --git a/test/issue613-dynlib-pic/source/app.d b/test/integration/issue613-dynlib-pic/source/app.d similarity index 100% rename from test/issue613-dynlib-pic/source/app.d rename to test/integration/issue613-dynlib-pic/source/app.d diff --git a/test/issue616-describe-vs-generate-commands.sh b/test/integration/issue616-describe-vs-generate-commands.sh similarity index 100% rename from test/issue616-describe-vs-generate-commands.sh rename to test/integration/issue616-describe-vs-generate-commands.sh diff --git a/test/issue616-describe-vs-generate-commands/.no_build b/test/integration/issue616-describe-vs-generate-commands/.no_build similarity index 100% rename from test/issue616-describe-vs-generate-commands/.no_build rename to test/integration/issue616-describe-vs-generate-commands/.no_build diff --git a/test/issue616-describe-vs-generate-commands/do-preGenerateCommands.sh b/test/integration/issue616-describe-vs-generate-commands/do-preGenerateCommands.sh similarity index 100% rename from test/issue616-describe-vs-generate-commands/do-preGenerateCommands.sh rename to test/integration/issue616-describe-vs-generate-commands/do-preGenerateCommands.sh diff --git a/test/issue616-describe-vs-generate-commands/dub.json b/test/integration/issue616-describe-vs-generate-commands/dub.json similarity index 100% rename from test/issue616-describe-vs-generate-commands/dub.json rename to test/integration/issue616-describe-vs-generate-commands/dub.json diff --git a/test/issue616-describe-vs-generate-commands/src/dummy.d b/test/integration/issue616-describe-vs-generate-commands/src/dummy.d similarity index 100% rename from test/issue616-describe-vs-generate-commands/src/dummy.d rename to test/integration/issue616-describe-vs-generate-commands/src/dummy.d diff --git a/test/issue616-subpack/.no_build b/test/integration/issue616-subpack/.no_build similarity index 100% rename from test/issue616-subpack/.no_build rename to test/integration/issue616-subpack/.no_build diff --git a/test/issue616-subpack/dub.json b/test/integration/issue616-subpack/dub.json similarity index 100% rename from test/issue616-subpack/dub.json rename to test/integration/issue616-subpack/dub.json diff --git a/test/issue616-subpack/src/dummy.d b/test/integration/issue616-subpack/src/dummy.d similarity index 100% rename from test/issue616-subpack/src/dummy.d rename to test/integration/issue616-subpack/src/dummy.d diff --git a/test/issue616-subsubpack/.no_build b/test/integration/issue616-subsubpack/.no_build similarity index 100% rename from test/issue616-subsubpack/.no_build rename to test/integration/issue616-subsubpack/.no_build diff --git a/test/issue616-subsubpack/dub.json b/test/integration/issue616-subsubpack/dub.json similarity index 100% rename from test/issue616-subsubpack/dub.json rename to test/integration/issue616-subsubpack/dub.json diff --git a/test/issue616-subsubpack/src/dummy.d b/test/integration/issue616-subsubpack/src/dummy.d similarity index 100% rename from test/issue616-subsubpack/src/dummy.d rename to test/integration/issue616-subsubpack/src/dummy.d diff --git a/test/issue672-upgrade-optional.sh b/test/integration/issue672-upgrade-optional.sh similarity index 100% rename from test/issue672-upgrade-optional.sh rename to test/integration/issue672-upgrade-optional.sh diff --git a/test/issue672-upgrade-optional/.no_build b/test/integration/issue672-upgrade-optional/.no_build similarity index 100% rename from test/issue672-upgrade-optional/.no_build rename to test/integration/issue672-upgrade-optional/.no_build diff --git a/test/issue672-upgrade-optional/dub.sdl b/test/integration/issue672-upgrade-optional/dub.sdl similarity index 100% rename from test/issue672-upgrade-optional/dub.sdl rename to test/integration/issue672-upgrade-optional/dub.sdl diff --git a/test/issue672-upgrade-optional/dub.selections.json b/test/integration/issue672-upgrade-optional/dub.selections.json similarity index 100% rename from test/issue672-upgrade-optional/dub.selections.json rename to test/integration/issue672-upgrade-optional/dub.selections.json diff --git a/test/issue674-concurrent-dub.sh b/test/integration/issue674-concurrent-dub.sh similarity index 100% rename from test/issue674-concurrent-dub.sh rename to test/integration/issue674-concurrent-dub.sh diff --git a/test/issue686-multiple-march.sh b/test/integration/issue686-multiple-march.sh similarity index 100% rename from test/issue686-multiple-march.sh rename to test/integration/issue686-multiple-march.sh diff --git a/test/issue686-multiple-march/.no_build b/test/integration/issue686-multiple-march/.no_build similarity index 100% rename from test/issue686-multiple-march/.no_build rename to test/integration/issue686-multiple-march/.no_build diff --git a/test/issue686-multiple-march/.no_run b/test/integration/issue686-multiple-march/.no_run similarity index 100% rename from test/issue686-multiple-march/.no_run rename to test/integration/issue686-multiple-march/.no_run diff --git a/test/issue686-multiple-march/.no_test b/test/integration/issue686-multiple-march/.no_test similarity index 100% rename from test/issue686-multiple-march/.no_test rename to test/integration/issue686-multiple-march/.no_test diff --git a/test/issue686-multiple-march/a/dub.json b/test/integration/issue686-multiple-march/a/dub.json similarity index 100% rename from test/issue686-multiple-march/a/dub.json rename to test/integration/issue686-multiple-march/a/dub.json diff --git a/test/issue686-multiple-march/a/source/a.d b/test/integration/issue686-multiple-march/a/source/a.d similarity index 100% rename from test/issue686-multiple-march/a/source/a.d rename to test/integration/issue686-multiple-march/a/source/a.d diff --git a/test/issue686-multiple-march/b/dub.json b/test/integration/issue686-multiple-march/b/dub.json similarity index 100% rename from test/issue686-multiple-march/b/dub.json rename to test/integration/issue686-multiple-march/b/dub.json diff --git a/test/issue686-multiple-march/b/source/b.d b/test/integration/issue686-multiple-march/b/source/b.d similarity index 100% rename from test/issue686-multiple-march/b/source/b.d rename to test/integration/issue686-multiple-march/b/source/b.d diff --git a/test/issue686-multiple-march/main/dub.json b/test/integration/issue686-multiple-march/main/dub.json similarity index 100% rename from test/issue686-multiple-march/main/dub.json rename to test/integration/issue686-multiple-march/main/dub.json diff --git a/test/issue686-multiple-march/main/source/main.d b/test/integration/issue686-multiple-march/main/source/main.d similarity index 100% rename from test/issue686-multiple-march/main/source/main.d rename to test/integration/issue686-multiple-march/main/source/main.d diff --git a/test/issue754-path-selection-fail/a-1.0/dub.sdl b/test/integration/issue754-path-selection-fail/a-1.0/dub.sdl similarity index 100% rename from test/issue754-path-selection-fail/a-1.0/dub.sdl rename to test/integration/issue754-path-selection-fail/a-1.0/dub.sdl diff --git a/test/issue754-path-selection-fail/a-1.0/source/a.d b/test/integration/issue754-path-selection-fail/a-1.0/source/a.d similarity index 100% rename from test/issue754-path-selection-fail/a-1.0/source/a.d rename to test/integration/issue754-path-selection-fail/a-1.0/source/a.d diff --git a/test/issue754-path-selection-fail/a-2.0/dub.sdl b/test/integration/issue754-path-selection-fail/a-2.0/dub.sdl similarity index 100% rename from test/issue754-path-selection-fail/a-2.0/dub.sdl rename to test/integration/issue754-path-selection-fail/a-2.0/dub.sdl diff --git a/test/issue754-path-selection-fail/dub.sdl b/test/integration/issue754-path-selection-fail/dub.sdl similarity index 100% rename from test/issue754-path-selection-fail/dub.sdl rename to test/integration/issue754-path-selection-fail/dub.sdl diff --git a/test/issue754-path-selection-fail/dub.selections.json b/test/integration/issue754-path-selection-fail/dub.selections.json similarity index 100% rename from test/issue754-path-selection-fail/dub.selections.json rename to test/integration/issue754-path-selection-fail/dub.selections.json diff --git a/test/issue754-path-selection-fail/source/app.d b/test/integration/issue754-path-selection-fail/source/app.d similarity index 100% rename from test/issue754-path-selection-fail/source/app.d rename to test/integration/issue754-path-selection-fail/source/app.d diff --git a/test/issue777-bogus-path-dependency/b/a.d b/test/integration/issue777-bogus-path-dependency/b/a.d similarity index 100% rename from test/issue777-bogus-path-dependency/b/a.d rename to test/integration/issue777-bogus-path-dependency/b/a.d diff --git a/test/issue777-bogus-path-dependency/b/dub.sdl b/test/integration/issue777-bogus-path-dependency/b/dub.sdl similarity index 100% rename from test/issue777-bogus-path-dependency/b/dub.sdl rename to test/integration/issue777-bogus-path-dependency/b/dub.sdl diff --git a/test/issue777-bogus-path-dependency/c-err/dub.sdl b/test/integration/issue777-bogus-path-dependency/c-err/dub.sdl similarity index 100% rename from test/issue777-bogus-path-dependency/c-err/dub.sdl rename to test/integration/issue777-bogus-path-dependency/c-err/dub.sdl diff --git a/test/issue777-bogus-path-dependency/c-err/source/lib.d b/test/integration/issue777-bogus-path-dependency/c-err/source/lib.d similarity index 100% rename from test/issue777-bogus-path-dependency/c-err/source/lib.d rename to test/integration/issue777-bogus-path-dependency/c-err/source/lib.d diff --git a/test/issue777-bogus-path-dependency/c/dub.sdl b/test/integration/issue777-bogus-path-dependency/c/dub.sdl similarity index 100% rename from test/issue777-bogus-path-dependency/c/dub.sdl rename to test/integration/issue777-bogus-path-dependency/c/dub.sdl diff --git a/test/issue777-bogus-path-dependency/c/source/lib.d b/test/integration/issue777-bogus-path-dependency/c/source/lib.d similarity index 100% rename from test/issue777-bogus-path-dependency/c/source/lib.d rename to test/integration/issue777-bogus-path-dependency/c/source/lib.d diff --git a/test/issue777-bogus-path-dependency/dub.sdl b/test/integration/issue777-bogus-path-dependency/dub.sdl similarity index 100% rename from test/issue777-bogus-path-dependency/dub.sdl rename to test/integration/issue777-bogus-path-dependency/dub.sdl diff --git a/test/issue777-bogus-path-dependency/dub.selections.json b/test/integration/issue777-bogus-path-dependency/dub.selections.json similarity index 100% rename from test/issue777-bogus-path-dependency/dub.selections.json rename to test/integration/issue777-bogus-path-dependency/dub.selections.json diff --git a/test/issue777-bogus-path-dependency/source/app.d b/test/integration/issue777-bogus-path-dependency/source/app.d similarity index 100% rename from test/issue777-bogus-path-dependency/source/app.d rename to test/integration/issue777-bogus-path-dependency/source/app.d diff --git a/test/issue782-gtkd-pkg-config.sh b/test/integration/issue782-gtkd-pkg-config.sh similarity index 100% rename from test/issue782-gtkd-pkg-config.sh rename to test/integration/issue782-gtkd-pkg-config.sh diff --git a/test/issue782-gtkd-pkg-config.sh.min_frontend b/test/integration/issue782-gtkd-pkg-config.sh.min_frontend similarity index 100% rename from test/issue782-gtkd-pkg-config.sh.min_frontend rename to test/integration/issue782-gtkd-pkg-config.sh.min_frontend diff --git a/test/issue782-gtkd-pkg-config/.no_build b/test/integration/issue782-gtkd-pkg-config/.no_build similarity index 100% rename from test/issue782-gtkd-pkg-config/.no_build rename to test/integration/issue782-gtkd-pkg-config/.no_build diff --git a/test/issue782-gtkd-pkg-config/.no_run b/test/integration/issue782-gtkd-pkg-config/.no_run similarity index 100% rename from test/issue782-gtkd-pkg-config/.no_run rename to test/integration/issue782-gtkd-pkg-config/.no_run diff --git a/test/issue782-gtkd-pkg-config/.no_test b/test/integration/issue782-gtkd-pkg-config/.no_test similarity index 100% rename from test/issue782-gtkd-pkg-config/.no_test rename to test/integration/issue782-gtkd-pkg-config/.no_test diff --git a/test/issue782-gtkd-pkg-config/fake-gtkd/dub.json b/test/integration/issue782-gtkd-pkg-config/fake-gtkd/dub.json similarity index 100% rename from test/issue782-gtkd-pkg-config/fake-gtkd/dub.json rename to test/integration/issue782-gtkd-pkg-config/fake-gtkd/dub.json diff --git a/test/issue782-gtkd-pkg-config/fake-gtkd/pkgconfig/fake-gtkd.pc b/test/integration/issue782-gtkd-pkg-config/fake-gtkd/pkgconfig/fake-gtkd.pc similarity index 100% rename from test/issue782-gtkd-pkg-config/fake-gtkd/pkgconfig/fake-gtkd.pc rename to test/integration/issue782-gtkd-pkg-config/fake-gtkd/pkgconfig/fake-gtkd.pc diff --git a/test/issue782-gtkd-pkg-config/fake-gtkd/src/fakegtkd.d b/test/integration/issue782-gtkd-pkg-config/fake-gtkd/src/fakegtkd.d similarity index 100% rename from test/issue782-gtkd-pkg-config/fake-gtkd/src/fakegtkd.d rename to test/integration/issue782-gtkd-pkg-config/fake-gtkd/src/fakegtkd.d diff --git a/test/issue782-gtkd-pkg-config/fake-gtkd/src/lib.d b/test/integration/issue782-gtkd-pkg-config/fake-gtkd/src/lib.d similarity index 100% rename from test/issue782-gtkd-pkg-config/fake-gtkd/src/lib.d rename to test/integration/issue782-gtkd-pkg-config/fake-gtkd/src/lib.d diff --git a/test/issue782-gtkd-pkg-config/main/dub.json b/test/integration/issue782-gtkd-pkg-config/main/dub.json similarity index 100% rename from test/issue782-gtkd-pkg-config/main/dub.json rename to test/integration/issue782-gtkd-pkg-config/main/dub.json diff --git a/test/issue782-gtkd-pkg-config/main/src/app.d b/test/integration/issue782-gtkd-pkg-config/main/src/app.d similarity index 100% rename from test/issue782-gtkd-pkg-config/main/src/app.d rename to test/integration/issue782-gtkd-pkg-config/main/src/app.d diff --git a/test/issue813-fixed-dependency.sh b/test/integration/issue813-fixed-dependency.sh similarity index 100% rename from test/issue813-fixed-dependency.sh rename to test/integration/issue813-fixed-dependency.sh diff --git a/test/issue813-fixed-dependency/.no_build b/test/integration/issue813-fixed-dependency/.no_build similarity index 100% rename from test/issue813-fixed-dependency/.no_build rename to test/integration/issue813-fixed-dependency/.no_build diff --git a/test/issue813-fixed-dependency/main/dub.sdl b/test/integration/issue813-fixed-dependency/main/dub.sdl similarity index 100% rename from test/issue813-fixed-dependency/main/dub.sdl rename to test/integration/issue813-fixed-dependency/main/dub.sdl diff --git a/test/issue813-fixed-dependency/main/dub.selections.json b/test/integration/issue813-fixed-dependency/main/dub.selections.json similarity index 100% rename from test/issue813-fixed-dependency/main/dub.selections.json rename to test/integration/issue813-fixed-dependency/main/dub.selections.json diff --git a/test/issue813-fixed-dependency/main/src/app.d b/test/integration/issue813-fixed-dependency/main/src/app.d similarity index 100% rename from test/issue813-fixed-dependency/main/src/app.d rename to test/integration/issue813-fixed-dependency/main/src/app.d diff --git a/test/issue813-fixed-dependency/sub/dub.sdl b/test/integration/issue813-fixed-dependency/sub/dub.sdl similarity index 100% rename from test/issue813-fixed-dependency/sub/dub.sdl rename to test/integration/issue813-fixed-dependency/sub/dub.sdl diff --git a/test/issue813-fixed-dependency/sub/sub/dub.sdl b/test/integration/issue813-fixed-dependency/sub/sub/dub.sdl similarity index 100% rename from test/issue813-fixed-dependency/sub/sub/dub.sdl rename to test/integration/issue813-fixed-dependency/sub/sub/dub.sdl diff --git a/test/issue813-fixed-dependency/sub/sub/src/sub/test.d b/test/integration/issue813-fixed-dependency/sub/sub/src/sub/test.d similarity index 100% rename from test/issue813-fixed-dependency/sub/sub/src/sub/test.d rename to test/integration/issue813-fixed-dependency/sub/sub/src/sub/test.d diff --git a/test/issue813-pure-sub-dependency.sh b/test/integration/issue813-pure-sub-dependency.sh similarity index 100% rename from test/issue813-pure-sub-dependency.sh rename to test/integration/issue813-pure-sub-dependency.sh diff --git a/test/issue813-pure-sub-dependency/.no_build b/test/integration/issue813-pure-sub-dependency/.no_build similarity index 100% rename from test/issue813-pure-sub-dependency/.no_build rename to test/integration/issue813-pure-sub-dependency/.no_build diff --git a/test/issue813-pure-sub-dependency/main/dub.sdl b/test/integration/issue813-pure-sub-dependency/main/dub.sdl similarity index 100% rename from test/issue813-pure-sub-dependency/main/dub.sdl rename to test/integration/issue813-pure-sub-dependency/main/dub.sdl diff --git a/test/issue813-pure-sub-dependency/main/src/app.d b/test/integration/issue813-pure-sub-dependency/main/src/app.d similarity index 100% rename from test/issue813-pure-sub-dependency/main/src/app.d rename to test/integration/issue813-pure-sub-dependency/main/src/app.d diff --git a/test/issue813-pure-sub-dependency/sub/dub.sdl b/test/integration/issue813-pure-sub-dependency/sub/dub.sdl similarity index 100% rename from test/issue813-pure-sub-dependency/sub/dub.sdl rename to test/integration/issue813-pure-sub-dependency/sub/dub.sdl diff --git a/test/issue813-pure-sub-dependency/sub/sub/dub.sdl b/test/integration/issue813-pure-sub-dependency/sub/sub/dub.sdl similarity index 100% rename from test/issue813-pure-sub-dependency/sub/sub/dub.sdl rename to test/integration/issue813-pure-sub-dependency/sub/sub/dub.sdl diff --git a/test/issue813-pure-sub-dependency/sub/sub/src/sub/test.d b/test/integration/issue813-pure-sub-dependency/sub/sub/src/sub/test.d similarity index 100% rename from test/issue813-pure-sub-dependency/sub/sub/src/sub/test.d rename to test/integration/issue813-pure-sub-dependency/sub/sub/src/sub/test.d diff --git a/test/issue820-extra-fields-after-convert.sh b/test/integration/issue820-extra-fields-after-convert.sh similarity index 100% rename from test/issue820-extra-fields-after-convert.sh rename to test/integration/issue820-extra-fields-after-convert.sh diff --git a/test/issue838-custom-cache-paths.sh b/test/integration/issue838-custom-cache-paths.sh similarity index 100% rename from test/issue838-custom-cache-paths.sh rename to test/integration/issue838-custom-cache-paths.sh diff --git a/test/issue838-custom-cache-paths/.no_build b/test/integration/issue838-custom-cache-paths/.no_build similarity index 100% rename from test/issue838-custom-cache-paths/.no_build rename to test/integration/issue838-custom-cache-paths/.no_build diff --git a/test/issue838-custom-cache-paths/cache/foo/1.0.0/foo/dub.sdl b/test/integration/issue838-custom-cache-paths/cache/foo/1.0.0/foo/dub.sdl similarity index 100% rename from test/issue838-custom-cache-paths/cache/foo/1.0.0/foo/dub.sdl rename to test/integration/issue838-custom-cache-paths/cache/foo/1.0.0/foo/dub.sdl diff --git a/test/issue838-custom-cache-paths/dub.sdl b/test/integration/issue838-custom-cache-paths/dub.sdl similarity index 100% rename from test/issue838-custom-cache-paths/dub.sdl rename to test/integration/issue838-custom-cache-paths/dub.sdl diff --git a/test/issue838-custom-cache-paths/source/app.d b/test/integration/issue838-custom-cache-paths/source/app.d similarity index 100% rename from test/issue838-custom-cache-paths/source/app.d rename to test/integration/issue838-custom-cache-paths/source/app.d diff --git a/test/issue877-auto-fetch-package-on-run.sh b/test/integration/issue877-auto-fetch-package-on-run.sh similarity index 100% rename from test/issue877-auto-fetch-package-on-run.sh rename to test/integration/issue877-auto-fetch-package-on-run.sh diff --git a/test/issue884-init-defer-file-creation.sh b/test/integration/issue884-init-defer-file-creation.sh similarity index 100% rename from test/issue884-init-defer-file-creation.sh rename to test/integration/issue884-init-defer-file-creation.sh diff --git a/test/issue895-local-configuration.sh b/test/integration/issue895-local-configuration.sh similarity index 100% rename from test/issue895-local-configuration.sh rename to test/integration/issue895-local-configuration.sh diff --git a/test/issue923-subpackage-deps.sh b/test/integration/issue923-subpackage-deps.sh similarity index 100% rename from test/issue923-subpackage-deps.sh rename to test/integration/issue923-subpackage-deps.sh diff --git a/test/issue923-subpackage-deps/.no_build b/test/integration/issue923-subpackage-deps/.no_build similarity index 100% rename from test/issue923-subpackage-deps/.no_build rename to test/integration/issue923-subpackage-deps/.no_build diff --git a/test/issue923-subpackage-deps/a/dub.sdl b/test/integration/issue923-subpackage-deps/a/dub.sdl similarity index 100% rename from test/issue923-subpackage-deps/a/dub.sdl rename to test/integration/issue923-subpackage-deps/a/dub.sdl diff --git a/test/issue923-subpackage-deps/b/dub.sdl b/test/integration/issue923-subpackage-deps/b/dub.sdl similarity index 100% rename from test/issue923-subpackage-deps/b/dub.sdl rename to test/integration/issue923-subpackage-deps/b/dub.sdl diff --git a/test/issue923-subpackage-deps/b/source/b.d b/test/integration/issue923-subpackage-deps/b/source/b.d similarity index 100% rename from test/issue923-subpackage-deps/b/source/b.d rename to test/integration/issue923-subpackage-deps/b/source/b.d diff --git a/test/issue923-subpackage-deps/main/dub.sdl b/test/integration/issue923-subpackage-deps/main/dub.sdl similarity index 100% rename from test/issue923-subpackage-deps/main/dub.sdl rename to test/integration/issue923-subpackage-deps/main/dub.sdl diff --git a/test/issue923-subpackage-deps/main/source/app.d b/test/integration/issue923-subpackage-deps/main/source/app.d similarity index 100% rename from test/issue923-subpackage-deps/main/source/app.d rename to test/integration/issue923-subpackage-deps/main/source/app.d diff --git a/test/issue934-path-dep.sh b/test/integration/issue934-path-dep.sh similarity index 100% rename from test/issue934-path-dep.sh rename to test/integration/issue934-path-dep.sh diff --git a/test/issue934-path-dep/.no_build b/test/integration/issue934-path-dep/.no_build similarity index 100% rename from test/issue934-path-dep/.no_build rename to test/integration/issue934-path-dep/.no_build diff --git a/test/issue934-path-dep/a/dub.sdl b/test/integration/issue934-path-dep/a/dub.sdl similarity index 100% rename from test/issue934-path-dep/a/dub.sdl rename to test/integration/issue934-path-dep/a/dub.sdl diff --git a/test/issue934-path-dep/b/dub.sdl b/test/integration/issue934-path-dep/b/dub.sdl similarity index 100% rename from test/issue934-path-dep/b/dub.sdl rename to test/integration/issue934-path-dep/b/dub.sdl diff --git a/test/issue934-path-dep/b/source/b.d b/test/integration/issue934-path-dep/b/source/b.d similarity index 100% rename from test/issue934-path-dep/b/source/b.d rename to test/integration/issue934-path-dep/b/source/b.d diff --git a/test/issue934-path-dep/main/dub.sdl b/test/integration/issue934-path-dep/main/dub.sdl similarity index 100% rename from test/issue934-path-dep/main/dub.sdl rename to test/integration/issue934-path-dep/main/dub.sdl diff --git a/test/issue934-path-dep/main/source/app.d b/test/integration/issue934-path-dep/main/source/app.d similarity index 100% rename from test/issue934-path-dep/main/source/app.d rename to test/integration/issue934-path-dep/main/source/app.d diff --git a/test/issue959-path-based-subpack-dep/dub.sdl b/test/integration/issue959-path-based-subpack-dep/dub.sdl similarity index 100% rename from test/issue959-path-based-subpack-dep/dub.sdl rename to test/integration/issue959-path-based-subpack-dep/dub.sdl diff --git a/test/issue959-path-based-subpack-dep/foo/dub.sdl b/test/integration/issue959-path-based-subpack-dep/foo/dub.sdl similarity index 100% rename from test/issue959-path-based-subpack-dep/foo/dub.sdl rename to test/integration/issue959-path-based-subpack-dep/foo/dub.sdl diff --git a/test/issue959-path-based-subpack-dep/main.d b/test/integration/issue959-path-based-subpack-dep/main.d similarity index 100% rename from test/issue959-path-based-subpack-dep/main.d rename to test/integration/issue959-path-based-subpack-dep/main.d diff --git a/test/issue97-targettype-none-nodeps/.fail_build b/test/integration/issue97-targettype-none-nodeps/.fail_build similarity index 100% rename from test/issue97-targettype-none-nodeps/.fail_build rename to test/integration/issue97-targettype-none-nodeps/.fail_build diff --git a/test/issue97-targettype-none-nodeps/.gitignore b/test/integration/issue97-targettype-none-nodeps/.gitignore similarity index 100% rename from test/issue97-targettype-none-nodeps/.gitignore rename to test/integration/issue97-targettype-none-nodeps/.gitignore diff --git a/test/issue97-targettype-none-nodeps/.no_run b/test/integration/issue97-targettype-none-nodeps/.no_run similarity index 100% rename from test/issue97-targettype-none-nodeps/.no_run rename to test/integration/issue97-targettype-none-nodeps/.no_run diff --git a/test/issue97-targettype-none-nodeps/a/dub.sdl b/test/integration/issue97-targettype-none-nodeps/a/dub.sdl similarity index 100% rename from test/issue97-targettype-none-nodeps/a/dub.sdl rename to test/integration/issue97-targettype-none-nodeps/a/dub.sdl diff --git a/test/issue97-targettype-none-nodeps/a/source/app.d b/test/integration/issue97-targettype-none-nodeps/a/source/app.d similarity index 100% rename from test/issue97-targettype-none-nodeps/a/source/app.d rename to test/integration/issue97-targettype-none-nodeps/a/source/app.d diff --git a/test/issue97-targettype-none-nodeps/b/dub.sdl b/test/integration/issue97-targettype-none-nodeps/b/dub.sdl similarity index 100% rename from test/issue97-targettype-none-nodeps/b/dub.sdl rename to test/integration/issue97-targettype-none-nodeps/b/dub.sdl diff --git a/test/issue97-targettype-none-nodeps/b/source/app.d b/test/integration/issue97-targettype-none-nodeps/b/source/app.d similarity index 100% rename from test/issue97-targettype-none-nodeps/b/source/app.d rename to test/integration/issue97-targettype-none-nodeps/b/source/app.d diff --git a/test/issue97-targettype-none-nodeps/dub.sdl b/test/integration/issue97-targettype-none-nodeps/dub.sdl similarity index 100% rename from test/issue97-targettype-none-nodeps/dub.sdl rename to test/integration/issue97-targettype-none-nodeps/dub.sdl diff --git a/test/issue97-targettype-none-onerecipe/.gitignore b/test/integration/issue97-targettype-none-onerecipe/.gitignore similarity index 100% rename from test/issue97-targettype-none-onerecipe/.gitignore rename to test/integration/issue97-targettype-none-onerecipe/.gitignore diff --git a/test/issue97-targettype-none-onerecipe/.no_run b/test/integration/issue97-targettype-none-onerecipe/.no_run similarity index 100% rename from test/issue97-targettype-none-onerecipe/.no_run rename to test/integration/issue97-targettype-none-onerecipe/.no_run diff --git a/test/issue97-targettype-none-onerecipe/.no_test b/test/integration/issue97-targettype-none-onerecipe/.no_test similarity index 100% rename from test/issue97-targettype-none-onerecipe/.no_test rename to test/integration/issue97-targettype-none-onerecipe/.no_test diff --git a/test/issue97-targettype-none-onerecipe/a/source/app.d b/test/integration/issue97-targettype-none-onerecipe/a/source/app.d similarity index 100% rename from test/issue97-targettype-none-onerecipe/a/source/app.d rename to test/integration/issue97-targettype-none-onerecipe/a/source/app.d diff --git a/test/issue97-targettype-none-onerecipe/b/source/app.d b/test/integration/issue97-targettype-none-onerecipe/b/source/app.d similarity index 100% rename from test/issue97-targettype-none-onerecipe/b/source/app.d rename to test/integration/issue97-targettype-none-onerecipe/b/source/app.d diff --git a/test/issue97-targettype-none-onerecipe/dub.sdl b/test/integration/issue97-targettype-none-onerecipe/dub.sdl similarity index 100% rename from test/issue97-targettype-none-onerecipe/dub.sdl rename to test/integration/issue97-targettype-none-onerecipe/dub.sdl diff --git a/test/issue97-targettype-none.sh b/test/integration/issue97-targettype-none.sh similarity index 100% rename from test/issue97-targettype-none.sh rename to test/integration/issue97-targettype-none.sh diff --git a/test/issue97-targettype-none/.no_build b/test/integration/issue97-targettype-none/.no_build similarity index 100% rename from test/issue97-targettype-none/.no_build rename to test/integration/issue97-targettype-none/.no_build diff --git a/test/issue97-targettype-none/.no_run b/test/integration/issue97-targettype-none/.no_run similarity index 100% rename from test/issue97-targettype-none/.no_run rename to test/integration/issue97-targettype-none/.no_run diff --git a/test/issue97-targettype-none/a/dub.sdl b/test/integration/issue97-targettype-none/a/dub.sdl similarity index 100% rename from test/issue97-targettype-none/a/dub.sdl rename to test/integration/issue97-targettype-none/a/dub.sdl diff --git a/test/issue97-targettype-none/a/source/app.d b/test/integration/issue97-targettype-none/a/source/app.d similarity index 100% rename from test/issue97-targettype-none/a/source/app.d rename to test/integration/issue97-targettype-none/a/source/app.d diff --git a/test/issue97-targettype-none/b/dub.sdl b/test/integration/issue97-targettype-none/b/dub.sdl similarity index 100% rename from test/issue97-targettype-none/b/dub.sdl rename to test/integration/issue97-targettype-none/b/dub.sdl diff --git a/test/issue97-targettype-none/b/source/app.d b/test/integration/issue97-targettype-none/b/source/app.d similarity index 100% rename from test/issue97-targettype-none/b/source/app.d rename to test/integration/issue97-targettype-none/b/source/app.d diff --git a/test/issue97-targettype-none/dub.sdl b/test/integration/issue97-targettype-none/dub.sdl similarity index 100% rename from test/issue97-targettype-none/dub.sdl rename to test/integration/issue97-targettype-none/dub.sdl diff --git a/test/issue990-download-optional-selected.sh b/test/integration/issue990-download-optional-selected.sh similarity index 100% rename from test/issue990-download-optional-selected.sh rename to test/integration/issue990-download-optional-selected.sh diff --git a/test/issue990-download-optional-selected/.no_build b/test/integration/issue990-download-optional-selected/.no_build similarity index 100% rename from test/issue990-download-optional-selected/.no_build rename to test/integration/issue990-download-optional-selected/.no_build diff --git a/test/issue990-download-optional-selected/dub.sdl b/test/integration/issue990-download-optional-selected/dub.sdl similarity index 100% rename from test/issue990-download-optional-selected/dub.sdl rename to test/integration/issue990-download-optional-selected/dub.sdl diff --git a/test/issue990-download-optional-selected/dub.selections.json b/test/integration/issue990-download-optional-selected/dub.selections.json similarity index 100% rename from test/issue990-download-optional-selected/dub.selections.json rename to test/integration/issue990-download-optional-selected/dub.selections.json diff --git a/test/issue990-download-optional-selected/source/app.d b/test/integration/issue990-download-optional-selected/source/app.d similarity index 100% rename from test/issue990-download-optional-selected/source/app.d rename to test/integration/issue990-download-optional-selected/source/app.d diff --git a/test/mutex-main-1/.no_run b/test/integration/mutex-main-1/.no_run similarity index 100% rename from test/mutex-main-1/.no_run rename to test/integration/mutex-main-1/.no_run diff --git a/test/mutex-main-1/.no_test b/test/integration/mutex-main-1/.no_test similarity index 100% rename from test/mutex-main-1/.no_test rename to test/integration/mutex-main-1/.no_test diff --git a/test/mutex-main-1/dub.json b/test/integration/mutex-main-1/dub.json similarity index 100% rename from test/mutex-main-1/dub.json rename to test/integration/mutex-main-1/dub.json diff --git a/test/mutex-main-1/source/app.d b/test/integration/mutex-main-1/source/app.d similarity index 100% rename from test/mutex-main-1/source/app.d rename to test/integration/mutex-main-1/source/app.d diff --git a/test/mutex-main-1/source/app2.d b/test/integration/mutex-main-1/source/app2.d similarity index 100% rename from test/mutex-main-1/source/app2.d rename to test/integration/mutex-main-1/source/app2.d diff --git a/test/mutex-main-2/.no_run b/test/integration/mutex-main-2/.no_run similarity index 100% rename from test/mutex-main-2/.no_run rename to test/integration/mutex-main-2/.no_run diff --git a/test/mutex-main-2/.no_test b/test/integration/mutex-main-2/.no_test similarity index 100% rename from test/mutex-main-2/.no_test rename to test/integration/mutex-main-2/.no_test diff --git a/test/mutex-main-2/dub.json b/test/integration/mutex-main-2/dub.json similarity index 100% rename from test/mutex-main-2/dub.json rename to test/integration/mutex-main-2/dub.json diff --git a/test/mutex-main-2/source/app.d b/test/integration/mutex-main-2/source/app.d similarity index 100% rename from test/mutex-main-2/source/app.d rename to test/integration/mutex-main-2/source/app.d diff --git a/test/mutex-main-2/source/app2.d b/test/integration/mutex-main-2/source/app2.d similarity index 100% rename from test/mutex-main-2/source/app2.d rename to test/integration/mutex-main-2/source/app2.d diff --git a/test/mutex-main-3/.fail_build b/test/integration/mutex-main-3/.fail_build similarity index 100% rename from test/mutex-main-3/.fail_build rename to test/integration/mutex-main-3/.fail_build diff --git a/test/mutex-main-3/.no_run b/test/integration/mutex-main-3/.no_run similarity index 100% rename from test/mutex-main-3/.no_run rename to test/integration/mutex-main-3/.no_run diff --git a/test/mutex-main-3/.no_test b/test/integration/mutex-main-3/.no_test similarity index 100% rename from test/mutex-main-3/.no_test rename to test/integration/mutex-main-3/.no_test diff --git a/test/mutex-main-3/dub.json b/test/integration/mutex-main-3/dub.json similarity index 100% rename from test/mutex-main-3/dub.json rename to test/integration/mutex-main-3/dub.json diff --git a/test/mutex-main-3/source/app.d b/test/integration/mutex-main-3/source/app.d similarity index 100% rename from test/mutex-main-3/source/app.d rename to test/integration/mutex-main-3/source/app.d diff --git a/test/mutex-main-3/source/app2.d b/test/integration/mutex-main-3/source/app2.d similarity index 100% rename from test/mutex-main-3/source/app2.d rename to test/integration/mutex-main-3/source/app2.d diff --git a/test/path-subpackage-ref/dub.json b/test/integration/path-subpackage-ref/dub.json similarity index 100% rename from test/path-subpackage-ref/dub.json rename to test/integration/path-subpackage-ref/dub.json diff --git a/test/path-subpackage-ref/source/app.d b/test/integration/path-subpackage-ref/source/app.d similarity index 100% rename from test/path-subpackage-ref/source/app.d rename to test/integration/path-subpackage-ref/source/app.d diff --git a/test/path-subpackage-ref/subpack/dub.json b/test/integration/path-subpackage-ref/subpack/dub.json similarity index 100% rename from test/path-subpackage-ref/subpack/dub.json rename to test/integration/path-subpackage-ref/subpack/dub.json diff --git a/test/path-subpackage-ref/subpack/source/lib.d b/test/integration/path-subpackage-ref/subpack/source/lib.d similarity index 100% rename from test/path-subpackage-ref/subpack/source/lib.d rename to test/integration/path-subpackage-ref/subpack/source/lib.d diff --git a/test/pr1549-dub-exe-var.sh b/test/integration/pr1549-dub-exe-var.sh similarity index 100% rename from test/pr1549-dub-exe-var.sh rename to test/integration/pr1549-dub-exe-var.sh diff --git a/test/pr1549-dub-exe-var/.gitignore b/test/integration/pr1549-dub-exe-var/.gitignore similarity index 100% rename from test/pr1549-dub-exe-var/.gitignore rename to test/integration/pr1549-dub-exe-var/.gitignore diff --git a/test/pr1549-dub-exe-var/.no_build b/test/integration/pr1549-dub-exe-var/.no_build similarity index 100% rename from test/pr1549-dub-exe-var/.no_build rename to test/integration/pr1549-dub-exe-var/.no_build diff --git a/test/pr1549-dub-exe-var/dub.sdl b/test/integration/pr1549-dub-exe-var/dub.sdl similarity index 100% rename from test/pr1549-dub-exe-var/dub.sdl rename to test/integration/pr1549-dub-exe-var/dub.sdl diff --git a/test/pr1549-dub-exe-var/setmsg.d b/test/integration/pr1549-dub-exe-var/setmsg.d similarity index 100% rename from test/pr1549-dub-exe-var/setmsg.d rename to test/integration/pr1549-dub-exe-var/setmsg.d diff --git a/test/pr1549-dub-exe-var/source/app.d b/test/integration/pr1549-dub-exe-var/source/app.d similarity index 100% rename from test/pr1549-dub-exe-var/source/app.d rename to test/integration/pr1549-dub-exe-var/source/app.d diff --git a/test/pr2642-cache-db/.gitignore b/test/integration/pr2642-cache-db/.gitignore similarity index 100% rename from test/pr2642-cache-db/.gitignore rename to test/integration/pr2642-cache-db/.gitignore diff --git a/test/pr2642-cache-db/.no_test b/test/integration/pr2642-cache-db/.no_test similarity index 100% rename from test/pr2642-cache-db/.no_test rename to test/integration/pr2642-cache-db/.no_test diff --git a/test/pr2642-cache-db/dub.sdl b/test/integration/pr2642-cache-db/dub.sdl similarity index 100% rename from test/pr2642-cache-db/dub.sdl rename to test/integration/pr2642-cache-db/dub.sdl diff --git a/test/pr2642-cache-db/source/test_cache_db.d b/test/integration/pr2642-cache-db/source/test_cache_db.d similarity index 100% rename from test/pr2642-cache-db/source/test_cache_db.d rename to test/integration/pr2642-cache-db/source/test_cache_db.d diff --git a/test/pr2644-describe-artifact-path/.gitignore b/test/integration/pr2644-describe-artifact-path/.gitignore similarity index 100% rename from test/pr2644-describe-artifact-path/.gitignore rename to test/integration/pr2644-describe-artifact-path/.gitignore diff --git a/test/pr2644-describe-artifact-path/.no_test b/test/integration/pr2644-describe-artifact-path/.no_test similarity index 100% rename from test/pr2644-describe-artifact-path/.no_test rename to test/integration/pr2644-describe-artifact-path/.no_test diff --git a/test/pr2644-describe-artifact-path/dub.sdl b/test/integration/pr2644-describe-artifact-path/dub.sdl similarity index 100% rename from test/pr2644-describe-artifact-path/dub.sdl rename to test/integration/pr2644-describe-artifact-path/dub.sdl diff --git a/test/pr2644-describe-artifact-path/source/describe_artifact_path.d b/test/integration/pr2644-describe-artifact-path/source/describe_artifact_path.d similarity index 100% rename from test/pr2644-describe-artifact-path/source/describe_artifact_path.d rename to test/integration/pr2644-describe-artifact-path/source/describe_artifact_path.d diff --git a/test/pr2647-build-deep/.gitignore b/test/integration/pr2647-build-deep/.gitignore similarity index 100% rename from test/pr2647-build-deep/.gitignore rename to test/integration/pr2647-build-deep/.gitignore diff --git a/test/pr2647-build-deep/.no_test b/test/integration/pr2647-build-deep/.no_test similarity index 100% rename from test/pr2647-build-deep/.no_test rename to test/integration/pr2647-build-deep/.no_test diff --git a/test/pr2647-build-deep/dub.sdl b/test/integration/pr2647-build-deep/dub.sdl similarity index 100% rename from test/pr2647-build-deep/dub.sdl rename to test/integration/pr2647-build-deep/dub.sdl diff --git a/test/pr2647-build-deep/pack/dub.sdl b/test/integration/pr2647-build-deep/pack/dub.sdl similarity index 100% rename from test/pr2647-build-deep/pack/dub.sdl rename to test/integration/pr2647-build-deep/pack/dub.sdl diff --git a/test/pr2647-build-deep/pack/source/lib.d b/test/integration/pr2647-build-deep/pack/source/lib.d similarity index 100% rename from test/pr2647-build-deep/pack/source/lib.d rename to test/integration/pr2647-build-deep/pack/source/lib.d diff --git a/test/pr2647-build-deep/source/test_build_deep.d b/test/integration/pr2647-build-deep/source/test_build_deep.d similarity index 100% rename from test/pr2647-build-deep/source/test_build_deep.d rename to test/integration/pr2647-build-deep/source/test_build_deep.d diff --git a/test/removed-dub-obj.sh b/test/integration/removed-dub-obj.sh similarity index 100% rename from test/removed-dub-obj.sh rename to test/integration/removed-dub-obj.sh diff --git a/test/removed-dub-obj/.no_build b/test/integration/removed-dub-obj/.no_build similarity index 100% rename from test/removed-dub-obj/.no_build rename to test/integration/removed-dub-obj/.no_build diff --git a/test/removed-dub-obj/.no_run b/test/integration/removed-dub-obj/.no_run similarity index 100% rename from test/removed-dub-obj/.no_run rename to test/integration/removed-dub-obj/.no_run diff --git a/test/removed-dub-obj/.no_test b/test/integration/removed-dub-obj/.no_test similarity index 100% rename from test/removed-dub-obj/.no_test rename to test/integration/removed-dub-obj/.no_test diff --git a/test/removed-dub-obj/dub.sdl b/test/integration/removed-dub-obj/dub.sdl similarity index 100% rename from test/removed-dub-obj/dub.sdl rename to test/integration/removed-dub-obj/dub.sdl diff --git a/test/removed-dub-obj/source/test.d b/test/integration/removed-dub-obj/source/test.d similarity index 100% rename from test/removed-dub-obj/source/test.d rename to test/integration/removed-dub-obj/source/test.d diff --git a/test/run-unittest.d b/test/integration/run-test.d similarity index 98% rename from test/run-unittest.d rename to test/integration/run-test.d index ae6fad4331..7287780f50 100644 --- a/test/run-unittest.d +++ b/test/integration/run-test.d @@ -1,7 +1,7 @@ #!/usr/bin/env dub /+dub.sdl: name: run_unittest - targetName: run-unittest + targetName: run-test dependency "common" path="./common" +/ module run_unittest; @@ -66,7 +66,7 @@ int main(string[] args) if (!script.name.baseName.globMatch(filter)) continue; if (!script.name.endsWith(".sh")) continue; - if (baseName(script.name).among("run-unittest.sh", "common.sh")) continue; + if (baseName(script.name).among("run-test.sh", "common.sh")) continue; const min_frontend = script.name ~ ".min_frontend"; if (exists(min_frontend) && frontend.length && cmp(frontend, min_frontend.readText) < 0) continue; log("Running " ~ script ~ "..."); diff --git a/test/run-unittest.sh b/test/integration/run-test.sh similarity index 100% rename from test/run-unittest.sh rename to test/integration/run-test.sh diff --git a/test/sdl-package-simple/dub.sdl b/test/integration/sdl-package-simple/dub.sdl similarity index 100% rename from test/sdl-package-simple/dub.sdl rename to test/integration/sdl-package-simple/dub.sdl diff --git a/test/sdl-package-simple/source/app.d b/test/integration/sdl-package-simple/source/app.d similarity index 100% rename from test/sdl-package-simple/source/app.d rename to test/integration/sdl-package-simple/source/app.d diff --git a/test/single-file-sdl-default-name.d b/test/integration/single-file-sdl-default-name.d similarity index 100% rename from test/single-file-sdl-default-name.d rename to test/integration/single-file-sdl-default-name.d diff --git a/test/single-file-sdl-default-name.sh b/test/integration/single-file-sdl-default-name.sh similarity index 100% rename from test/single-file-sdl-default-name.sh rename to test/integration/single-file-sdl-default-name.sh diff --git a/test/subpackage-common-with-sourcefile-globbing.sh b/test/integration/subpackage-common-with-sourcefile-globbing.sh similarity index 100% rename from test/subpackage-common-with-sourcefile-globbing.sh rename to test/integration/subpackage-common-with-sourcefile-globbing.sh diff --git a/test/subpackage-common-with-sourcefile-globbing/.no_build b/test/integration/subpackage-common-with-sourcefile-globbing/.no_build similarity index 100% rename from test/subpackage-common-with-sourcefile-globbing/.no_build rename to test/integration/subpackage-common-with-sourcefile-globbing/.no_build diff --git a/test/subpackage-common-with-sourcefile-globbing/code/mypackage/client/app.d b/test/integration/subpackage-common-with-sourcefile-globbing/code/mypackage/client/app.d similarity index 100% rename from test/subpackage-common-with-sourcefile-globbing/code/mypackage/client/app.d rename to test/integration/subpackage-common-with-sourcefile-globbing/code/mypackage/client/app.d diff --git a/test/subpackage-common-with-sourcefile-globbing/code/mypackage/client/extra.d b/test/integration/subpackage-common-with-sourcefile-globbing/code/mypackage/client/extra.d similarity index 100% rename from test/subpackage-common-with-sourcefile-globbing/code/mypackage/client/extra.d rename to test/integration/subpackage-common-with-sourcefile-globbing/code/mypackage/client/extra.d diff --git a/test/subpackage-common-with-sourcefile-globbing/code/mypackage/common/blah.d b/test/integration/subpackage-common-with-sourcefile-globbing/code/mypackage/common/blah.d similarity index 100% rename from test/subpackage-common-with-sourcefile-globbing/code/mypackage/common/blah.d rename to test/integration/subpackage-common-with-sourcefile-globbing/code/mypackage/common/blah.d diff --git a/test/subpackage-common-with-sourcefile-globbing/code/mypackage/server/app.d b/test/integration/subpackage-common-with-sourcefile-globbing/code/mypackage/server/app.d similarity index 100% rename from test/subpackage-common-with-sourcefile-globbing/code/mypackage/server/app.d rename to test/integration/subpackage-common-with-sourcefile-globbing/code/mypackage/server/app.d diff --git a/test/subpackage-common-with-sourcefile-globbing/code/mypackage/server/extra.d b/test/integration/subpackage-common-with-sourcefile-globbing/code/mypackage/server/extra.d similarity index 100% rename from test/subpackage-common-with-sourcefile-globbing/code/mypackage/server/extra.d rename to test/integration/subpackage-common-with-sourcefile-globbing/code/mypackage/server/extra.d diff --git a/test/subpackage-common-with-sourcefile-globbing/dub.sdl b/test/integration/subpackage-common-with-sourcefile-globbing/dub.sdl similarity index 100% rename from test/subpackage-common-with-sourcefile-globbing/dub.sdl rename to test/integration/subpackage-common-with-sourcefile-globbing/dub.sdl diff --git a/test/subpackage-ref/dub.json b/test/integration/subpackage-ref/dub.json similarity index 100% rename from test/subpackage-ref/dub.json rename to test/integration/subpackage-ref/dub.json diff --git a/test/subpackage-ref/source/app.d b/test/integration/subpackage-ref/source/app.d similarity index 100% rename from test/subpackage-ref/source/app.d rename to test/integration/subpackage-ref/source/app.d diff --git a/test/test-upgrade-subpackages.sh b/test/integration/test-upgrade-subpackages.sh similarity index 100% rename from test/test-upgrade-subpackages.sh rename to test/integration/test-upgrade-subpackages.sh diff --git a/test/test-version-opt.sh b/test/integration/test-version-opt.sh similarity index 100% rename from test/test-version-opt.sh rename to test/integration/test-version-opt.sh diff --git a/test/test_registry.d b/test/integration/test_registry.d similarity index 100% rename from test/test_registry.d rename to test/integration/test_registry.d diff --git a/test/timeout.sh b/test/integration/timeout.sh similarity index 100% rename from test/timeout.sh rename to test/integration/timeout.sh diff --git a/test/unittest-cov-ctfe.sh b/test/integration/unittest-cov-ctfe.sh similarity index 100% rename from test/unittest-cov-ctfe.sh rename to test/integration/unittest-cov-ctfe.sh diff --git a/test/unittest-cov-ctfe/.no_build b/test/integration/unittest-cov-ctfe/.no_build similarity index 100% rename from test/unittest-cov-ctfe/.no_build rename to test/integration/unittest-cov-ctfe/.no_build diff --git a/test/unittest-cov-ctfe/.no_run b/test/integration/unittest-cov-ctfe/.no_run similarity index 100% rename from test/unittest-cov-ctfe/.no_run rename to test/integration/unittest-cov-ctfe/.no_run diff --git a/test/unittest-cov-ctfe/.no_test b/test/integration/unittest-cov-ctfe/.no_test similarity index 100% rename from test/unittest-cov-ctfe/.no_test rename to test/integration/unittest-cov-ctfe/.no_test diff --git a/test/unittest-cov-ctfe/dub.sdl b/test/integration/unittest-cov-ctfe/dub.sdl similarity index 100% rename from test/unittest-cov-ctfe/dub.sdl rename to test/integration/unittest-cov-ctfe/dub.sdl diff --git a/test/unittest-cov-ctfe/source/mod.d b/test/integration/unittest-cov-ctfe/source/mod.d similarity index 100% rename from test/unittest-cov-ctfe/source/mod.d rename to test/integration/unittest-cov-ctfe/source/mod.d diff --git a/test/use-c-sources/.min_frontend b/test/integration/use-c-sources/.min_frontend similarity index 100% rename from test/use-c-sources/.min_frontend rename to test/integration/use-c-sources/.min_frontend diff --git a/test/use-c-sources/.no_build_gdc b/test/integration/use-c-sources/.no_build_gdc similarity index 100% rename from test/use-c-sources/.no_build_gdc rename to test/integration/use-c-sources/.no_build_gdc diff --git a/test/use-c-sources/dub.json b/test/integration/use-c-sources/dub.json similarity index 100% rename from test/use-c-sources/dub.json rename to test/integration/use-c-sources/dub.json diff --git a/test/use-c-sources/source/app.d b/test/integration/use-c-sources/source/app.d similarity index 100% rename from test/use-c-sources/source/app.d rename to test/integration/use-c-sources/source/app.d diff --git a/test/use-c-sources/source/some_c_code.c b/test/integration/use-c-sources/source/some_c_code.c similarity index 100% rename from test/use-c-sources/source/some_c_code.c rename to test/integration/use-c-sources/source/some_c_code.c diff --git a/test/use-c-sources/source/some_c_code.h b/test/integration/use-c-sources/source/some_c_code.h similarity index 100% rename from test/use-c-sources/source/some_c_code.h rename to test/integration/use-c-sources/source/some_c_code.h diff --git a/test/version-filters-diamond/.gitignore b/test/integration/version-filters-diamond/.gitignore similarity index 100% rename from test/version-filters-diamond/.gitignore rename to test/integration/version-filters-diamond/.gitignore diff --git a/test/version-filters-diamond/.no_build b/test/integration/version-filters-diamond/.no_build similarity index 100% rename from test/version-filters-diamond/.no_build rename to test/integration/version-filters-diamond/.no_build diff --git a/test/version-filters-diamond/.no_run b/test/integration/version-filters-diamond/.no_run similarity index 100% rename from test/version-filters-diamond/.no_run rename to test/integration/version-filters-diamond/.no_run diff --git a/test/version-filters-diamond/.no_test b/test/integration/version-filters-diamond/.no_test similarity index 100% rename from test/version-filters-diamond/.no_test rename to test/integration/version-filters-diamond/.no_test diff --git a/test/version-filters-diamond/daughter/.gitignore b/test/integration/version-filters-diamond/daughter/.gitignore similarity index 100% rename from test/version-filters-diamond/daughter/.gitignore rename to test/integration/version-filters-diamond/daughter/.gitignore diff --git a/test/version-filters-diamond/daughter/dub.sdl b/test/integration/version-filters-diamond/daughter/dub.sdl similarity index 100% rename from test/version-filters-diamond/daughter/dub.sdl rename to test/integration/version-filters-diamond/daughter/dub.sdl diff --git a/test/version-filters-diamond/daughter/source/dummy.d b/test/integration/version-filters-diamond/daughter/source/dummy.d similarity index 100% rename from test/version-filters-diamond/daughter/source/dummy.d rename to test/integration/version-filters-diamond/daughter/source/dummy.d diff --git a/test/version-filters-diamond/diamond/.gitignore b/test/integration/version-filters-diamond/diamond/.gitignore similarity index 100% rename from test/version-filters-diamond/diamond/.gitignore rename to test/integration/version-filters-diamond/diamond/.gitignore diff --git a/test/version-filters-diamond/diamond/dub.sdl b/test/integration/version-filters-diamond/diamond/dub.sdl similarity index 100% rename from test/version-filters-diamond/diamond/dub.sdl rename to test/integration/version-filters-diamond/diamond/dub.sdl diff --git a/test/version-filters-diamond/diamond/source/dummy.d b/test/integration/version-filters-diamond/diamond/source/dummy.d similarity index 100% rename from test/version-filters-diamond/diamond/source/dummy.d rename to test/integration/version-filters-diamond/diamond/source/dummy.d diff --git a/test/version-filters-diamond/dub.sdl b/test/integration/version-filters-diamond/dub.sdl similarity index 100% rename from test/version-filters-diamond/dub.sdl rename to test/integration/version-filters-diamond/dub.sdl diff --git a/test/version-filters-diamond/son/.gitignore b/test/integration/version-filters-diamond/son/.gitignore similarity index 100% rename from test/version-filters-diamond/son/.gitignore rename to test/integration/version-filters-diamond/son/.gitignore diff --git a/test/version-filters-diamond/son/dub.sdl b/test/integration/version-filters-diamond/son/dub.sdl similarity index 100% rename from test/version-filters-diamond/son/dub.sdl rename to test/integration/version-filters-diamond/son/dub.sdl diff --git a/test/version-filters-diamond/son/source/dummy.d b/test/integration/version-filters-diamond/son/source/dummy.d similarity index 100% rename from test/version-filters-diamond/son/source/dummy.d rename to test/integration/version-filters-diamond/son/source/dummy.d diff --git a/test/version-filters-diamond/source/app.d b/test/integration/version-filters-diamond/source/app.d similarity index 100% rename from test/version-filters-diamond/source/app.d rename to test/integration/version-filters-diamond/source/app.d diff --git a/test/version-filters-none/.gitignore b/test/integration/version-filters-none/.gitignore similarity index 100% rename from test/version-filters-none/.gitignore rename to test/integration/version-filters-none/.gitignore diff --git a/test/version-filters-none/.no_build b/test/integration/version-filters-none/.no_build similarity index 100% rename from test/version-filters-none/.no_build rename to test/integration/version-filters-none/.no_build diff --git a/test/version-filters-none/.no_run b/test/integration/version-filters-none/.no_run similarity index 100% rename from test/version-filters-none/.no_run rename to test/integration/version-filters-none/.no_run diff --git a/test/version-filters-none/.no_test b/test/integration/version-filters-none/.no_test similarity index 100% rename from test/version-filters-none/.no_test rename to test/integration/version-filters-none/.no_test diff --git a/test/version-filters-none/dub.sdl b/test/integration/version-filters-none/dub.sdl similarity index 100% rename from test/version-filters-none/dub.sdl rename to test/integration/version-filters-none/dub.sdl diff --git a/test/version-filters-none/source/app.d b/test/integration/version-filters-none/source/app.d similarity index 100% rename from test/version-filters-none/source/app.d rename to test/integration/version-filters-none/source/app.d diff --git a/test/version-filters-source-dep/.gitignore b/test/integration/version-filters-source-dep/.gitignore similarity index 100% rename from test/version-filters-source-dep/.gitignore rename to test/integration/version-filters-source-dep/.gitignore diff --git a/test/version-filters-source-dep/.no_build b/test/integration/version-filters-source-dep/.no_build similarity index 100% rename from test/version-filters-source-dep/.no_build rename to test/integration/version-filters-source-dep/.no_build diff --git a/test/version-filters-source-dep/.no_run b/test/integration/version-filters-source-dep/.no_run similarity index 100% rename from test/version-filters-source-dep/.no_run rename to test/integration/version-filters-source-dep/.no_run diff --git a/test/version-filters-source-dep/.no_test b/test/integration/version-filters-source-dep/.no_test similarity index 100% rename from test/version-filters-source-dep/.no_test rename to test/integration/version-filters-source-dep/.no_test diff --git a/test/version-filters-source-dep/dub.sdl b/test/integration/version-filters-source-dep/dub.sdl similarity index 100% rename from test/version-filters-source-dep/dub.sdl rename to test/integration/version-filters-source-dep/dub.sdl diff --git a/test/version-filters-source-dep/source-dep/dub.sdl b/test/integration/version-filters-source-dep/source-dep/dub.sdl similarity index 100% rename from test/version-filters-source-dep/source-dep/dub.sdl rename to test/integration/version-filters-source-dep/source-dep/dub.sdl diff --git a/test/version-filters-source-dep/source-dep/source/dummy.d b/test/integration/version-filters-source-dep/source-dep/source/dummy.d similarity index 100% rename from test/version-filters-source-dep/source-dep/source/dummy.d rename to test/integration/version-filters-source-dep/source-dep/source/dummy.d diff --git a/test/version-filters-source-dep/source/app.d b/test/integration/version-filters-source-dep/source/app.d similarity index 100% rename from test/version-filters-source-dep/source/app.d rename to test/integration/version-filters-source-dep/source/app.d diff --git a/test/version-filters.sh b/test/integration/version-filters.sh similarity index 100% rename from test/version-filters.sh rename to test/integration/version-filters.sh diff --git a/test/version-filters/.gitignore b/test/integration/version-filters/.gitignore similarity index 100% rename from test/version-filters/.gitignore rename to test/integration/version-filters/.gitignore diff --git a/test/version-filters/.no_build b/test/integration/version-filters/.no_build similarity index 100% rename from test/version-filters/.no_build rename to test/integration/version-filters/.no_build diff --git a/test/version-filters/.no_run b/test/integration/version-filters/.no_run similarity index 100% rename from test/version-filters/.no_run rename to test/integration/version-filters/.no_run diff --git a/test/version-filters/.no_test b/test/integration/version-filters/.no_test similarity index 100% rename from test/version-filters/.no_test rename to test/integration/version-filters/.no_test diff --git a/test/version-filters/daughter/.gitignore b/test/integration/version-filters/daughter/.gitignore similarity index 100% rename from test/version-filters/daughter/.gitignore rename to test/integration/version-filters/daughter/.gitignore diff --git a/test/version-filters/daughter/dub.sdl b/test/integration/version-filters/daughter/dub.sdl similarity index 100% rename from test/version-filters/daughter/dub.sdl rename to test/integration/version-filters/daughter/dub.sdl diff --git a/test/version-filters/daughter/source/dummy.d b/test/integration/version-filters/daughter/source/dummy.d similarity index 100% rename from test/version-filters/daughter/source/dummy.d rename to test/integration/version-filters/daughter/source/dummy.d diff --git a/test/version-filters/dub.sdl b/test/integration/version-filters/dub.sdl similarity index 100% rename from test/version-filters/dub.sdl rename to test/integration/version-filters/dub.sdl diff --git a/test/version-filters/son/.gitignore b/test/integration/version-filters/son/.gitignore similarity index 100% rename from test/version-filters/son/.gitignore rename to test/integration/version-filters/son/.gitignore diff --git a/test/version-filters/son/dub.sdl b/test/integration/version-filters/son/dub.sdl similarity index 100% rename from test/version-filters/son/dub.sdl rename to test/integration/version-filters/son/dub.sdl diff --git a/test/version-filters/son/source/dummy.d b/test/integration/version-filters/son/source/dummy.d similarity index 100% rename from test/version-filters/son/source/dummy.d rename to test/integration/version-filters/son/source/dummy.d diff --git a/test/version-filters/source/app.d b/test/integration/version-filters/source/app.d similarity index 100% rename from test/version-filters/source/app.d rename to test/integration/version-filters/source/app.d diff --git a/test/version-spec.sh b/test/integration/version-spec.sh similarity index 100% rename from test/version-spec.sh rename to test/integration/version-spec.sh diff --git a/test/version-spec/.no_build b/test/integration/version-spec/.no_build similarity index 100% rename from test/version-spec/.no_build rename to test/integration/version-spec/.no_build diff --git a/test/version-spec/.no_run b/test/integration/version-spec/.no_run similarity index 100% rename from test/version-spec/.no_run rename to test/integration/version-spec/.no_run diff --git a/test/version-spec/.no_test b/test/integration/version-spec/.no_test similarity index 100% rename from test/version-spec/.no_test rename to test/integration/version-spec/.no_test diff --git a/test/version-spec/newfoo/dub.sdl b/test/integration/version-spec/newfoo/dub.sdl similarity index 100% rename from test/version-spec/newfoo/dub.sdl rename to test/integration/version-spec/newfoo/dub.sdl diff --git a/test/version-spec/newfoo/source/app.d b/test/integration/version-spec/newfoo/source/app.d similarity index 100% rename from test/version-spec/newfoo/source/app.d rename to test/integration/version-spec/newfoo/source/app.d diff --git a/test/version-spec/oldfoo/dub.sdl b/test/integration/version-spec/oldfoo/dub.sdl similarity index 100% rename from test/version-spec/oldfoo/dub.sdl rename to test/integration/version-spec/oldfoo/dub.sdl diff --git a/test/version-spec/oldfoo/source/app.d b/test/integration/version-spec/oldfoo/source/app.d similarity index 100% rename from test/version-spec/oldfoo/source/app.d rename to test/integration/version-spec/oldfoo/source/app.d diff --git a/test/win32_default.d b/test/integration/win32_default.d similarity index 100% rename from test/win32_default.d rename to test/integration/win32_default.d diff --git a/test/win32_default.script.d b/test/integration/win32_default.script.d similarity index 100% rename from test/win32_default.script.d rename to test/integration/win32_default.script.d diff --git a/source/dub/test/base.d b/test/unit/dub/test/base.d similarity index 100% rename from source/dub/test/base.d rename to test/unit/dub/test/base.d diff --git a/source/dub/test/dependencies.d b/test/unit/dub/test/dependencies.d similarity index 100% rename from source/dub/test/dependencies.d rename to test/unit/dub/test/dependencies.d diff --git a/source/dub/test/others.d b/test/unit/dub/test/others.d similarity index 100% rename from source/dub/test/others.d rename to test/unit/dub/test/others.d diff --git a/source/dub/test/selections_from_parent_dir.d b/test/unit/dub/test/selections_from_parent_dir.d similarity index 100% rename from source/dub/test/selections_from_parent_dir.d rename to test/unit/dub/test/selections_from_parent_dir.d diff --git a/source/dub/test/subpackages.d b/test/unit/dub/test/subpackages.d similarity index 100% rename from source/dub/test/subpackages.d rename to test/unit/dub/test/subpackages.d