diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 7415f1af60..4872e2c783 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -27,4 +27,4 @@ jobs: run: | set -ex hlint src/ - hlint --hint=.hlint-test.yaml test/ + hlint --hint=.hlint-test.yaml tests/unit diff --git a/.hlint-test.yaml b/.hlint-test.yaml index d1e8db7914..ca94eeb2cb 100644 --- a/.hlint-test.yaml +++ b/.hlint-test.yaml @@ -9,7 +9,10 @@ - name: - NoImplicitPrelude - CPP + - OverloadedLists - OverloadedStrings + - QuasiQuotes + - RecordWildCards - ScopedTypeVariables - TemplateHaskell - ViewPatterns diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index be0a1ff335..30cd3414df 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -393,13 +393,14 @@ That said, the following may help: ## Testing -The Stack code has both unit tests and integration tests. Integration tests can -be found in the -[test/integration](https://github.com/commercialhaskell/stack/tree/master/test/integration) -folder and unit tests, in the -[src/test](https://github.com/commercialhaskell/stack/tree/master/src/test) -folder. Tests are written using the [Hspec](https://hspec.github.io/) framework. -In order to run the full test suite, you can simply command: +The Stack code has both unit tests and integration tests. + +### Working with Unit Tests + +Unit tests can be found in the +[tests/unit](https://github.com/commercialhaskell/stack/tree/master/tests/unit) +directory. Tests are written using the [Hspec](https://hspec.github.io/) +framework. In order to run the full test suite, you can simply command: ~~~text stack test @@ -411,18 +412,17 @@ need to specify which test suite (unit test or integration) and pass arguments to specify which module you'd specifically like to run to get quick feedback. A description of this follows below. -### Working with Unit Tests If you would like to run the unit tests on their own, you can command: ~~~text -stack test stack:stack-test +stack test stack:stack-unit-test ~~~ Running an individual module works with a command like this: ~~~text -stack test stack:stack-test --ta "-m " +stack test stack:stack-unit-test --ta "-m " ~~~ Where `` is the name of the module without `Spec.hs`. @@ -430,7 +430,7 @@ Where `` is the name of the module without `Spec.hs`. You may also load tests into GHCi and run them with these command: ~~~text -stack ghci stack:stack-test --only-main +stack ghci stack:stack-unit-test --only-main # GHCi starting up output ... > :main -m "" ~~~ @@ -439,6 +439,10 @@ Where again, `` is the name of the module without `Spec.hs`. ### Working with Integration Tests +Integration tests can be found in the +[tests/integration](https://github.com/commercialhaskell/stack/tree/master/tests/integration) +folder. + Running the integration tests is a little involved, you'll need to command: ~~~text diff --git a/doc/ide_command.md b/doc/ide_command.md index 343e7b9230..279decf15a 100644 --- a/doc/ide_command.md +++ b/doc/ide_command.md @@ -55,7 +55,7 @@ and the output from the second command is: stack:lib stack:exe:stack stack:exe:stack-integration-test -stack:test:stack-test +stack:test:stack-unit-test ~~~ or command: diff --git a/package.yaml b/package.yaml index 8fc997ca8f..ec5ebf0e6c 100644 --- a/package.yaml +++ b/package.yaml @@ -36,12 +36,12 @@ extra-source-files: - stack.yaml - doc/*.md - src/setup-shim/StackSetupShim.hs -- test/package-dump/ghc-7.10.txt -- test/package-dump/ghc-7.8.4-osx.txt -- test/package-dump/ghc-7.8.txt -- test/package-dump/ghc-head.txt -- src/test/Stack/Untar/test1.tar.gz -- src/test/Stack/Untar/test2.tar.gz +- tests/unit/package-dump/ghc-7.10.txt +- tests/unit/package-dump/ghc-7.8.4-osx.txt +- tests/unit/package-dump/ghc-7.8.txt +- tests/unit/package-dump/ghc-head.txt +- tests/unit/Stack/Untar/test1.tar.gz +- tests/unit/Stack/Untar/test2.tar.gz # Support for people who prefer, or need, to build Stack with Cabal (the tool): - cabal.project - cabal.config @@ -355,8 +355,8 @@ executables: stack-integration-test: main: IntegrationSpec.hs source-dirs: - - test/integration - - test/integration/lib + - tests/integration + - tests/integration/lib ghc-options: - -threaded - -rtsopts @@ -373,15 +373,15 @@ executables: - -static - -pthread tests: - stack-test: + stack-unit-test: main: Spec.hs - source-dirs: src/test + source-dirs: tests/unit when: - condition: 'os(windows)' then: - source-dirs: src/test/windows/ + source-dirs: tests/unit/windows/ else: - source-dirs: src/test/unix/ + source-dirs: tests/unit/unix/ ghc-options: - -threaded dependencies: diff --git a/stack.cabal b/stack.cabal index 782f324100..9dfe74bfc7 100644 --- a/stack.cabal +++ b/stack.cabal @@ -96,12 +96,12 @@ extra-source-files: doc/upload_command.md doc/yaml_configuration.md src/setup-shim/StackSetupShim.hs - test/package-dump/ghc-7.10.txt - test/package-dump/ghc-7.8.4-osx.txt - test/package-dump/ghc-7.8.txt - test/package-dump/ghc-head.txt - src/test/Stack/Untar/test1.tar.gz - src/test/Stack/Untar/test2.tar.gz + tests/unit/package-dump/ghc-7.10.txt + tests/unit/package-dump/ghc-7.8.4-osx.txt + tests/unit/package-dump/ghc-7.8.txt + tests/unit/package-dump/ghc-head.txt + tests/unit/Stack/Untar/test1.tar.gz + tests/unit/Stack/Untar/test2.tar.gz cabal.project cabal.config @@ -539,8 +539,8 @@ executable stack-integration-test autogen-modules: Paths_stack hs-source-dirs: - test/integration - test/integration/lib + tests/integration + tests/integration/lib ghc-options: -fwrite-ide-info -hiedir=.hie -Wall -Wmissing-export-lists -optP-Wno-nonportable-include-path -threaded -rtsopts -with-rtsopts=-N build-depends: Cabal >=3.8.1.0 @@ -630,7 +630,7 @@ executable stack-integration-test if flag(static) ld-options: -static -pthread -test-suite stack-test +test-suite stack-unit-test type: exitcode-stdio-1.0 main-is: Spec.hs other-modules: @@ -651,7 +651,7 @@ test-suite stack-test autogen-modules: Paths_stack hs-source-dirs: - src/test + tests/unit ghc-options: -fwrite-ide-info -hiedir=.hie -Wall -Wmissing-export-lists -optP-Wno-nonportable-include-path -threaded build-depends: Cabal >=3.8.1.0 @@ -742,11 +742,11 @@ test-suite stack-test other-modules: Stack.Ghci.FakePaths hs-source-dirs: - src/test/windows/ + tests/unit/windows/ else other-modules: Stack.Ghci.FakePaths hs-source-dirs: - src/test/unix/ + tests/unit/unix/ build-tool-depends: hspec-discover:hspec-discover diff --git a/test/integration/.gitignore b/tests/integration/.gitignore similarity index 100% rename from test/integration/.gitignore rename to tests/integration/.gitignore diff --git a/test/integration/IntegrationSpec.hs b/tests/integration/IntegrationSpec.hs similarity index 99% rename from test/integration/IntegrationSpec.hs rename to tests/integration/IntegrationSpec.hs index 05e381b237..41d2cc217f 100644 --- a/test/integration/IntegrationSpec.hs +++ b/tests/integration/IntegrationSpec.hs @@ -110,7 +110,7 @@ runApp options inner = do simpleApp <- ask runghc <- findExecutable "runghc" >>= either throwIO pure srcDir <- canonicalizePath "" - testsRoot <- canonicalizePath $ srcDir "test/integration" + testsRoot <- canonicalizePath $ srcDir "tests/integration" libdir <- canonicalizePath $ testsRoot "lib" myPath <- liftIO getExecutablePath diff --git a/test/integration/README.md b/tests/integration/README.md similarity index 100% rename from test/integration/README.md rename to tests/integration/README.md diff --git a/test/integration/lib/StackTest.hs b/tests/integration/lib/StackTest.hs similarity index 100% rename from test/integration/lib/StackTest.hs rename to tests/integration/lib/StackTest.hs diff --git a/test/integration/run-single-test.sh b/tests/integration/run-single-test.sh old mode 100755 new mode 100644 similarity index 100% rename from test/integration/run-single-test.sh rename to tests/integration/run-single-test.sh diff --git a/test/integration/run-sort-tests.sh b/tests/integration/run-sort-tests.sh old mode 100755 new mode 100644 similarity index 100% rename from test/integration/run-sort-tests.sh rename to tests/integration/run-sort-tests.sh diff --git a/test/integration/tests/111-custom-snapshot/Main.hs b/tests/integration/tests/111-custom-snapshot/Main.hs similarity index 100% rename from test/integration/tests/111-custom-snapshot/Main.hs rename to tests/integration/tests/111-custom-snapshot/Main.hs diff --git a/test/integration/tests/111-custom-snapshot/files/files.cabal b/tests/integration/tests/111-custom-snapshot/files/files.cabal similarity index 100% rename from test/integration/tests/111-custom-snapshot/files/files.cabal rename to tests/integration/tests/111-custom-snapshot/files/files.cabal diff --git a/test/integration/tests/111-custom-snapshot/files/my-snapshot.yaml b/tests/integration/tests/111-custom-snapshot/files/my-snapshot.yaml similarity index 100% rename from test/integration/tests/111-custom-snapshot/files/my-snapshot.yaml rename to tests/integration/tests/111-custom-snapshot/files/my-snapshot.yaml diff --git a/test/integration/tests/111-custom-snapshot/files/src/Lib.hs b/tests/integration/tests/111-custom-snapshot/files/src/Lib.hs similarity index 100% rename from test/integration/tests/111-custom-snapshot/files/src/Lib.hs rename to tests/integration/tests/111-custom-snapshot/files/src/Lib.hs diff --git a/test/integration/tests/111-custom-snapshot/files/stack.yaml b/tests/integration/tests/111-custom-snapshot/files/stack.yaml similarity index 100% rename from test/integration/tests/111-custom-snapshot/files/stack.yaml rename to tests/integration/tests/111-custom-snapshot/files/stack.yaml diff --git a/test/integration/tests/1198-multiple-exes-with-same-name/Main.hs b/tests/integration/tests/1198-multiple-exes-with-same-name/Main.hs similarity index 100% rename from test/integration/tests/1198-multiple-exes-with-same-name/Main.hs rename to tests/integration/tests/1198-multiple-exes-with-same-name/Main.hs diff --git a/test/integration/tests/1198-multiple-exes-with-same-name/files/.gitignore b/tests/integration/tests/1198-multiple-exes-with-same-name/files/.gitignore similarity index 100% rename from test/integration/tests/1198-multiple-exes-with-same-name/files/.gitignore rename to tests/integration/tests/1198-multiple-exes-with-same-name/files/.gitignore diff --git a/test/integration/tests/1198-multiple-exes-with-same-name/files/also-has-exe-foo/also-has-exe-foo.cabal b/tests/integration/tests/1198-multiple-exes-with-same-name/files/also-has-exe-foo/also-has-exe-foo.cabal similarity index 100% rename from test/integration/tests/1198-multiple-exes-with-same-name/files/also-has-exe-foo/also-has-exe-foo.cabal rename to tests/integration/tests/1198-multiple-exes-with-same-name/files/also-has-exe-foo/also-has-exe-foo.cabal diff --git a/test/integration/tests/1198-multiple-exes-with-same-name/files/also-has-exe-foo/app/Main.hs b/tests/integration/tests/1198-multiple-exes-with-same-name/files/also-has-exe-foo/app/Main.hs similarity index 100% rename from test/integration/tests/1198-multiple-exes-with-same-name/files/also-has-exe-foo/app/Main.hs rename to tests/integration/tests/1198-multiple-exes-with-same-name/files/also-has-exe-foo/app/Main.hs diff --git a/test/integration/tests/1198-multiple-exes-with-same-name/files/app/Main.hs b/tests/integration/tests/1198-multiple-exes-with-same-name/files/app/Main.hs similarity index 100% rename from test/integration/tests/1198-multiple-exes-with-same-name/files/app/Main.hs rename to tests/integration/tests/1198-multiple-exes-with-same-name/files/app/Main.hs diff --git a/test/integration/tests/1198-multiple-exes-with-same-name/files/has-exe-foo-too/app/Main.hs b/tests/integration/tests/1198-multiple-exes-with-same-name/files/has-exe-foo-too/app/Main.hs similarity index 100% rename from test/integration/tests/1198-multiple-exes-with-same-name/files/has-exe-foo-too/app/Main.hs rename to tests/integration/tests/1198-multiple-exes-with-same-name/files/has-exe-foo-too/app/Main.hs diff --git a/test/integration/tests/1198-multiple-exes-with-same-name/files/has-exe-foo-too/has-exe-foo-too.cabal b/tests/integration/tests/1198-multiple-exes-with-same-name/files/has-exe-foo-too/has-exe-foo-too.cabal similarity index 100% rename from test/integration/tests/1198-multiple-exes-with-same-name/files/has-exe-foo-too/has-exe-foo-too.cabal rename to tests/integration/tests/1198-multiple-exes-with-same-name/files/has-exe-foo-too/has-exe-foo-too.cabal diff --git a/test/integration/tests/1198-multiple-exes-with-same-name/files/has-exe-foo.cabal b/tests/integration/tests/1198-multiple-exes-with-same-name/files/has-exe-foo.cabal similarity index 100% rename from test/integration/tests/1198-multiple-exes-with-same-name/files/has-exe-foo.cabal rename to tests/integration/tests/1198-multiple-exes-with-same-name/files/has-exe-foo.cabal diff --git a/test/integration/tests/1265-extensible-snapshots/Main.hs b/tests/integration/tests/1265-extensible-snapshots/Main.hs similarity index 100% rename from test/integration/tests/1265-extensible-snapshots/Main.hs rename to tests/integration/tests/1265-extensible-snapshots/Main.hs diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml b/tests/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml similarity index 100% rename from test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml rename to tests/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml b/tests/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml similarity index 100% rename from test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml rename to tests/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshot.yaml b/tests/integration/tests/1265-extensible-snapshots/files/snapshot.yaml similarity index 100% rename from test/integration/tests/1265-extensible-snapshots/files/snapshot.yaml rename to tests/integration/tests/1265-extensible-snapshots/files/snapshot.yaml diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml b/tests/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml similarity index 100% rename from test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml rename to tests/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshots/package-0.1.2.3.tar.gz b/tests/integration/tests/1265-extensible-snapshots/files/snapshots/package-0.1.2.3.tar.gz similarity index 100% rename from test/integration/tests/1265-extensible-snapshots/files/snapshots/package-0.1.2.3.tar.gz rename to tests/integration/tests/1265-extensible-snapshots/files/snapshots/package-0.1.2.3.tar.gz diff --git a/test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml b/tests/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml similarity index 100% rename from test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml rename to tests/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml diff --git a/test/integration/tests/1265-extensible-snapshots/files/stack-local-snapshot.yaml b/tests/integration/tests/1265-extensible-snapshots/files/stack-local-snapshot.yaml similarity index 100% rename from test/integration/tests/1265-extensible-snapshots/files/stack-local-snapshot.yaml rename to tests/integration/tests/1265-extensible-snapshots/files/stack-local-snapshot.yaml diff --git a/test/integration/tests/1265-extensible-snapshots/files/stack-modify-lts.yaml b/tests/integration/tests/1265-extensible-snapshots/files/stack-modify-lts.yaml similarity index 100% rename from test/integration/tests/1265-extensible-snapshots/files/stack-modify-lts.yaml rename to tests/integration/tests/1265-extensible-snapshots/files/stack-modify-lts.yaml diff --git a/test/integration/tests/1265-extensible-snapshots/files/stack-remote-snapshot.yaml b/tests/integration/tests/1265-extensible-snapshots/files/stack-remote-snapshot.yaml similarity index 100% rename from test/integration/tests/1265-extensible-snapshots/files/stack-remote-snapshot.yaml rename to tests/integration/tests/1265-extensible-snapshots/files/stack-remote-snapshot.yaml diff --git a/test/integration/tests/1265-extensible-snapshots/files/stack.yaml b/tests/integration/tests/1265-extensible-snapshots/files/stack.yaml similarity index 100% rename from test/integration/tests/1265-extensible-snapshots/files/stack.yaml rename to tests/integration/tests/1265-extensible-snapshots/files/stack.yaml diff --git a/test/integration/tests/1336-1337-new-package-names/.gitignore b/tests/integration/tests/1336-1337-new-package-names/.gitignore similarity index 100% rename from test/integration/tests/1336-1337-new-package-names/.gitignore rename to tests/integration/tests/1336-1337-new-package-names/.gitignore diff --git a/test/integration/tests/1336-1337-new-package-names/Main.hs b/tests/integration/tests/1336-1337-new-package-names/Main.hs similarity index 100% rename from test/integration/tests/1336-1337-new-package-names/Main.hs rename to tests/integration/tests/1336-1337-new-package-names/Main.hs diff --git a/test/integration/tests/1337-unicode-everywhere/Main.hs b/tests/integration/tests/1337-unicode-everywhere/Main.hs similarity index 100% rename from test/integration/tests/1337-unicode-everywhere/Main.hs rename to tests/integration/tests/1337-unicode-everywhere/Main.hs diff --git a/test/integration/tests/1337-unicode-everywhere/files/Setup.hs b/tests/integration/tests/1337-unicode-everywhere/files/Setup.hs similarity index 100% rename from test/integration/tests/1337-unicode-everywhere/files/Setup.hs rename to tests/integration/tests/1337-unicode-everywhere/files/Setup.hs diff --git a/test/integration/tests/1337-unicode-everywhere/files/app/Main.hs b/tests/integration/tests/1337-unicode-everywhere/files/app/Main.hs similarity index 100% rename from test/integration/tests/1337-unicode-everywhere/files/app/Main.hs rename to tests/integration/tests/1337-unicode-everywhere/files/app/Main.hs diff --git a/test/integration/tests/1337-unicode-everywhere/files/stack.yaml b/tests/integration/tests/1337-unicode-everywhere/files/stack.yaml similarity index 100% rename from test/integration/tests/1337-unicode-everywhere/files/stack.yaml rename to tests/integration/tests/1337-unicode-everywhere/files/stack.yaml diff --git "a/test/integration/tests/1337-unicode-everywhere/files/\327\220\327\250\327\245/\320\237\317\203\316\265.hs" "b/tests/integration/tests/1337-unicode-everywhere/files/\327\220\327\250\327\245/\320\237\317\203\316\265.hs" similarity index 100% rename from "test/integration/tests/1337-unicode-everywhere/files/\327\220\327\250\327\245/\320\237\317\203\316\265.hs" rename to "tests/integration/tests/1337-unicode-everywhere/files/\327\220\327\250\327\245/\320\237\317\203\316\265.hs" diff --git "a/test/integration/tests/1337-unicode-everywhere/files/\343\201\204\343\202\215\343\201\257-LICENSE" "b/tests/integration/tests/1337-unicode-everywhere/files/\343\201\204\343\202\215\343\201\257-LICENSE" similarity index 100% rename from "test/integration/tests/1337-unicode-everywhere/files/\343\201\204\343\202\215\343\201\257-LICENSE" rename to "tests/integration/tests/1337-unicode-everywhere/files/\343\201\204\343\202\215\343\201\257-LICENSE" diff --git "a/test/integration/tests/1337-unicode-everywhere/files/\344\273\245.cabal" "b/tests/integration/tests/1337-unicode-everywhere/files/\344\273\245.cabal" similarity index 100% rename from "test/integration/tests/1337-unicode-everywhere/files/\344\273\245.cabal" rename to "tests/integration/tests/1337-unicode-everywhere/files/\344\273\245.cabal" diff --git a/test/integration/tests/1438-configure-options/Main.hs b/tests/integration/tests/1438-configure-options/Main.hs similarity index 100% rename from test/integration/tests/1438-configure-options/Main.hs rename to tests/integration/tests/1438-configure-options/Main.hs diff --git a/test/integration/tests/1438-configure-options/files/.gitignore b/tests/integration/tests/1438-configure-options/files/.gitignore similarity index 100% rename from test/integration/tests/1438-configure-options/files/.gitignore rename to tests/integration/tests/1438-configure-options/files/.gitignore diff --git a/test/integration/tests/1438-configure-options/files/package.yaml b/tests/integration/tests/1438-configure-options/files/package.yaml similarity index 100% rename from test/integration/tests/1438-configure-options/files/package.yaml rename to tests/integration/tests/1438-configure-options/files/package.yaml diff --git a/test/integration/tests/1438-configure-options/files/stack-everything.yaml b/tests/integration/tests/1438-configure-options/files/stack-everything.yaml similarity index 100% rename from test/integration/tests/1438-configure-options/files/stack-everything.yaml rename to tests/integration/tests/1438-configure-options/files/stack-everything.yaml diff --git a/tests/integration/tests/1438-configure-options/files/stack-everything.yaml.lock b/tests/integration/tests/1438-configure-options/files/stack-everything.yaml.lock new file mode 100644 index 0000000000..1c8044c146 --- /dev/null +++ b/tests/integration/tests/1438-configure-options/files/stack-everything.yaml.lock @@ -0,0 +1,14 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: +- completed: + hackage: acme-dont-1.1@sha256:8264ad3e5113d3e0417b46e71d5a9c0914a1f03b5b81319cc329f1dc0f49b96c,602 + pantry-tree: + sha256: 79dbeddaf0fd507611687cefe9511c8fda489849fb0cac3894925716936290b2 + size: 206 + original: + hackage: acme-dont-1.1@rev:0 +snapshots: [] diff --git a/test/integration/tests/1438-configure-options/files/stack-locals.yaml b/tests/integration/tests/1438-configure-options/files/stack-locals.yaml similarity index 100% rename from test/integration/tests/1438-configure-options/files/stack-locals.yaml rename to tests/integration/tests/1438-configure-options/files/stack-locals.yaml diff --git a/tests/integration/tests/1438-configure-options/files/stack-locals.yaml.lock b/tests/integration/tests/1438-configure-options/files/stack-locals.yaml.lock new file mode 100644 index 0000000000..1c8044c146 --- /dev/null +++ b/tests/integration/tests/1438-configure-options/files/stack-locals.yaml.lock @@ -0,0 +1,14 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: +- completed: + hackage: acme-dont-1.1@sha256:8264ad3e5113d3e0417b46e71d5a9c0914a1f03b5b81319cc329f1dc0f49b96c,602 + pantry-tree: + sha256: 79dbeddaf0fd507611687cefe9511c8fda489849fb0cac3894925716936290b2 + size: 206 + original: + hackage: acme-dont-1.1@rev:0 +snapshots: [] diff --git a/test/integration/tests/1438-configure-options/files/stack-name.yaml b/tests/integration/tests/1438-configure-options/files/stack-name.yaml similarity index 100% rename from test/integration/tests/1438-configure-options/files/stack-name.yaml rename to tests/integration/tests/1438-configure-options/files/stack-name.yaml diff --git a/test/integration/tests/1438-configure-options/files/stack-targets.yaml b/tests/integration/tests/1438-configure-options/files/stack-targets.yaml similarity index 100% rename from test/integration/tests/1438-configure-options/files/stack-targets.yaml rename to tests/integration/tests/1438-configure-options/files/stack-targets.yaml diff --git a/test/integration/tests/1659-skip-component/Main.hs b/tests/integration/tests/1659-skip-component/Main.hs similarity index 100% rename from test/integration/tests/1659-skip-component/Main.hs rename to tests/integration/tests/1659-skip-component/Main.hs diff --git a/test/integration/tests/1659-skip-component/files/LICENSE b/tests/integration/tests/1659-skip-component/files/LICENSE similarity index 100% rename from test/integration/tests/1659-skip-component/files/LICENSE rename to tests/integration/tests/1659-skip-component/files/LICENSE diff --git a/test/integration/tests/1659-skip-component/files/README.md b/tests/integration/tests/1659-skip-component/files/README.md similarity index 100% rename from test/integration/tests/1659-skip-component/files/README.md rename to tests/integration/tests/1659-skip-component/files/README.md diff --git a/test/integration/tests/1659-skip-component/files/Setup.hs b/tests/integration/tests/1659-skip-component/files/Setup.hs similarity index 100% rename from test/integration/tests/1659-skip-component/files/Setup.hs rename to tests/integration/tests/1659-skip-component/files/Setup.hs diff --git a/test/integration/tests/1659-skip-component/files/app/Main.hs b/tests/integration/tests/1659-skip-component/files/app/Main.hs similarity index 100% rename from test/integration/tests/1659-skip-component/files/app/Main.hs rename to tests/integration/tests/1659-skip-component/files/app/Main.hs diff --git a/test/integration/tests/1659-skip-component/files/app/MainFail.hs b/tests/integration/tests/1659-skip-component/files/app/MainFail.hs similarity index 100% rename from test/integration/tests/1659-skip-component/files/app/MainFail.hs rename to tests/integration/tests/1659-skip-component/files/app/MainFail.hs diff --git a/test/integration/tests/1659-skip-component/files/bench/Bench.hs b/tests/integration/tests/1659-skip-component/files/bench/Bench.hs similarity index 100% rename from test/integration/tests/1659-skip-component/files/bench/Bench.hs rename to tests/integration/tests/1659-skip-component/files/bench/Bench.hs diff --git a/test/integration/tests/1659-skip-component/files/skip-component.cabal b/tests/integration/tests/1659-skip-component/files/skip-component.cabal similarity index 100% rename from test/integration/tests/1659-skip-component/files/skip-component.cabal rename to tests/integration/tests/1659-skip-component/files/skip-component.cabal diff --git a/test/integration/tests/1659-skip-component/files/src/Lib.hs b/tests/integration/tests/1659-skip-component/files/src/Lib.hs similarity index 100% rename from test/integration/tests/1659-skip-component/files/src/Lib.hs rename to tests/integration/tests/1659-skip-component/files/src/Lib.hs diff --git a/test/integration/tests/1659-skip-component/files/stack.yaml b/tests/integration/tests/1659-skip-component/files/stack.yaml similarity index 100% rename from test/integration/tests/1659-skip-component/files/stack.yaml rename to tests/integration/tests/1659-skip-component/files/stack.yaml diff --git a/test/integration/tests/1659-skip-component/files/test/Spec.hs b/tests/integration/tests/1659-skip-component/files/test/Spec.hs similarity index 100% rename from test/integration/tests/1659-skip-component/files/test/Spec.hs rename to tests/integration/tests/1659-skip-component/files/test/Spec.hs diff --git a/test/integration/tests/1884-url-to-tarball/Main.hs b/tests/integration/tests/1884-url-to-tarball/Main.hs similarity index 100% rename from test/integration/tests/1884-url-to-tarball/Main.hs rename to tests/integration/tests/1884-url-to-tarball/Main.hs diff --git a/test/integration/tests/1884-url-to-tarball/files/.gitignore b/tests/integration/tests/1884-url-to-tarball/files/.gitignore similarity index 100% rename from test/integration/tests/1884-url-to-tarball/files/.gitignore rename to tests/integration/tests/1884-url-to-tarball/files/.gitignore diff --git a/test/integration/tests/1884-url-to-tarball/files/package.yaml b/tests/integration/tests/1884-url-to-tarball/files/package.yaml similarity index 100% rename from test/integration/tests/1884-url-to-tarball/files/package.yaml rename to tests/integration/tests/1884-url-to-tarball/files/package.yaml diff --git a/test/integration/tests/1884-url-to-tarball/files/stack.yaml b/tests/integration/tests/1884-url-to-tarball/files/stack.yaml similarity index 100% rename from test/integration/tests/1884-url-to-tarball/files/stack.yaml rename to tests/integration/tests/1884-url-to-tarball/files/stack.yaml diff --git a/test/integration/tests/2195-depend-on-exe/Main.hs b/tests/integration/tests/2195-depend-on-exe/Main.hs similarity index 100% rename from test/integration/tests/2195-depend-on-exe/Main.hs rename to tests/integration/tests/2195-depend-on-exe/Main.hs diff --git a/test/integration/tests/2195-depend-on-exe/files/files.cabal b/tests/integration/tests/2195-depend-on-exe/files/files.cabal similarity index 100% rename from test/integration/tests/2195-depend-on-exe/files/files.cabal rename to tests/integration/tests/2195-depend-on-exe/files/files.cabal diff --git a/test/integration/tests/2195-depend-on-exe/files/stack.yaml b/tests/integration/tests/2195-depend-on-exe/files/stack.yaml similarity index 100% rename from test/integration/tests/2195-depend-on-exe/files/stack.yaml rename to tests/integration/tests/2195-depend-on-exe/files/stack.yaml diff --git a/test/integration/tests/2433-ghc-by-version/Main.hs b/tests/integration/tests/2433-ghc-by-version/Main.hs similarity index 100% rename from test/integration/tests/2433-ghc-by-version/Main.hs rename to tests/integration/tests/2433-ghc-by-version/Main.hs diff --git a/test/integration/tests/2433-ghc-by-version/files/.gitignore b/tests/integration/tests/2433-ghc-by-version/files/.gitignore similarity index 100% rename from test/integration/tests/2433-ghc-by-version/files/.gitignore rename to tests/integration/tests/2433-ghc-by-version/files/.gitignore diff --git a/test/integration/tests/2433-ghc-by-version/files/fake-path/ghc b/tests/integration/tests/2433-ghc-by-version/files/fake-path/ghc old mode 100755 new mode 100644 similarity index 100% rename from test/integration/tests/2433-ghc-by-version/files/fake-path/ghc rename to tests/integration/tests/2433-ghc-by-version/files/fake-path/ghc diff --git a/test/integration/tests/2433-ghc-by-version/files/fake-path/ghc-pkg b/tests/integration/tests/2433-ghc-by-version/files/fake-path/ghc-pkg old mode 100755 new mode 100644 similarity index 100% rename from test/integration/tests/2433-ghc-by-version/files/fake-path/ghc-pkg rename to tests/integration/tests/2433-ghc-by-version/files/fake-path/ghc-pkg diff --git a/test/integration/tests/2433-ghc-by-version/files/foo.hs b/tests/integration/tests/2433-ghc-by-version/files/foo.hs similarity index 100% rename from test/integration/tests/2433-ghc-by-version/files/foo.hs rename to tests/integration/tests/2433-ghc-by-version/files/foo.hs diff --git a/test/integration/tests/2433-ghc-by-version/files/run.sh b/tests/integration/tests/2433-ghc-by-version/files/run.sh old mode 100755 new mode 100644 similarity index 100% rename from test/integration/tests/2433-ghc-by-version/files/run.sh rename to tests/integration/tests/2433-ghc-by-version/files/run.sh diff --git a/test/integration/tests/2465-init-no-packages/Main.hs b/tests/integration/tests/2465-init-no-packages/Main.hs similarity index 100% rename from test/integration/tests/2465-init-no-packages/Main.hs rename to tests/integration/tests/2465-init-no-packages/Main.hs diff --git a/test/integration/tests/2465-init-no-packages/files/.gitignore b/tests/integration/tests/2465-init-no-packages/files/.gitignore similarity index 100% rename from test/integration/tests/2465-init-no-packages/files/.gitignore rename to tests/integration/tests/2465-init-no-packages/files/.gitignore diff --git a/test/integration/tests/2643-copy-compiler-tool/Main.hs b/tests/integration/tests/2643-copy-compiler-tool/Main.hs similarity index 100% rename from test/integration/tests/2643-copy-compiler-tool/Main.hs rename to tests/integration/tests/2643-copy-compiler-tool/Main.hs diff --git a/test/integration/tests/2643-copy-compiler-tool/files/.gitignore b/tests/integration/tests/2643-copy-compiler-tool/files/.gitignore similarity index 100% rename from test/integration/tests/2643-copy-compiler-tool/files/.gitignore rename to tests/integration/tests/2643-copy-compiler-tool/files/.gitignore diff --git a/test/integration/tests/2643-copy-compiler-tool/files/Bar.hs b/tests/integration/tests/2643-copy-compiler-tool/files/Bar.hs similarity index 100% rename from test/integration/tests/2643-copy-compiler-tool/files/Bar.hs rename to tests/integration/tests/2643-copy-compiler-tool/files/Bar.hs diff --git a/test/integration/tests/2643-copy-compiler-tool/files/Baz.hs b/tests/integration/tests/2643-copy-compiler-tool/files/Baz.hs similarity index 100% rename from test/integration/tests/2643-copy-compiler-tool/files/Baz.hs rename to tests/integration/tests/2643-copy-compiler-tool/files/Baz.hs diff --git a/test/integration/tests/2643-copy-compiler-tool/files/Foo.hs b/tests/integration/tests/2643-copy-compiler-tool/files/Foo.hs similarity index 100% rename from test/integration/tests/2643-copy-compiler-tool/files/Foo.hs rename to tests/integration/tests/2643-copy-compiler-tool/files/Foo.hs diff --git a/test/integration/tests/2643-copy-compiler-tool/files/LICENSE b/tests/integration/tests/2643-copy-compiler-tool/files/LICENSE similarity index 100% rename from test/integration/tests/2643-copy-compiler-tool/files/LICENSE rename to tests/integration/tests/2643-copy-compiler-tool/files/LICENSE diff --git a/test/integration/tests/2643-copy-compiler-tool/files/Setup.hs b/tests/integration/tests/2643-copy-compiler-tool/files/Setup.hs similarity index 100% rename from test/integration/tests/2643-copy-compiler-tool/files/Setup.hs rename to tests/integration/tests/2643-copy-compiler-tool/files/Setup.hs diff --git a/test/integration/tests/2643-copy-compiler-tool/files/copy-compiler-tool-test.cabal b/tests/integration/tests/2643-copy-compiler-tool/files/copy-compiler-tool-test.cabal similarity index 100% rename from test/integration/tests/2643-copy-compiler-tool/files/copy-compiler-tool-test.cabal rename to tests/integration/tests/2643-copy-compiler-tool/files/copy-compiler-tool-test.cabal diff --git a/test/integration/tests/2781-shadow-bug/Main.hs b/tests/integration/tests/2781-shadow-bug/Main.hs similarity index 100% rename from test/integration/tests/2781-shadow-bug/Main.hs rename to tests/integration/tests/2781-shadow-bug/Main.hs diff --git a/test/integration/tests/2781-shadow-bug/files/.gitignore b/tests/integration/tests/2781-shadow-bug/files/.gitignore similarity index 100% rename from test/integration/tests/2781-shadow-bug/files/.gitignore rename to tests/integration/tests/2781-shadow-bug/files/.gitignore diff --git a/test/integration/tests/2781-shadow-bug/files/bar/bar.cabal b/tests/integration/tests/2781-shadow-bug/files/bar/bar.cabal similarity index 100% rename from test/integration/tests/2781-shadow-bug/files/bar/bar.cabal rename to tests/integration/tests/2781-shadow-bug/files/bar/bar.cabal diff --git a/test/integration/tests/2781-shadow-bug/files/bar/bench/bench.hs b/tests/integration/tests/2781-shadow-bug/files/bar/bench/bench.hs similarity index 100% rename from test/integration/tests/2781-shadow-bug/files/bar/bench/bench.hs rename to tests/integration/tests/2781-shadow-bug/files/bar/bench/bench.hs diff --git a/test/integration/tests/2781-shadow-bug/files/bar/src/Bar.hs b/tests/integration/tests/2781-shadow-bug/files/bar/src/Bar.hs similarity index 100% rename from test/integration/tests/2781-shadow-bug/files/bar/src/Bar.hs rename to tests/integration/tests/2781-shadow-bug/files/bar/src/Bar.hs diff --git a/test/integration/tests/2781-shadow-bug/files/foo/foo.cabal b/tests/integration/tests/2781-shadow-bug/files/foo/foo.cabal similarity index 100% rename from test/integration/tests/2781-shadow-bug/files/foo/foo.cabal rename to tests/integration/tests/2781-shadow-bug/files/foo/foo.cabal diff --git a/test/integration/tests/2781-shadow-bug/files/foo/v1/Foo.hs b/tests/integration/tests/2781-shadow-bug/files/foo/v1/Foo.hs similarity index 100% rename from test/integration/tests/2781-shadow-bug/files/foo/v1/Foo.hs rename to tests/integration/tests/2781-shadow-bug/files/foo/v1/Foo.hs diff --git a/test/integration/tests/2781-shadow-bug/files/foo/v2/Foo.hs b/tests/integration/tests/2781-shadow-bug/files/foo/v2/Foo.hs similarity index 100% rename from test/integration/tests/2781-shadow-bug/files/foo/v2/Foo.hs rename to tests/integration/tests/2781-shadow-bug/files/foo/v2/Foo.hs diff --git a/test/integration/tests/2781-shadow-bug/files/stack.yaml b/tests/integration/tests/2781-shadow-bug/files/stack.yaml similarity index 100% rename from test/integration/tests/2781-shadow-bug/files/stack.yaml rename to tests/integration/tests/2781-shadow-bug/files/stack.yaml diff --git a/test/integration/tests/2997-ensure-warnings-output/Main.hs b/tests/integration/tests/2997-ensure-warnings-output/Main.hs similarity index 100% rename from test/integration/tests/2997-ensure-warnings-output/Main.hs rename to tests/integration/tests/2997-ensure-warnings-output/Main.hs diff --git a/test/integration/tests/2997-ensure-warnings-output/files/.gitignore b/tests/integration/tests/2997-ensure-warnings-output/files/.gitignore similarity index 100% rename from test/integration/tests/2997-ensure-warnings-output/files/.gitignore rename to tests/integration/tests/2997-ensure-warnings-output/files/.gitignore diff --git a/test/integration/tests/2997-ensure-warnings-output/files/bar/package.yaml b/tests/integration/tests/2997-ensure-warnings-output/files/bar/package.yaml similarity index 100% rename from test/integration/tests/2997-ensure-warnings-output/files/bar/package.yaml rename to tests/integration/tests/2997-ensure-warnings-output/files/bar/package.yaml diff --git a/test/integration/tests/2997-ensure-warnings-output/files/bar/src/Bar.hs b/tests/integration/tests/2997-ensure-warnings-output/files/bar/src/Bar.hs similarity index 100% rename from test/integration/tests/2997-ensure-warnings-output/files/bar/src/Bar.hs rename to tests/integration/tests/2997-ensure-warnings-output/files/bar/src/Bar.hs diff --git a/test/integration/tests/2997-ensure-warnings-output/files/foo/package.yaml b/tests/integration/tests/2997-ensure-warnings-output/files/foo/package.yaml similarity index 100% rename from test/integration/tests/2997-ensure-warnings-output/files/foo/package.yaml rename to tests/integration/tests/2997-ensure-warnings-output/files/foo/package.yaml diff --git a/test/integration/tests/2997-ensure-warnings-output/files/foo/src/Foo.hs b/tests/integration/tests/2997-ensure-warnings-output/files/foo/src/Foo.hs similarity index 100% rename from test/integration/tests/2997-ensure-warnings-output/files/foo/src/Foo.hs rename to tests/integration/tests/2997-ensure-warnings-output/files/foo/src/Foo.hs diff --git a/test/integration/tests/2997-ensure-warnings-output/files/stack.yaml b/tests/integration/tests/2997-ensure-warnings-output/files/stack.yaml similarity index 100% rename from test/integration/tests/2997-ensure-warnings-output/files/stack.yaml rename to tests/integration/tests/2997-ensure-warnings-output/files/stack.yaml diff --git a/test/integration/tests/32-unlisted-module/Main.hs b/tests/integration/tests/32-unlisted-module/Main.hs similarity index 100% rename from test/integration/tests/32-unlisted-module/Main.hs rename to tests/integration/tests/32-unlisted-module/Main.hs diff --git a/test/integration/tests/32-unlisted-module/files/.gitignore b/tests/integration/tests/32-unlisted-module/files/.gitignore similarity index 100% rename from test/integration/tests/32-unlisted-module/files/.gitignore rename to tests/integration/tests/32-unlisted-module/files/.gitignore diff --git a/test/integration/tests/32-unlisted-module/files/embed_FAIL.txt b/tests/integration/tests/32-unlisted-module/files/embed_FAIL.txt similarity index 100% rename from test/integration/tests/32-unlisted-module/files/embed_FAIL.txt rename to tests/integration/tests/32-unlisted-module/files/embed_FAIL.txt diff --git a/test/integration/tests/32-unlisted-module/files/embed_OK.txt b/tests/integration/tests/32-unlisted-module/files/embed_OK.txt similarity index 100% rename from test/integration/tests/32-unlisted-module/files/embed_OK.txt rename to tests/integration/tests/32-unlisted-module/files/embed_OK.txt diff --git a/test/integration/tests/32-unlisted-module/files/files.cabal b/tests/integration/tests/32-unlisted-module/files/files.cabal similarity index 100% rename from test/integration/tests/32-unlisted-module/files/files.cabal rename to tests/integration/tests/32-unlisted-module/files/files.cabal diff --git a/test/integration/tests/32-unlisted-module/files/src/Main.hs b/tests/integration/tests/32-unlisted-module/files/src/Main.hs similarity index 100% rename from test/integration/tests/32-unlisted-module/files/src/Main.hs rename to tests/integration/tests/32-unlisted-module/files/src/Main.hs diff --git a/test/integration/tests/32-unlisted-module/files/src/Unlisted_FAIL.hs b/tests/integration/tests/32-unlisted-module/files/src/Unlisted_FAIL.hs similarity index 100% rename from test/integration/tests/32-unlisted-module/files/src/Unlisted_FAIL.hs rename to tests/integration/tests/32-unlisted-module/files/src/Unlisted_FAIL.hs diff --git a/test/integration/tests/32-unlisted-module/files/src/Unlisted_OK.hs b/tests/integration/tests/32-unlisted-module/files/src/Unlisted_OK.hs similarity index 100% rename from test/integration/tests/32-unlisted-module/files/src/Unlisted_OK.hs rename to tests/integration/tests/32-unlisted-module/files/src/Unlisted_OK.hs diff --git a/test/integration/tests/32-unlisted-module/files/src/main/Main.hs b/tests/integration/tests/32-unlisted-module/files/src/main/Main.hs similarity index 100% rename from test/integration/tests/32-unlisted-module/files/src/main/Main.hs rename to tests/integration/tests/32-unlisted-module/files/src/main/Main.hs diff --git a/test/integration/tests/32-unlisted-module/files/stack.yaml b/tests/integration/tests/32-unlisted-module/files/stack.yaml similarity index 100% rename from test/integration/tests/32-unlisted-module/files/stack.yaml rename to tests/integration/tests/32-unlisted-module/files/stack.yaml diff --git a/test/integration/tests/3229-exe-targets/Main.hs b/tests/integration/tests/3229-exe-targets/Main.hs similarity index 100% rename from test/integration/tests/3229-exe-targets/Main.hs rename to tests/integration/tests/3229-exe-targets/Main.hs diff --git a/test/integration/tests/3229-exe-targets/files/.gitignore b/tests/integration/tests/3229-exe-targets/files/.gitignore similarity index 100% rename from test/integration/tests/3229-exe-targets/files/.gitignore rename to tests/integration/tests/3229-exe-targets/files/.gitignore diff --git a/test/integration/tests/3229-exe-targets/files/app/Alpha.hs b/tests/integration/tests/3229-exe-targets/files/app/Alpha.hs similarity index 100% rename from test/integration/tests/3229-exe-targets/files/app/Alpha.hs rename to tests/integration/tests/3229-exe-targets/files/app/Alpha.hs diff --git a/test/integration/tests/3229-exe-targets/files/app/Beta.hs b/tests/integration/tests/3229-exe-targets/files/app/Beta.hs similarity index 100% rename from test/integration/tests/3229-exe-targets/files/app/Beta.hs rename to tests/integration/tests/3229-exe-targets/files/app/Beta.hs diff --git a/test/integration/tests/3229-exe-targets/files/foo.cabal b/tests/integration/tests/3229-exe-targets/files/foo.cabal similarity index 100% rename from test/integration/tests/3229-exe-targets/files/foo.cabal rename to tests/integration/tests/3229-exe-targets/files/foo.cabal diff --git a/test/integration/tests/3229-exe-targets/files/src/Foo.hs b/tests/integration/tests/3229-exe-targets/files/src/Foo.hs similarity index 100% rename from test/integration/tests/3229-exe-targets/files/src/Foo.hs rename to tests/integration/tests/3229-exe-targets/files/src/Foo.hs diff --git a/test/integration/tests/3315-multi-ghc-options/Main.hs b/tests/integration/tests/3315-multi-ghc-options/Main.hs similarity index 100% rename from test/integration/tests/3315-multi-ghc-options/Main.hs rename to tests/integration/tests/3315-multi-ghc-options/Main.hs diff --git a/test/integration/tests/3315-multi-ghc-options/files/multi-ghc-options.cabal b/tests/integration/tests/3315-multi-ghc-options/files/multi-ghc-options.cabal similarity index 100% rename from test/integration/tests/3315-multi-ghc-options/files/multi-ghc-options.cabal rename to tests/integration/tests/3315-multi-ghc-options/files/multi-ghc-options.cabal diff --git a/test/integration/tests/3315-multi-ghc-options/files/src/Lib.hs b/tests/integration/tests/3315-multi-ghc-options/files/src/Lib.hs similarity index 100% rename from test/integration/tests/3315-multi-ghc-options/files/src/Lib.hs rename to tests/integration/tests/3315-multi-ghc-options/files/src/Lib.hs diff --git a/test/integration/tests/3315-multi-ghc-options/files/stack.yaml b/tests/integration/tests/3315-multi-ghc-options/files/stack.yaml similarity index 100% rename from test/integration/tests/3315-multi-ghc-options/files/stack.yaml rename to tests/integration/tests/3315-multi-ghc-options/files/stack.yaml diff --git a/test/integration/tests/335-multi-package-flags/Main.hs b/tests/integration/tests/335-multi-package-flags/Main.hs similarity index 100% rename from test/integration/tests/335-multi-package-flags/Main.hs rename to tests/integration/tests/335-multi-package-flags/Main.hs diff --git a/test/integration/tests/335-multi-package-flags/files/Setup.hs b/tests/integration/tests/335-multi-package-flags/files/Setup.hs similarity index 100% rename from test/integration/tests/335-multi-package-flags/files/Setup.hs rename to tests/integration/tests/335-multi-package-flags/files/Setup.hs diff --git a/test/integration/tests/335-multi-package-flags/files/new-template.cabal b/tests/integration/tests/335-multi-package-flags/files/new-template.cabal similarity index 100% rename from test/integration/tests/335-multi-package-flags/files/new-template.cabal rename to tests/integration/tests/335-multi-package-flags/files/new-template.cabal diff --git a/test/integration/tests/335-multi-package-flags/files/src/Lib.hs b/tests/integration/tests/335-multi-package-flags/files/src/Lib.hs similarity index 100% rename from test/integration/tests/335-multi-package-flags/files/src/Lib.hs rename to tests/integration/tests/335-multi-package-flags/files/src/Lib.hs diff --git a/test/integration/tests/335-multi-package-flags/files/stack.yaml b/tests/integration/tests/335-multi-package-flags/files/stack.yaml similarity index 100% rename from test/integration/tests/335-multi-package-flags/files/stack.yaml rename to tests/integration/tests/335-multi-package-flags/files/stack.yaml diff --git a/test/integration/tests/3390-unbuildable-test/Main.hs b/tests/integration/tests/3390-unbuildable-test/Main.hs similarity index 100% rename from test/integration/tests/3390-unbuildable-test/Main.hs rename to tests/integration/tests/3390-unbuildable-test/Main.hs diff --git a/test/integration/tests/3390-unbuildable-test/files/files.cabal b/tests/integration/tests/3390-unbuildable-test/files/files.cabal similarity index 100% rename from test/integration/tests/3390-unbuildable-test/files/files.cabal rename to tests/integration/tests/3390-unbuildable-test/files/files.cabal diff --git a/test/integration/tests/3390-unbuildable-test/files/src/Lib.hs b/tests/integration/tests/3390-unbuildable-test/files/src/Lib.hs similarity index 100% rename from test/integration/tests/3390-unbuildable-test/files/src/Lib.hs rename to tests/integration/tests/3390-unbuildable-test/files/src/Lib.hs diff --git a/test/integration/tests/3390-unbuildable-test/files/stack.yaml b/tests/integration/tests/3390-unbuildable-test/files/stack.yaml similarity index 100% rename from test/integration/tests/3390-unbuildable-test/files/stack.yaml rename to tests/integration/tests/3390-unbuildable-test/files/stack.yaml diff --git a/test/integration/tests/3390-unbuildable-test/files/test/Spec.hs b/tests/integration/tests/3390-unbuildable-test/files/test/Spec.hs similarity index 100% rename from test/integration/tests/3390-unbuildable-test/files/test/Spec.hs rename to tests/integration/tests/3390-unbuildable-test/files/test/Spec.hs diff --git a/test/integration/tests/3396-package-indices/Main.hs b/tests/integration/tests/3396-package-indices/Main.hs similarity index 100% rename from test/integration/tests/3396-package-indices/Main.hs rename to tests/integration/tests/3396-package-indices/Main.hs diff --git a/test/integration/tests/3396-package-indices/files/CustomIndex/01-index.tar b/tests/integration/tests/3396-package-indices/files/CustomIndex/01-index.tar similarity index 100% rename from test/integration/tests/3396-package-indices/files/CustomIndex/01-index.tar rename to tests/integration/tests/3396-package-indices/files/CustomIndex/01-index.tar diff --git a/test/integration/tests/3396-package-indices/files/files.cabal b/tests/integration/tests/3396-package-indices/files/files.cabal similarity index 100% rename from test/integration/tests/3396-package-indices/files/files.cabal rename to tests/integration/tests/3396-package-indices/files/files.cabal diff --git a/test/integration/tests/3396-package-indices/files/my-snapshot.yaml b/tests/integration/tests/3396-package-indices/files/my-snapshot.yaml similarity index 100% rename from test/integration/tests/3396-package-indices/files/my-snapshot.yaml rename to tests/integration/tests/3396-package-indices/files/my-snapshot.yaml diff --git a/test/integration/tests/3396-package-indices/files/src/Lib.hs b/tests/integration/tests/3396-package-indices/files/src/Lib.hs similarity index 100% rename from test/integration/tests/3396-package-indices/files/src/Lib.hs rename to tests/integration/tests/3396-package-indices/files/src/Lib.hs diff --git a/test/integration/tests/3396-package-indices/files/stack.yaml b/tests/integration/tests/3396-package-indices/files/stack.yaml similarity index 100% rename from test/integration/tests/3396-package-indices/files/stack.yaml rename to tests/integration/tests/3396-package-indices/files/stack.yaml diff --git a/test/integration/tests/3397-ghc-solver/Main.hs b/tests/integration/tests/3397-ghc-solver/Main.hs similarity index 100% rename from test/integration/tests/3397-ghc-solver/Main.hs rename to tests/integration/tests/3397-ghc-solver/Main.hs diff --git a/test/integration/tests/3397-ghc-solver/files/.gitignore b/tests/integration/tests/3397-ghc-solver/files/.gitignore similarity index 100% rename from test/integration/tests/3397-ghc-solver/files/.gitignore rename to tests/integration/tests/3397-ghc-solver/files/.gitignore diff --git a/test/integration/tests/3397-ghc-solver/files/package.yaml b/tests/integration/tests/3397-ghc-solver/files/package.yaml similarity index 100% rename from test/integration/tests/3397-ghc-solver/files/package.yaml rename to tests/integration/tests/3397-ghc-solver/files/package.yaml diff --git a/test/integration/tests/3397-ghc-solver/files/src/Lib.hs b/tests/integration/tests/3397-ghc-solver/files/src/Lib.hs similarity index 100% rename from test/integration/tests/3397-ghc-solver/files/src/Lib.hs rename to tests/integration/tests/3397-ghc-solver/files/src/Lib.hs diff --git a/test/integration/tests/3431-precompiled-works/Main.hs b/tests/integration/tests/3431-precompiled-works/Main.hs similarity index 100% rename from test/integration/tests/3431-precompiled-works/Main.hs rename to tests/integration/tests/3431-precompiled-works/Main.hs diff --git a/test/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml b/tests/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml similarity index 100% rename from test/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml rename to tests/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml diff --git a/test/integration/tests/3431-precompiled-works/files/custom1/stack.yaml b/tests/integration/tests/3431-precompiled-works/files/custom1/stack.yaml similarity index 100% rename from test/integration/tests/3431-precompiled-works/files/custom1/stack.yaml rename to tests/integration/tests/3431-precompiled-works/files/custom1/stack.yaml diff --git a/test/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml b/tests/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml similarity index 100% rename from test/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml rename to tests/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml diff --git a/test/integration/tests/3431-precompiled-works/files/custom2/stack.yaml b/tests/integration/tests/3431-precompiled-works/files/custom2/stack.yaml similarity index 100% rename from test/integration/tests/3431-precompiled-works/files/custom2/stack.yaml rename to tests/integration/tests/3431-precompiled-works/files/custom2/stack.yaml diff --git a/test/integration/tests/345-override-bytestring/Main.hs b/tests/integration/tests/345-override-bytestring/Main.hs similarity index 100% rename from test/integration/tests/345-override-bytestring/Main.hs rename to tests/integration/tests/345-override-bytestring/Main.hs diff --git a/test/integration/tests/345-override-bytestring/files/Foo.hs b/tests/integration/tests/345-override-bytestring/files/Foo.hs similarity index 100% rename from test/integration/tests/345-override-bytestring/files/Foo.hs rename to tests/integration/tests/345-override-bytestring/files/Foo.hs diff --git a/test/integration/tests/345-override-bytestring/files/foo.cabal b/tests/integration/tests/345-override-bytestring/files/foo.cabal similarity index 100% rename from test/integration/tests/345-override-bytestring/files/foo.cabal rename to tests/integration/tests/345-override-bytestring/files/foo.cabal diff --git a/test/integration/tests/345-override-bytestring/files/stack.yaml b/tests/integration/tests/345-override-bytestring/files/stack.yaml similarity index 100% rename from test/integration/tests/345-override-bytestring/files/stack.yaml rename to tests/integration/tests/345-override-bytestring/files/stack.yaml diff --git a/test/integration/tests/3520-revision-matching/Main.hs b/tests/integration/tests/3520-revision-matching/Main.hs similarity index 100% rename from test/integration/tests/3520-revision-matching/Main.hs rename to tests/integration/tests/3520-revision-matching/Main.hs diff --git a/test/integration/tests/3520-revision-matching/files/.gitignore b/tests/integration/tests/3520-revision-matching/files/.gitignore similarity index 100% rename from test/integration/tests/3520-revision-matching/files/.gitignore rename to tests/integration/tests/3520-revision-matching/files/.gitignore diff --git a/test/integration/tests/3520-revision-matching/files/bad-stack.yaml b/tests/integration/tests/3520-revision-matching/files/bad-stack.yaml similarity index 100% rename from test/integration/tests/3520-revision-matching/files/bad-stack.yaml rename to tests/integration/tests/3520-revision-matching/files/bad-stack.yaml diff --git a/test/integration/tests/3520-revision-matching/files/good-stack.yaml b/tests/integration/tests/3520-revision-matching/files/good-stack.yaml similarity index 100% rename from test/integration/tests/3520-revision-matching/files/good-stack.yaml rename to tests/integration/tests/3520-revision-matching/files/good-stack.yaml diff --git a/test/integration/tests/3520-revision-matching/files/package.yaml b/tests/integration/tests/3520-revision-matching/files/package.yaml similarity index 100% rename from test/integration/tests/3520-revision-matching/files/package.yaml rename to tests/integration/tests/3520-revision-matching/files/package.yaml diff --git a/test/integration/tests/3520-revision-matching/files/src/Foo.hs b/tests/integration/tests/3520-revision-matching/files/src/Foo.hs similarity index 100% rename from test/integration/tests/3520-revision-matching/files/src/Foo.hs rename to tests/integration/tests/3520-revision-matching/files/src/Foo.hs diff --git a/test/integration/tests/3533-extra-deps-solver/Main.hs b/tests/integration/tests/3533-extra-deps-solver/Main.hs similarity index 100% rename from test/integration/tests/3533-extra-deps-solver/Main.hs rename to tests/integration/tests/3533-extra-deps-solver/Main.hs diff --git a/test/integration/tests/3533-extra-deps-solver/files/.gitignore b/tests/integration/tests/3533-extra-deps-solver/files/.gitignore similarity index 100% rename from test/integration/tests/3533-extra-deps-solver/files/.gitignore rename to tests/integration/tests/3533-extra-deps-solver/files/.gitignore diff --git a/test/integration/tests/3533-extra-deps-solver/files/local-mmorph/package.yaml b/tests/integration/tests/3533-extra-deps-solver/files/local-mmorph/package.yaml similarity index 100% rename from test/integration/tests/3533-extra-deps-solver/files/local-mmorph/package.yaml rename to tests/integration/tests/3533-extra-deps-solver/files/local-mmorph/package.yaml diff --git a/test/integration/tests/3533-extra-deps-solver/files/local-mmorph/src/Lib.hs b/tests/integration/tests/3533-extra-deps-solver/files/local-mmorph/src/Lib.hs similarity index 100% rename from test/integration/tests/3533-extra-deps-solver/files/local-mmorph/src/Lib.hs rename to tests/integration/tests/3533-extra-deps-solver/files/local-mmorph/src/Lib.hs diff --git a/test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml b/tests/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml similarity index 100% rename from test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml rename to tests/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml diff --git a/test/integration/tests/3533-extra-deps-solver/files/uses-mmorph/package.yaml b/tests/integration/tests/3533-extra-deps-solver/files/uses-mmorph/package.yaml similarity index 100% rename from test/integration/tests/3533-extra-deps-solver/files/uses-mmorph/package.yaml rename to tests/integration/tests/3533-extra-deps-solver/files/uses-mmorph/package.yaml diff --git a/test/integration/tests/3533-extra-deps-solver/files/uses-mmorph/src/Lib.hs b/tests/integration/tests/3533-extra-deps-solver/files/uses-mmorph/src/Lib.hs similarity index 100% rename from test/integration/tests/3533-extra-deps-solver/files/uses-mmorph/src/Lib.hs rename to tests/integration/tests/3533-extra-deps-solver/files/uses-mmorph/src/Lib.hs diff --git a/test/integration/tests/3574-extra-dep-local/Main.hs b/tests/integration/tests/3574-extra-dep-local/Main.hs similarity index 100% rename from test/integration/tests/3574-extra-dep-local/Main.hs rename to tests/integration/tests/3574-extra-dep-local/Main.hs diff --git a/test/integration/tests/3574-extra-dep-local/files/foo/Foo.hs b/tests/integration/tests/3574-extra-dep-local/files/foo/Foo.hs similarity index 100% rename from test/integration/tests/3574-extra-dep-local/files/foo/Foo.hs rename to tests/integration/tests/3574-extra-dep-local/files/foo/Foo.hs diff --git a/test/integration/tests/3574-extra-dep-local/files/foo/foo.cabal b/tests/integration/tests/3574-extra-dep-local/files/foo/foo.cabal similarity index 100% rename from test/integration/tests/3574-extra-dep-local/files/foo/foo.cabal rename to tests/integration/tests/3574-extra-dep-local/files/foo/foo.cabal diff --git a/test/integration/tests/3574-extra-dep-local/files/stack.yaml b/tests/integration/tests/3574-extra-dep-local/files/stack.yaml similarity index 100% rename from test/integration/tests/3574-extra-dep-local/files/stack.yaml rename to tests/integration/tests/3574-extra-dep-local/files/stack.yaml diff --git a/test/integration/tests/3591-cabal-warnings-once/Main.hs b/tests/integration/tests/3591-cabal-warnings-once/Main.hs similarity index 100% rename from test/integration/tests/3591-cabal-warnings-once/Main.hs rename to tests/integration/tests/3591-cabal-warnings-once/Main.hs diff --git a/test/integration/tests/3591-cabal-warnings-once/files/foo.cabal b/tests/integration/tests/3591-cabal-warnings-once/files/foo.cabal similarity index 100% rename from test/integration/tests/3591-cabal-warnings-once/files/foo.cabal rename to tests/integration/tests/3591-cabal-warnings-once/files/foo.cabal diff --git a/test/integration/tests/3591-cabal-warnings-once/files/src/Lib.hs b/tests/integration/tests/3591-cabal-warnings-once/files/src/Lib.hs similarity index 100% rename from test/integration/tests/3591-cabal-warnings-once/files/src/Lib.hs rename to tests/integration/tests/3591-cabal-warnings-once/files/src/Lib.hs diff --git a/test/integration/tests/3591-cabal-warnings-once/files/stack.yaml b/tests/integration/tests/3591-cabal-warnings-once/files/stack.yaml similarity index 100% rename from test/integration/tests/3591-cabal-warnings-once/files/stack.yaml rename to tests/integration/tests/3591-cabal-warnings-once/files/stack.yaml diff --git a/test/integration/tests/3631-build-http2/Main.hs b/tests/integration/tests/3631-build-http2/Main.hs similarity index 100% rename from test/integration/tests/3631-build-http2/Main.hs rename to tests/integration/tests/3631-build-http2/Main.hs diff --git a/test/integration/tests/365-invalid-success/Main.hs b/tests/integration/tests/365-invalid-success/Main.hs similarity index 100% rename from test/integration/tests/365-invalid-success/Main.hs rename to tests/integration/tests/365-invalid-success/Main.hs diff --git a/test/integration/tests/365-invalid-success/files/.gitignore b/tests/integration/tests/365-invalid-success/files/.gitignore similarity index 100% rename from test/integration/tests/365-invalid-success/files/.gitignore rename to tests/integration/tests/365-invalid-success/files/.gitignore diff --git a/test/integration/tests/365-invalid-success/files/app/Main.hs b/tests/integration/tests/365-invalid-success/files/app/Main.hs similarity index 100% rename from test/integration/tests/365-invalid-success/files/app/Main.hs rename to tests/integration/tests/365-invalid-success/files/app/Main.hs diff --git a/test/integration/tests/365-invalid-success/files/new-template.cabal b/tests/integration/tests/365-invalid-success/files/new-template.cabal similarity index 100% rename from test/integration/tests/365-invalid-success/files/new-template.cabal rename to tests/integration/tests/365-invalid-success/files/new-template.cabal diff --git a/test/integration/tests/365-invalid-success/files/stack.yaml b/tests/integration/tests/365-invalid-success/files/stack.yaml similarity index 100% rename from test/integration/tests/365-invalid-success/files/stack.yaml rename to tests/integration/tests/365-invalid-success/files/stack.yaml diff --git a/test/integration/tests/366-non-root-dir/Main.hs b/tests/integration/tests/366-non-root-dir/Main.hs similarity index 100% rename from test/integration/tests/366-non-root-dir/Main.hs rename to tests/integration/tests/366-non-root-dir/Main.hs diff --git a/test/integration/tests/366-non-root-dir/files/app/Main.hs b/tests/integration/tests/366-non-root-dir/files/app/Main.hs similarity index 100% rename from test/integration/tests/366-non-root-dir/files/app/Main.hs rename to tests/integration/tests/366-non-root-dir/files/app/Main.hs diff --git a/test/integration/tests/366-non-root-dir/files/new-template.cabal b/tests/integration/tests/366-non-root-dir/files/new-template.cabal similarity index 100% rename from test/integration/tests/366-non-root-dir/files/new-template.cabal rename to tests/integration/tests/366-non-root-dir/files/new-template.cabal diff --git a/test/integration/tests/366-non-root-dir/files/stack.yaml b/tests/integration/tests/366-non-root-dir/files/stack.yaml similarity index 100% rename from test/integration/tests/366-non-root-dir/files/stack.yaml rename to tests/integration/tests/366-non-root-dir/files/stack.yaml diff --git a/test/integration/tests/3685-config-yaml-for-allow-newer/Main.hs b/tests/integration/tests/3685-config-yaml-for-allow-newer/Main.hs similarity index 100% rename from test/integration/tests/3685-config-yaml-for-allow-newer/Main.hs rename to tests/integration/tests/3685-config-yaml-for-allow-newer/Main.hs diff --git a/test/integration/tests/3685-config-yaml-for-allow-newer/files/.gitignore b/tests/integration/tests/3685-config-yaml-for-allow-newer/files/.gitignore similarity index 100% rename from test/integration/tests/3685-config-yaml-for-allow-newer/files/.gitignore rename to tests/integration/tests/3685-config-yaml-for-allow-newer/files/.gitignore diff --git a/test/integration/tests/3685-config-yaml-for-allow-newer/files/files.cabal b/tests/integration/tests/3685-config-yaml-for-allow-newer/files/files.cabal similarity index 100% rename from test/integration/tests/3685-config-yaml-for-allow-newer/files/files.cabal rename to tests/integration/tests/3685-config-yaml-for-allow-newer/files/files.cabal diff --git a/test/integration/tests/3685-config-yaml-for-allow-newer/files/src/Src.hs b/tests/integration/tests/3685-config-yaml-for-allow-newer/files/src/Src.hs similarity index 100% rename from test/integration/tests/3685-config-yaml-for-allow-newer/files/src/Src.hs rename to tests/integration/tests/3685-config-yaml-for-allow-newer/files/src/Src.hs diff --git a/test/integration/tests/370-invalid-setup-hs/Main.hs b/tests/integration/tests/370-invalid-setup-hs/Main.hs similarity index 100% rename from test/integration/tests/370-invalid-setup-hs/Main.hs rename to tests/integration/tests/370-invalid-setup-hs/Main.hs diff --git a/test/integration/tests/370-invalid-setup-hs/files/LICENSE b/tests/integration/tests/370-invalid-setup-hs/files/LICENSE similarity index 100% rename from test/integration/tests/370-invalid-setup-hs/files/LICENSE rename to tests/integration/tests/370-invalid-setup-hs/files/LICENSE diff --git a/test/integration/tests/370-invalid-setup-hs/files/Setup.hs b/tests/integration/tests/370-invalid-setup-hs/files/Setup.hs similarity index 100% rename from test/integration/tests/370-invalid-setup-hs/files/Setup.hs rename to tests/integration/tests/370-invalid-setup-hs/files/Setup.hs diff --git a/test/integration/tests/370-invalid-setup-hs/files/new-template.cabal b/tests/integration/tests/370-invalid-setup-hs/files/new-template.cabal similarity index 100% rename from test/integration/tests/370-invalid-setup-hs/files/new-template.cabal rename to tests/integration/tests/370-invalid-setup-hs/files/new-template.cabal diff --git a/test/integration/tests/370-invalid-setup-hs/files/src/Lib.hs b/tests/integration/tests/370-invalid-setup-hs/files/src/Lib.hs similarity index 100% rename from test/integration/tests/370-invalid-setup-hs/files/src/Lib.hs rename to tests/integration/tests/370-invalid-setup-hs/files/src/Lib.hs diff --git a/test/integration/tests/370-invalid-setup-hs/files/stack.yaml b/tests/integration/tests/370-invalid-setup-hs/files/stack.yaml similarity index 100% rename from test/integration/tests/370-invalid-setup-hs/files/stack.yaml rename to tests/integration/tests/370-invalid-setup-hs/files/stack.yaml diff --git a/test/integration/tests/3787-internal-libs-with-no-main-lib/Main.hs b/tests/integration/tests/3787-internal-libs-with-no-main-lib/Main.hs similarity index 100% rename from test/integration/tests/3787-internal-libs-with-no-main-lib/Main.hs rename to tests/integration/tests/3787-internal-libs-with-no-main-lib/Main.hs diff --git a/test/integration/tests/3787-internal-libs-with-no-main-lib/files/exe/Main.hs b/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/exe/Main.hs similarity index 100% rename from test/integration/tests/3787-internal-libs-with-no-main-lib/files/exe/Main.hs rename to tests/integration/tests/3787-internal-libs-with-no-main-lib/files/exe/Main.hs diff --git a/test/integration/tests/3787-internal-libs-with-no-main-lib/files/files.cabal b/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/files.cabal similarity index 100% rename from test/integration/tests/3787-internal-libs-with-no-main-lib/files/files.cabal rename to tests/integration/tests/3787-internal-libs-with-no-main-lib/files/files.cabal diff --git a/test/integration/tests/3787-internal-libs-with-no-main-lib/files/src-sublib/B.hs b/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/src-sublib/B.hs similarity index 100% rename from test/integration/tests/3787-internal-libs-with-no-main-lib/files/src-sublib/B.hs rename to tests/integration/tests/3787-internal-libs-with-no-main-lib/files/src-sublib/B.hs diff --git a/test/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml b/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml similarity index 100% rename from test/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml rename to tests/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml diff --git a/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml.lock b/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml.lock new file mode 100644 index 0000000000..e845f3fe93 --- /dev/null +++ b/tests/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml.lock @@ -0,0 +1,12 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: [] +snapshots: +- completed: + sha256: bfafe5735ccb74527d754b1f9999ded72d7c3a6c3a88529449661431ccfbd6cc + size: 649327 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/8.yaml + original: lts-20.8 diff --git a/test/integration/tests/384-local-deps/Main.hs b/tests/integration/tests/384-local-deps/Main.hs similarity index 100% rename from test/integration/tests/384-local-deps/Main.hs rename to tests/integration/tests/384-local-deps/Main.hs diff --git a/test/integration/tests/384-local-deps/files/.gitignore b/tests/integration/tests/384-local-deps/files/.gitignore similarity index 100% rename from test/integration/tests/384-local-deps/files/.gitignore rename to tests/integration/tests/384-local-deps/files/.gitignore diff --git a/test/integration/tests/384-local-deps/files/dir1/dir1.cabal b/tests/integration/tests/384-local-deps/files/dir1/dir1.cabal similarity index 100% rename from test/integration/tests/384-local-deps/files/dir1/dir1.cabal rename to tests/integration/tests/384-local-deps/files/dir1/dir1.cabal diff --git a/test/integration/tests/384-local-deps/files/dir1/src/Lib.hs b/tests/integration/tests/384-local-deps/files/dir1/src/Lib.hs similarity index 100% rename from test/integration/tests/384-local-deps/files/dir1/src/Lib.hs rename to tests/integration/tests/384-local-deps/files/dir1/src/Lib.hs diff --git a/test/integration/tests/384-local-deps/files/dir2/dir2.cabal b/tests/integration/tests/384-local-deps/files/dir2/dir2.cabal similarity index 100% rename from test/integration/tests/384-local-deps/files/dir2/dir2.cabal rename to tests/integration/tests/384-local-deps/files/dir2/dir2.cabal diff --git a/test/integration/tests/384-local-deps/files/dir2/src/Lib.hs b/tests/integration/tests/384-local-deps/files/dir2/src/Lib.hs similarity index 100% rename from test/integration/tests/384-local-deps/files/dir2/src/Lib.hs rename to tests/integration/tests/384-local-deps/files/dir2/src/Lib.hs diff --git a/test/integration/tests/3850-cached-templates-network-errors/Main.hs b/tests/integration/tests/3850-cached-templates-network-errors/Main.hs similarity index 100% rename from test/integration/tests/3850-cached-templates-network-errors/Main.hs rename to tests/integration/tests/3850-cached-templates-network-errors/Main.hs diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/Main.hs b/tests/integration/tests/3861-ignore-bounds-in-snapshots/Main.hs similarity index 100% rename from test/integration/tests/3861-ignore-bounds-in-snapshots/Main.hs rename to tests/integration/tests/3861-ignore-bounds-in-snapshots/Main.hs diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/.gitignore b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/.gitignore similarity index 100% rename from test/integration/tests/3861-ignore-bounds-in-snapshots/files/.gitignore rename to tests/integration/tests/3861-ignore-bounds-in-snapshots/files/.gitignore diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/bad-bounds.tar b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/bad-bounds.tar similarity index 100% rename from test/integration/tests/3861-ignore-bounds-in-snapshots/files/bad-bounds.tar rename to tests/integration/tests/3861-ignore-bounds-in-snapshots/files/bad-bounds.tar diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/package.yaml b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/package.yaml similarity index 100% rename from test/integration/tests/3861-ignore-bounds-in-snapshots/files/package.yaml rename to tests/integration/tests/3861-ignore-bounds-in-snapshots/files/package.yaml diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml similarity index 100% rename from test/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml rename to tests/integration/tests/3861-ignore-bounds-in-snapshots/files/snapshot.yaml diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml similarity index 100% rename from test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml rename to tests/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-bad.yaml diff --git a/test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-good.yaml b/tests/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-good.yaml similarity index 100% rename from test/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-good.yaml rename to tests/integration/tests/3861-ignore-bounds-in-snapshots/files/stack-good.yaml diff --git a/test/integration/tests/3863-purge-command/Main.hs b/tests/integration/tests/3863-purge-command/Main.hs similarity index 100% rename from test/integration/tests/3863-purge-command/Main.hs rename to tests/integration/tests/3863-purge-command/Main.hs diff --git a/test/integration/tests/3863-purge-command/files/new-template.cabal b/tests/integration/tests/3863-purge-command/files/new-template.cabal similarity index 100% rename from test/integration/tests/3863-purge-command/files/new-template.cabal rename to tests/integration/tests/3863-purge-command/files/new-template.cabal diff --git a/test/integration/tests/3863-purge-command/files/src/Lib.hs b/tests/integration/tests/3863-purge-command/files/src/Lib.hs similarity index 100% rename from test/integration/tests/3863-purge-command/files/src/Lib.hs rename to tests/integration/tests/3863-purge-command/files/src/Lib.hs diff --git a/test/integration/tests/3863-purge-command/files/stack.yaml b/tests/integration/tests/3863-purge-command/files/stack.yaml similarity index 100% rename from test/integration/tests/3863-purge-command/files/stack.yaml rename to tests/integration/tests/3863-purge-command/files/stack.yaml diff --git a/test/integration/tests/3899-dont-rebuild-sublibraries/Main.hs b/tests/integration/tests/3899-dont-rebuild-sublibraries/Main.hs similarity index 100% rename from test/integration/tests/3899-dont-rebuild-sublibraries/Main.hs rename to tests/integration/tests/3899-dont-rebuild-sublibraries/Main.hs diff --git a/test/integration/tests/3899-dont-rebuild-sublibraries/files/Setup.hs b/tests/integration/tests/3899-dont-rebuild-sublibraries/files/Setup.hs similarity index 100% rename from test/integration/tests/3899-dont-rebuild-sublibraries/files/Setup.hs rename to tests/integration/tests/3899-dont-rebuild-sublibraries/files/Setup.hs diff --git a/test/integration/tests/3899-dont-rebuild-sublibraries/files/files.cabal b/tests/integration/tests/3899-dont-rebuild-sublibraries/files/files.cabal similarity index 100% rename from test/integration/tests/3899-dont-rebuild-sublibraries/files/files.cabal rename to tests/integration/tests/3899-dont-rebuild-sublibraries/files/files.cabal diff --git a/test/integration/tests/3899-dont-rebuild-sublibraries/files/src-exe/Main.hs b/tests/integration/tests/3899-dont-rebuild-sublibraries/files/src-exe/Main.hs similarity index 100% rename from test/integration/tests/3899-dont-rebuild-sublibraries/files/src-exe/Main.hs rename to tests/integration/tests/3899-dont-rebuild-sublibraries/files/src-exe/Main.hs diff --git a/test/integration/tests/3899-dont-rebuild-sublibraries/files/src-internal/Internal.hs b/tests/integration/tests/3899-dont-rebuild-sublibraries/files/src-internal/Internal.hs similarity index 100% rename from test/integration/tests/3899-dont-rebuild-sublibraries/files/src-internal/Internal.hs rename to tests/integration/tests/3899-dont-rebuild-sublibraries/files/src-internal/Internal.hs diff --git a/test/integration/tests/3899-dont-rebuild-sublibraries/files/src/Lib.hs b/tests/integration/tests/3899-dont-rebuild-sublibraries/files/src/Lib.hs similarity index 100% rename from test/integration/tests/3899-dont-rebuild-sublibraries/files/src/Lib.hs rename to tests/integration/tests/3899-dont-rebuild-sublibraries/files/src/Lib.hs diff --git a/test/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml b/tests/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml similarity index 100% rename from test/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml rename to tests/integration/tests/3899-dont-rebuild-sublibraries/files/stack.yaml diff --git a/test/integration/tests/3926-ghci-with-sublibraries/Main.hs b/tests/integration/tests/3926-ghci-with-sublibraries/Main.hs similarity index 100% rename from test/integration/tests/3926-ghci-with-sublibraries/Main.hs rename to tests/integration/tests/3926-ghci-with-sublibraries/Main.hs diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/.gitignore b/tests/integration/tests/3926-ghci-with-sublibraries/files/.gitignore similarity index 100% rename from test/integration/tests/3926-ghci-with-sublibraries/files/.gitignore rename to tests/integration/tests/3926-ghci-with-sublibraries/files/.gitignore diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/Setup.hs b/tests/integration/tests/3926-ghci-with-sublibraries/files/Setup.hs similarity index 100% rename from test/integration/tests/3926-ghci-with-sublibraries/files/Setup.hs rename to tests/integration/tests/3926-ghci-with-sublibraries/files/Setup.hs diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/files.cabal b/tests/integration/tests/3926-ghci-with-sublibraries/files/files.cabal similarity index 100% rename from test/integration/tests/3926-ghci-with-sublibraries/files/files.cabal rename to tests/integration/tests/3926-ghci-with-sublibraries/files/files.cabal diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/src-exe/Main.hs b/tests/integration/tests/3926-ghci-with-sublibraries/files/src-exe/Main.hs similarity index 100% rename from test/integration/tests/3926-ghci-with-sublibraries/files/src-exe/Main.hs rename to tests/integration/tests/3926-ghci-with-sublibraries/files/src-exe/Main.hs diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/src-internal/Internal.v1 b/tests/integration/tests/3926-ghci-with-sublibraries/files/src-internal/Internal.v1 similarity index 100% rename from test/integration/tests/3926-ghci-with-sublibraries/files/src-internal/Internal.v1 rename to tests/integration/tests/3926-ghci-with-sublibraries/files/src-internal/Internal.v1 diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/src-internal/Internal.v2 b/tests/integration/tests/3926-ghci-with-sublibraries/files/src-internal/Internal.v2 similarity index 100% rename from test/integration/tests/3926-ghci-with-sublibraries/files/src-internal/Internal.v2 rename to tests/integration/tests/3926-ghci-with-sublibraries/files/src-internal/Internal.v2 diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/src/Lib.v1 b/tests/integration/tests/3926-ghci-with-sublibraries/files/src/Lib.v1 similarity index 100% rename from test/integration/tests/3926-ghci-with-sublibraries/files/src/Lib.v1 rename to tests/integration/tests/3926-ghci-with-sublibraries/files/src/Lib.v1 diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/src/Lib.v2 b/tests/integration/tests/3926-ghci-with-sublibraries/files/src/Lib.v2 similarity index 100% rename from test/integration/tests/3926-ghci-with-sublibraries/files/src/Lib.v2 rename to tests/integration/tests/3926-ghci-with-sublibraries/files/src/Lib.v2 diff --git a/test/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml b/tests/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml similarity index 100% rename from test/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml rename to tests/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml diff --git a/tests/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml.lock b/tests/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml.lock new file mode 100644 index 0000000000..b254191301 --- /dev/null +++ b/tests/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml.lock @@ -0,0 +1,21 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: +- completed: + hackage: stm-2.4.4.1@sha256:49cfd80cba95f84d42eda0045346c8a567df5ce434d4da3d26ac3e977826fc4f,1563 + pantry-tree: + sha256: 54c488c9302afdfdfd22c639764e057bbf38d44b5e2007e4809d54a56c15b653 + size: 898 + original: + hackage: stm-2.4.4.1 +- completed: + hackage: mtl-2.2.1@sha256:0f7c5e9e2bfa8c1102d38cd57b258b2cf519f3aae65451c8f3fccb472cb8e3c1,1801 + pantry-tree: + sha256: b780d0c8065f6f449cd5eca75e5faec1e3d5c28a6b8beb2f3e7ba57cceec43c4 + size: 1657 + original: + hackage: mtl-2.2.1 +snapshots: [] diff --git a/test/integration/tests/3940-base-upgrade-warning/Main.hs b/tests/integration/tests/3940-base-upgrade-warning/Main.hs similarity index 100% rename from test/integration/tests/3940-base-upgrade-warning/Main.hs rename to tests/integration/tests/3940-base-upgrade-warning/Main.hs diff --git a/test/integration/tests/3940-base-upgrade-warning/files/files.cabal b/tests/integration/tests/3940-base-upgrade-warning/files/files.cabal similarity index 100% rename from test/integration/tests/3940-base-upgrade-warning/files/files.cabal rename to tests/integration/tests/3940-base-upgrade-warning/files/files.cabal diff --git a/test/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml b/tests/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml similarity index 100% rename from test/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml rename to tests/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml diff --git a/test/integration/tests/3940-base-upgrade-warning/files/src/.gitkeep b/tests/integration/tests/3940-base-upgrade-warning/files/src/.gitkeep similarity index 100% rename from test/integration/tests/3940-base-upgrade-warning/files/src/.gitkeep rename to tests/integration/tests/3940-base-upgrade-warning/files/src/.gitkeep diff --git a/test/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml b/tests/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml similarity index 100% rename from test/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml rename to tests/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml diff --git a/test/integration/tests/3942-solver-error-output/Main.hs b/tests/integration/tests/3942-solver-error-output/Main.hs similarity index 100% rename from test/integration/tests/3942-solver-error-output/Main.hs rename to tests/integration/tests/3942-solver-error-output/Main.hs diff --git a/test/integration/tests/3942-solver-error-output/files/.gitignore b/tests/integration/tests/3942-solver-error-output/files/.gitignore similarity index 100% rename from test/integration/tests/3942-solver-error-output/files/.gitignore rename to tests/integration/tests/3942-solver-error-output/files/.gitignore diff --git a/test/integration/tests/3942-solver-error-output/files/no-deps/package.yaml b/tests/integration/tests/3942-solver-error-output/files/no-deps/package.yaml similarity index 100% rename from test/integration/tests/3942-solver-error-output/files/no-deps/package.yaml rename to tests/integration/tests/3942-solver-error-output/files/no-deps/package.yaml diff --git a/test/integration/tests/3942-solver-error-output/files/one-deps/package.yaml b/tests/integration/tests/3942-solver-error-output/files/one-deps/package.yaml similarity index 100% rename from test/integration/tests/3942-solver-error-output/files/one-deps/package.yaml rename to tests/integration/tests/3942-solver-error-output/files/one-deps/package.yaml diff --git a/test/integration/tests/3942-solver-error-output/files/script.hs b/tests/integration/tests/3942-solver-error-output/files/script.hs old mode 100755 new mode 100644 similarity index 100% rename from test/integration/tests/3942-solver-error-output/files/script.hs rename to tests/integration/tests/3942-solver-error-output/files/script.hs diff --git a/test/integration/tests/3942-solver-error-output/files/test-stack.yml b/tests/integration/tests/3942-solver-error-output/files/test-stack.yml similarity index 100% rename from test/integration/tests/3942-solver-error-output/files/test-stack.yml rename to tests/integration/tests/3942-solver-error-output/files/test-stack.yml diff --git a/test/integration/tests/3959-order-of-flags/Main.hs b/tests/integration/tests/3959-order-of-flags/Main.hs similarity index 100% rename from test/integration/tests/3959-order-of-flags/Main.hs rename to tests/integration/tests/3959-order-of-flags/Main.hs diff --git a/test/integration/tests/3959-order-of-flags/files/.gitignore b/tests/integration/tests/3959-order-of-flags/files/.gitignore similarity index 100% rename from test/integration/tests/3959-order-of-flags/files/.gitignore rename to tests/integration/tests/3959-order-of-flags/files/.gitignore diff --git a/test/integration/tests/3959-order-of-flags/files/package.yaml b/tests/integration/tests/3959-order-of-flags/files/package.yaml similarity index 100% rename from test/integration/tests/3959-order-of-flags/files/package.yaml rename to tests/integration/tests/3959-order-of-flags/files/package.yaml diff --git a/test/integration/tests/3959-order-of-flags/files/stack.yaml b/tests/integration/tests/3959-order-of-flags/files/stack.yaml similarity index 100% rename from test/integration/tests/3959-order-of-flags/files/stack.yaml rename to tests/integration/tests/3959-order-of-flags/files/stack.yaml diff --git a/test/integration/tests/3959-order-of-flags/files/test/Spec.hs b/tests/integration/tests/3959-order-of-flags/files/test/Spec.hs similarity index 100% rename from test/integration/tests/3959-order-of-flags/files/test/Spec.hs rename to tests/integration/tests/3959-order-of-flags/files/test/Spec.hs diff --git a/test/integration/tests/397-case-insensitive-flags/Main.hs b/tests/integration/tests/397-case-insensitive-flags/Main.hs similarity index 100% rename from test/integration/tests/397-case-insensitive-flags/Main.hs rename to tests/integration/tests/397-case-insensitive-flags/Main.hs diff --git a/test/integration/tests/397-case-insensitive-flags/files/new-template.cabal b/tests/integration/tests/397-case-insensitive-flags/files/new-template.cabal similarity index 100% rename from test/integration/tests/397-case-insensitive-flags/files/new-template.cabal rename to tests/integration/tests/397-case-insensitive-flags/files/new-template.cabal diff --git a/test/integration/tests/397-case-insensitive-flags/files/src/Lib.hs b/tests/integration/tests/397-case-insensitive-flags/files/src/Lib.hs similarity index 100% rename from test/integration/tests/397-case-insensitive-flags/files/src/Lib.hs rename to tests/integration/tests/397-case-insensitive-flags/files/src/Lib.hs diff --git a/test/integration/tests/397-case-insensitive-flags/files/stack.yaml b/tests/integration/tests/397-case-insensitive-flags/files/stack.yaml similarity index 100% rename from test/integration/tests/397-case-insensitive-flags/files/stack.yaml rename to tests/integration/tests/397-case-insensitive-flags/files/stack.yaml diff --git a/test/integration/tests/3996-sublib-not-depended-upon/Main.hs b/tests/integration/tests/3996-sublib-not-depended-upon/Main.hs similarity index 100% rename from test/integration/tests/3996-sublib-not-depended-upon/Main.hs rename to tests/integration/tests/3996-sublib-not-depended-upon/Main.hs diff --git a/test/integration/tests/3996-sublib-not-depended-upon/files/Setup.hs b/tests/integration/tests/3996-sublib-not-depended-upon/files/Setup.hs similarity index 100% rename from test/integration/tests/3996-sublib-not-depended-upon/files/Setup.hs rename to tests/integration/tests/3996-sublib-not-depended-upon/files/Setup.hs diff --git a/test/integration/tests/3996-sublib-not-depended-upon/files/files.cabal b/tests/integration/tests/3996-sublib-not-depended-upon/files/files.cabal similarity index 100% rename from test/integration/tests/3996-sublib-not-depended-upon/files/files.cabal rename to tests/integration/tests/3996-sublib-not-depended-upon/files/files.cabal diff --git a/test/integration/tests/3996-sublib-not-depended-upon/files/src-internal/Internal.hs b/tests/integration/tests/3996-sublib-not-depended-upon/files/src-internal/Internal.hs similarity index 100% rename from test/integration/tests/3996-sublib-not-depended-upon/files/src-internal/Internal.hs rename to tests/integration/tests/3996-sublib-not-depended-upon/files/src-internal/Internal.hs diff --git a/test/integration/tests/3996-sublib-not-depended-upon/files/src/Lib.hs b/tests/integration/tests/3996-sublib-not-depended-upon/files/src/Lib.hs similarity index 100% rename from test/integration/tests/3996-sublib-not-depended-upon/files/src/Lib.hs rename to tests/integration/tests/3996-sublib-not-depended-upon/files/src/Lib.hs diff --git a/test/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml b/tests/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml similarity index 100% rename from test/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml rename to tests/integration/tests/3996-sublib-not-depended-upon/files/stack.yaml diff --git a/test/integration/tests/3997-coverage-with-cabal-3/Main.hs b/tests/integration/tests/3997-coverage-with-cabal-3/Main.hs similarity index 100% rename from test/integration/tests/3997-coverage-with-cabal-3/Main.hs rename to tests/integration/tests/3997-coverage-with-cabal-3/Main.hs diff --git a/test/integration/tests/3997-coverage-with-cabal-3/files/package.yaml b/tests/integration/tests/3997-coverage-with-cabal-3/files/package.yaml similarity index 100% rename from test/integration/tests/3997-coverage-with-cabal-3/files/package.yaml rename to tests/integration/tests/3997-coverage-with-cabal-3/files/package.yaml diff --git a/test/integration/tests/3997-coverage-with-cabal-3/files/src/Lib.hs b/tests/integration/tests/3997-coverage-with-cabal-3/files/src/Lib.hs similarity index 100% rename from test/integration/tests/3997-coverage-with-cabal-3/files/src/Lib.hs rename to tests/integration/tests/3997-coverage-with-cabal-3/files/src/Lib.hs diff --git a/test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml b/tests/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml similarity index 100% rename from test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml rename to tests/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml diff --git a/test/integration/tests/3997-coverage-with-cabal-3/files/test/Main.hs b/tests/integration/tests/3997-coverage-with-cabal-3/files/test/Main.hs similarity index 100% rename from test/integration/tests/3997-coverage-with-cabal-3/files/test/Main.hs rename to tests/integration/tests/3997-coverage-with-cabal-3/files/test/Main.hs diff --git a/test/integration/tests/4001-excess-recompilation/Main.hs b/tests/integration/tests/4001-excess-recompilation/Main.hs similarity index 100% rename from test/integration/tests/4001-excess-recompilation/Main.hs rename to tests/integration/tests/4001-excess-recompilation/Main.hs diff --git a/test/integration/tests/4001-excess-recompilation/files/Setup.hs b/tests/integration/tests/4001-excess-recompilation/files/Setup.hs similarity index 100% rename from test/integration/tests/4001-excess-recompilation/files/Setup.hs rename to tests/integration/tests/4001-excess-recompilation/files/Setup.hs diff --git a/test/integration/tests/4001-excess-recompilation/files/bench/Main1.hs b/tests/integration/tests/4001-excess-recompilation/files/bench/Main1.hs similarity index 100% rename from test/integration/tests/4001-excess-recompilation/files/bench/Main1.hs rename to tests/integration/tests/4001-excess-recompilation/files/bench/Main1.hs diff --git a/test/integration/tests/4001-excess-recompilation/files/bench/Main2.hs b/tests/integration/tests/4001-excess-recompilation/files/bench/Main2.hs similarity index 100% rename from test/integration/tests/4001-excess-recompilation/files/bench/Main2.hs rename to tests/integration/tests/4001-excess-recompilation/files/bench/Main2.hs diff --git a/test/integration/tests/4001-excess-recompilation/files/files.cabal b/tests/integration/tests/4001-excess-recompilation/files/files.cabal similarity index 100% rename from test/integration/tests/4001-excess-recompilation/files/files.cabal rename to tests/integration/tests/4001-excess-recompilation/files/files.cabal diff --git a/test/integration/tests/4001-excess-recompilation/files/src/Lib.hs b/tests/integration/tests/4001-excess-recompilation/files/src/Lib.hs similarity index 100% rename from test/integration/tests/4001-excess-recompilation/files/src/Lib.hs rename to tests/integration/tests/4001-excess-recompilation/files/src/Lib.hs diff --git a/test/integration/tests/4001-excess-recompilation/files/stack.yaml b/tests/integration/tests/4001-excess-recompilation/files/stack.yaml similarity index 100% rename from test/integration/tests/4001-excess-recompilation/files/stack.yaml rename to tests/integration/tests/4001-excess-recompilation/files/stack.yaml diff --git a/test/integration/tests/4001-excess-recompilation/files/test/Main1.hs b/tests/integration/tests/4001-excess-recompilation/files/test/Main1.hs similarity index 100% rename from test/integration/tests/4001-excess-recompilation/files/test/Main1.hs rename to tests/integration/tests/4001-excess-recompilation/files/test/Main1.hs diff --git a/test/integration/tests/4001-excess-recompilation/files/test/Main2.hs b/tests/integration/tests/4001-excess-recompilation/files/test/Main2.hs similarity index 100% rename from test/integration/tests/4001-excess-recompilation/files/test/Main2.hs rename to tests/integration/tests/4001-excess-recompilation/files/test/Main2.hs diff --git a/test/integration/tests/4044-no-run-tests-config/Main.hs b/tests/integration/tests/4044-no-run-tests-config/Main.hs similarity index 100% rename from test/integration/tests/4044-no-run-tests-config/Main.hs rename to tests/integration/tests/4044-no-run-tests-config/Main.hs diff --git a/test/integration/tests/4044-no-run-tests-config/files/.gitignore b/tests/integration/tests/4044-no-run-tests-config/files/.gitignore similarity index 100% rename from test/integration/tests/4044-no-run-tests-config/files/.gitignore rename to tests/integration/tests/4044-no-run-tests-config/files/.gitignore diff --git a/test/integration/tests/4044-no-run-tests-config/files/Test.hs b/tests/integration/tests/4044-no-run-tests-config/files/Test.hs similarity index 100% rename from test/integration/tests/4044-no-run-tests-config/files/Test.hs rename to tests/integration/tests/4044-no-run-tests-config/files/Test.hs diff --git a/test/integration/tests/4044-no-run-tests-config/files/package.yaml b/tests/integration/tests/4044-no-run-tests-config/files/package.yaml similarity index 100% rename from test/integration/tests/4044-no-run-tests-config/files/package.yaml rename to tests/integration/tests/4044-no-run-tests-config/files/package.yaml diff --git a/test/integration/tests/4044-no-run-tests-config/files/stack.yaml b/tests/integration/tests/4044-no-run-tests-config/files/stack.yaml similarity index 100% rename from test/integration/tests/4044-no-run-tests-config/files/stack.yaml rename to tests/integration/tests/4044-no-run-tests-config/files/stack.yaml diff --git a/test/integration/tests/4085-insufficient-error-message/Dockerfile b/tests/integration/tests/4085-insufficient-error-message/Dockerfile similarity index 100% rename from test/integration/tests/4085-insufficient-error-message/Dockerfile rename to tests/integration/tests/4085-insufficient-error-message/Dockerfile diff --git a/test/integration/tests/4085-insufficient-error-message/Main.hs b/tests/integration/tests/4085-insufficient-error-message/Main.hs similarity index 100% rename from test/integration/tests/4085-insufficient-error-message/Main.hs rename to tests/integration/tests/4085-insufficient-error-message/Main.hs diff --git a/test/integration/tests/4095-utf8-pure-nix/Main.hs b/tests/integration/tests/4095-utf8-pure-nix/Main.hs similarity index 100% rename from test/integration/tests/4095-utf8-pure-nix/Main.hs rename to tests/integration/tests/4095-utf8-pure-nix/Main.hs diff --git a/test/integration/tests/4095-utf8-pure-nix/files/.gitignore b/tests/integration/tests/4095-utf8-pure-nix/files/.gitignore similarity index 100% rename from test/integration/tests/4095-utf8-pure-nix/files/.gitignore rename to tests/integration/tests/4095-utf8-pure-nix/files/.gitignore diff --git a/test/integration/tests/4095-utf8-pure-nix/files/ShowUnicode.hs b/tests/integration/tests/4095-utf8-pure-nix/files/ShowUnicode.hs similarity index 100% rename from test/integration/tests/4095-utf8-pure-nix/files/ShowUnicode.hs rename to tests/integration/tests/4095-utf8-pure-nix/files/ShowUnicode.hs diff --git a/test/integration/tests/4095-utf8-pure-nix/files/package.yaml b/tests/integration/tests/4095-utf8-pure-nix/files/package.yaml similarity index 100% rename from test/integration/tests/4095-utf8-pure-nix/files/package.yaml rename to tests/integration/tests/4095-utf8-pure-nix/files/package.yaml diff --git a/test/integration/tests/4095-utf8-pure-nix/files/stack.yaml b/tests/integration/tests/4095-utf8-pure-nix/files/stack.yaml similarity index 100% rename from test/integration/tests/4095-utf8-pure-nix/files/stack.yaml rename to tests/integration/tests/4095-utf8-pure-nix/files/stack.yaml diff --git a/test/integration/tests/4101-dependency-tree/Main.hs b/tests/integration/tests/4101-dependency-tree/Main.hs similarity index 100% rename from test/integration/tests/4101-dependency-tree/Main.hs rename to tests/integration/tests/4101-dependency-tree/Main.hs diff --git a/test/integration/tests/4101-dependency-tree/files/files.cabal b/tests/integration/tests/4101-dependency-tree/files/files.cabal similarity index 100% rename from test/integration/tests/4101-dependency-tree/files/files.cabal rename to tests/integration/tests/4101-dependency-tree/files/files.cabal diff --git a/test/integration/tests/4101-dependency-tree/files/src/Main.hs b/tests/integration/tests/4101-dependency-tree/files/src/Main.hs similarity index 100% rename from test/integration/tests/4101-dependency-tree/files/src/Main.hs rename to tests/integration/tests/4101-dependency-tree/files/src/Main.hs diff --git a/test/integration/tests/4101-dependency-tree/files/stack.yaml b/tests/integration/tests/4101-dependency-tree/files/stack.yaml similarity index 100% rename from test/integration/tests/4101-dependency-tree/files/stack.yaml rename to tests/integration/tests/4101-dependency-tree/files/stack.yaml diff --git a/test/integration/tests/4101-dependency-tree/files/subproject/src/Main.hs b/tests/integration/tests/4101-dependency-tree/files/subproject/src/Main.hs similarity index 100% rename from test/integration/tests/4101-dependency-tree/files/subproject/src/Main.hs rename to tests/integration/tests/4101-dependency-tree/files/subproject/src/Main.hs diff --git a/test/integration/tests/4101-dependency-tree/files/subproject/subproject.cabal b/tests/integration/tests/4101-dependency-tree/files/subproject/subproject.cabal similarity index 100% rename from test/integration/tests/4101-dependency-tree/files/subproject/subproject.cabal rename to tests/integration/tests/4101-dependency-tree/files/subproject/subproject.cabal diff --git a/test/integration/tests/4105-test-coverage-of-internal-lib/Main.hs b/tests/integration/tests/4105-test-coverage-of-internal-lib/Main.hs similarity index 100% rename from test/integration/tests/4105-test-coverage-of-internal-lib/Main.hs rename to tests/integration/tests/4105-test-coverage-of-internal-lib/Main.hs diff --git a/test/integration/tests/4105-test-coverage-of-internal-lib/files/files.cabal b/tests/integration/tests/4105-test-coverage-of-internal-lib/files/files.cabal similarity index 100% rename from test/integration/tests/4105-test-coverage-of-internal-lib/files/files.cabal rename to tests/integration/tests/4105-test-coverage-of-internal-lib/files/files.cabal diff --git a/test/integration/tests/4105-test-coverage-of-internal-lib/files/src-sublib/B.hs b/tests/integration/tests/4105-test-coverage-of-internal-lib/files/src-sublib/B.hs similarity index 100% rename from test/integration/tests/4105-test-coverage-of-internal-lib/files/src-sublib/B.hs rename to tests/integration/tests/4105-test-coverage-of-internal-lib/files/src-sublib/B.hs diff --git a/test/integration/tests/4105-test-coverage-of-internal-lib/files/src/Src.hs b/tests/integration/tests/4105-test-coverage-of-internal-lib/files/src/Src.hs similarity index 100% rename from test/integration/tests/4105-test-coverage-of-internal-lib/files/src/Src.hs rename to tests/integration/tests/4105-test-coverage-of-internal-lib/files/src/Src.hs diff --git a/test/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml b/tests/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml similarity index 100% rename from test/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml rename to tests/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml diff --git a/test/integration/tests/4105-test-coverage-of-internal-lib/files/test/Main.hs b/tests/integration/tests/4105-test-coverage-of-internal-lib/files/test/Main.hs similarity index 100% rename from test/integration/tests/4105-test-coverage-of-internal-lib/files/test/Main.hs rename to tests/integration/tests/4105-test-coverage-of-internal-lib/files/test/Main.hs diff --git a/test/integration/tests/4181-clean-wo-dl-ghc/Main.hs b/tests/integration/tests/4181-clean-wo-dl-ghc/Main.hs similarity index 100% rename from test/integration/tests/4181-clean-wo-dl-ghc/Main.hs rename to tests/integration/tests/4181-clean-wo-dl-ghc/Main.hs diff --git a/test/integration/tests/4181-clean-wo-dl-ghc/files/foo.cabal b/tests/integration/tests/4181-clean-wo-dl-ghc/files/foo.cabal similarity index 100% rename from test/integration/tests/4181-clean-wo-dl-ghc/files/foo.cabal rename to tests/integration/tests/4181-clean-wo-dl-ghc/files/foo.cabal diff --git a/test/integration/tests/4181-clean-wo-dl-ghc/files/stack.yaml b/tests/integration/tests/4181-clean-wo-dl-ghc/files/stack.yaml similarity index 100% rename from test/integration/tests/4181-clean-wo-dl-ghc/files/stack.yaml rename to tests/integration/tests/4181-clean-wo-dl-ghc/files/stack.yaml diff --git a/test/integration/tests/4215-missing-unregister/Main.hs b/tests/integration/tests/4215-missing-unregister/Main.hs similarity index 100% rename from test/integration/tests/4215-missing-unregister/Main.hs rename to tests/integration/tests/4215-missing-unregister/Main.hs diff --git a/test/integration/tests/4215-missing-unregister/files/.gitignore b/tests/integration/tests/4215-missing-unregister/files/.gitignore similarity index 100% rename from test/integration/tests/4215-missing-unregister/files/.gitignore rename to tests/integration/tests/4215-missing-unregister/files/.gitignore diff --git a/test/integration/tests/4215-missing-unregister/files/stack1.yaml b/tests/integration/tests/4215-missing-unregister/files/stack1.yaml similarity index 100% rename from test/integration/tests/4215-missing-unregister/files/stack1.yaml rename to tests/integration/tests/4215-missing-unregister/files/stack1.yaml diff --git a/test/integration/tests/4215-missing-unregister/files/stack2.yaml b/tests/integration/tests/4215-missing-unregister/files/stack2.yaml similarity index 100% rename from test/integration/tests/4215-missing-unregister/files/stack2.yaml rename to tests/integration/tests/4215-missing-unregister/files/stack2.yaml diff --git a/test/integration/tests/4215-missing-unregister/files/v1/package.yaml b/tests/integration/tests/4215-missing-unregister/files/v1/package.yaml similarity index 100% rename from test/integration/tests/4215-missing-unregister/files/v1/package.yaml rename to tests/integration/tests/4215-missing-unregister/files/v1/package.yaml diff --git a/test/integration/tests/4215-missing-unregister/files/v2/package.yaml b/tests/integration/tests/4215-missing-unregister/files/v2/package.yaml similarity index 100% rename from test/integration/tests/4215-missing-unregister/files/v2/package.yaml rename to tests/integration/tests/4215-missing-unregister/files/v2/package.yaml diff --git a/test/integration/tests/4270-files-order/Main.hs b/tests/integration/tests/4270-files-order/Main.hs similarity index 100% rename from test/integration/tests/4270-files-order/Main.hs rename to tests/integration/tests/4270-files-order/Main.hs diff --git a/test/integration/tests/4270-files-order/files/cbits-ordering.cabal b/tests/integration/tests/4270-files-order/files/cbits-ordering.cabal similarity index 100% rename from test/integration/tests/4270-files-order/files/cbits-ordering.cabal rename to tests/integration/tests/4270-files-order/files/cbits-ordering.cabal diff --git a/test/integration/tests/4270-files-order/files/cbits/a_dependent.c b/tests/integration/tests/4270-files-order/files/cbits/a_dependent.c similarity index 100% rename from test/integration/tests/4270-files-order/files/cbits/a_dependent.c rename to tests/integration/tests/4270-files-order/files/cbits/a_dependent.c diff --git a/test/integration/tests/4270-files-order/files/cbits/a_dependent.h b/tests/integration/tests/4270-files-order/files/cbits/a_dependent.h similarity index 100% rename from test/integration/tests/4270-files-order/files/cbits/a_dependent.h rename to tests/integration/tests/4270-files-order/files/cbits/a_dependent.h diff --git a/test/integration/tests/4270-files-order/files/cbits/the_dependency.c b/tests/integration/tests/4270-files-order/files/cbits/the_dependency.c similarity index 100% rename from test/integration/tests/4270-files-order/files/cbits/the_dependency.c rename to tests/integration/tests/4270-files-order/files/cbits/the_dependency.c diff --git a/test/integration/tests/4270-files-order/files/src/Lib.hs b/tests/integration/tests/4270-files-order/files/src/Lib.hs similarity index 100% rename from test/integration/tests/4270-files-order/files/src/Lib.hs rename to tests/integration/tests/4270-files-order/files/src/Lib.hs diff --git a/test/integration/tests/4270-files-order/files/stack.yaml b/tests/integration/tests/4270-files-order/files/stack.yaml similarity index 100% rename from test/integration/tests/4270-files-order/files/stack.yaml rename to tests/integration/tests/4270-files-order/files/stack.yaml diff --git a/tests/integration/tests/4270-files-order/files/stack.yaml.lock b/tests/integration/tests/4270-files-order/files/stack.yaml.lock new file mode 100644 index 0000000000..a4a15c4c15 --- /dev/null +++ b/tests/integration/tests/4270-files-order/files/stack.yaml.lock @@ -0,0 +1,12 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: [] +snapshots: +- completed: + sha256: 4c972e067bae16b95961dbfdd12e07f1ee6c8fffabbfa05c3d65100b03f548b7 + size: 650253 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/23.yaml + original: lts-20.23 diff --git a/test/integration/tests/4324-dot-includes-boot-packages/Main.hs b/tests/integration/tests/4324-dot-includes-boot-packages/Main.hs similarity index 100% rename from test/integration/tests/4324-dot-includes-boot-packages/Main.hs rename to tests/integration/tests/4324-dot-includes-boot-packages/Main.hs diff --git a/test/integration/tests/4324-dot-includes-boot-packages/files/.gitignore b/tests/integration/tests/4324-dot-includes-boot-packages/files/.gitignore similarity index 100% rename from test/integration/tests/4324-dot-includes-boot-packages/files/.gitignore rename to tests/integration/tests/4324-dot-includes-boot-packages/files/.gitignore diff --git a/test/integration/tests/4324-dot-includes-boot-packages/files/package.yaml b/tests/integration/tests/4324-dot-includes-boot-packages/files/package.yaml similarity index 100% rename from test/integration/tests/4324-dot-includes-boot-packages/files/package.yaml rename to tests/integration/tests/4324-dot-includes-boot-packages/files/package.yaml diff --git a/test/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml b/tests/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml similarity index 100% rename from test/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml rename to tests/integration/tests/4324-dot-includes-boot-packages/files/stack.yaml diff --git a/test/integration/tests/4390-dot-no-ghc/Main.hs b/tests/integration/tests/4390-dot-no-ghc/Main.hs similarity index 100% rename from test/integration/tests/4390-dot-no-ghc/Main.hs rename to tests/integration/tests/4390-dot-no-ghc/Main.hs diff --git a/test/integration/tests/4390-dot-no-ghc/files/.gitignore b/tests/integration/tests/4390-dot-no-ghc/files/.gitignore similarity index 100% rename from test/integration/tests/4390-dot-no-ghc/files/.gitignore rename to tests/integration/tests/4390-dot-no-ghc/files/.gitignore diff --git a/test/integration/tests/4390-dot-no-ghc/files/package.yaml b/tests/integration/tests/4390-dot-no-ghc/files/package.yaml similarity index 100% rename from test/integration/tests/4390-dot-no-ghc/files/package.yaml rename to tests/integration/tests/4390-dot-no-ghc/files/package.yaml diff --git a/test/integration/tests/4390-dot-no-ghc/files/stack.yaml b/tests/integration/tests/4390-dot-no-ghc/files/stack.yaml similarity index 100% rename from test/integration/tests/4390-dot-no-ghc/files/stack.yaml rename to tests/integration/tests/4390-dot-no-ghc/files/stack.yaml diff --git a/test/integration/tests/4408-init-internal-libs/Main.hs b/tests/integration/tests/4408-init-internal-libs/Main.hs similarity index 100% rename from test/integration/tests/4408-init-internal-libs/Main.hs rename to tests/integration/tests/4408-init-internal-libs/Main.hs diff --git a/test/integration/tests/4408-init-internal-libs/files/.gitignore b/tests/integration/tests/4408-init-internal-libs/files/.gitignore similarity index 100% rename from test/integration/tests/4408-init-internal-libs/files/.gitignore rename to tests/integration/tests/4408-init-internal-libs/files/.gitignore diff --git a/test/integration/tests/4408-init-internal-libs/files/foo.cabal b/tests/integration/tests/4408-init-internal-libs/files/foo.cabal similarity index 100% rename from test/integration/tests/4408-init-internal-libs/files/foo.cabal rename to tests/integration/tests/4408-init-internal-libs/files/foo.cabal diff --git a/test/integration/tests/443-specify-path/.gitignore b/tests/integration/tests/443-specify-path/.gitignore similarity index 100% rename from test/integration/tests/443-specify-path/.gitignore rename to tests/integration/tests/443-specify-path/.gitignore diff --git a/test/integration/tests/443-specify-path/Main.hs b/tests/integration/tests/443-specify-path/Main.hs similarity index 100% rename from test/integration/tests/443-specify-path/Main.hs rename to tests/integration/tests/443-specify-path/Main.hs diff --git a/test/integration/tests/444-package-option/Main.hs b/tests/integration/tests/444-package-option/Main.hs similarity index 100% rename from test/integration/tests/444-package-option/Main.hs rename to tests/integration/tests/444-package-option/Main.hs diff --git a/test/integration/tests/444-package-option/files/Test.hs b/tests/integration/tests/444-package-option/files/Test.hs similarity index 100% rename from test/integration/tests/444-package-option/files/Test.hs rename to tests/integration/tests/444-package-option/files/Test.hs diff --git a/test/integration/tests/4453-detailed/Main.hs b/tests/integration/tests/4453-detailed/Main.hs similarity index 100% rename from test/integration/tests/4453-detailed/Main.hs rename to tests/integration/tests/4453-detailed/Main.hs diff --git a/test/integration/tests/4453-detailed/files/src/Lib.hs b/tests/integration/tests/4453-detailed/files/src/Lib.hs similarity index 100% rename from test/integration/tests/4453-detailed/files/src/Lib.hs rename to tests/integration/tests/4453-detailed/files/src/Lib.hs diff --git a/test/integration/tests/4453-detailed/files/stack.yaml b/tests/integration/tests/4453-detailed/files/stack.yaml similarity index 100% rename from test/integration/tests/4453-detailed/files/stack.yaml rename to tests/integration/tests/4453-detailed/files/stack.yaml diff --git a/test/integration/tests/4453-detailed/files/test-detailed-example.cabal b/tests/integration/tests/4453-detailed/files/test-detailed-example.cabal similarity index 100% rename from test/integration/tests/4453-detailed/files/test-detailed-example.cabal rename to tests/integration/tests/4453-detailed/files/test-detailed-example.cabal diff --git a/test/integration/tests/4453-detailed/files/test/Spec.hs b/tests/integration/tests/4453-detailed/files/test/Spec.hs similarity index 100% rename from test/integration/tests/4453-detailed/files/test/Spec.hs rename to tests/integration/tests/4453-detailed/files/test/Spec.hs diff --git a/test/integration/tests/4488-newer-cabal-version/Main.hs b/tests/integration/tests/4488-newer-cabal-version/Main.hs similarity index 100% rename from test/integration/tests/4488-newer-cabal-version/Main.hs rename to tests/integration/tests/4488-newer-cabal-version/Main.hs diff --git a/test/integration/tests/4488-newer-cabal-version/files/Setup.hs b/tests/integration/tests/4488-newer-cabal-version/files/Setup.hs similarity index 100% rename from test/integration/tests/4488-newer-cabal-version/files/Setup.hs rename to tests/integration/tests/4488-newer-cabal-version/files/Setup.hs diff --git a/test/integration/tests/4488-newer-cabal-version/files/foo.cabal b/tests/integration/tests/4488-newer-cabal-version/files/foo.cabal similarity index 100% rename from test/integration/tests/4488-newer-cabal-version/files/foo.cabal rename to tests/integration/tests/4488-newer-cabal-version/files/foo.cabal diff --git a/test/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml b/tests/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml similarity index 100% rename from test/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml rename to tests/integration/tests/4488-newer-cabal-version/files/stack-bad.yaml diff --git a/test/integration/tests/4488-newer-cabal-version/files/stack-good.yaml b/tests/integration/tests/4488-newer-cabal-version/files/stack-good.yaml similarity index 100% rename from test/integration/tests/4488-newer-cabal-version/files/stack-good.yaml rename to tests/integration/tests/4488-newer-cabal-version/files/stack-good.yaml diff --git a/test/integration/tests/4706-ignore-ghc-env-files/Main.hs b/tests/integration/tests/4706-ignore-ghc-env-files/Main.hs similarity index 100% rename from test/integration/tests/4706-ignore-ghc-env-files/Main.hs rename to tests/integration/tests/4706-ignore-ghc-env-files/Main.hs diff --git a/test/integration/tests/4706-ignore-ghc-env-files/files/.gitignore b/tests/integration/tests/4706-ignore-ghc-env-files/files/.gitignore similarity index 100% rename from test/integration/tests/4706-ignore-ghc-env-files/files/.gitignore rename to tests/integration/tests/4706-ignore-ghc-env-files/files/.gitignore diff --git a/test/integration/tests/4706-ignore-ghc-env-files/files/Main.hs b/tests/integration/tests/4706-ignore-ghc-env-files/files/Main.hs similarity index 100% rename from test/integration/tests/4706-ignore-ghc-env-files/files/Main.hs rename to tests/integration/tests/4706-ignore-ghc-env-files/files/Main.hs diff --git a/test/integration/tests/4706-ignore-ghc-env-files/files/package.yaml b/tests/integration/tests/4706-ignore-ghc-env-files/files/package.yaml similarity index 100% rename from test/integration/tests/4706-ignore-ghc-env-files/files/package.yaml rename to tests/integration/tests/4706-ignore-ghc-env-files/files/package.yaml diff --git a/test/integration/tests/4754-rebuild-haddocks/Main.hs b/tests/integration/tests/4754-rebuild-haddocks/Main.hs similarity index 100% rename from test/integration/tests/4754-rebuild-haddocks/Main.hs rename to tests/integration/tests/4754-rebuild-haddocks/Main.hs diff --git a/test/integration/tests/4754-rebuild-haddocks/files/.gitignore b/tests/integration/tests/4754-rebuild-haddocks/files/.gitignore similarity index 100% rename from test/integration/tests/4754-rebuild-haddocks/files/.gitignore rename to tests/integration/tests/4754-rebuild-haddocks/files/.gitignore diff --git a/test/integration/tests/4754-rebuild-haddocks/files/package.yaml b/tests/integration/tests/4754-rebuild-haddocks/files/package.yaml similarity index 100% rename from test/integration/tests/4754-rebuild-haddocks/files/package.yaml rename to tests/integration/tests/4754-rebuild-haddocks/files/package.yaml diff --git a/test/integration/tests/4754-rebuild-haddocks/files/src/Foo.hs b/tests/integration/tests/4754-rebuild-haddocks/files/src/Foo.hs similarity index 100% rename from test/integration/tests/4754-rebuild-haddocks/files/src/Foo.hs rename to tests/integration/tests/4754-rebuild-haddocks/files/src/Foo.hs diff --git a/test/integration/tests/4754-rebuild-haddocks/files/stack.yaml b/tests/integration/tests/4754-rebuild-haddocks/files/stack.yaml similarity index 100% rename from test/integration/tests/4754-rebuild-haddocks/files/stack.yaml rename to tests/integration/tests/4754-rebuild-haddocks/files/stack.yaml diff --git a/test/integration/tests/4783-doctest-deps/Main.hs b/tests/integration/tests/4783-doctest-deps/Main.hs similarity index 100% rename from test/integration/tests/4783-doctest-deps/Main.hs rename to tests/integration/tests/4783-doctest-deps/Main.hs diff --git a/test/integration/tests/4783-doctest-deps/files/.gitignore b/tests/integration/tests/4783-doctest-deps/files/.gitignore similarity index 100% rename from test/integration/tests/4783-doctest-deps/files/.gitignore rename to tests/integration/tests/4783-doctest-deps/files/.gitignore diff --git a/test/integration/tests/4783-doctest-deps/files/acme-dont-copy/Acme/Dont.hs b/tests/integration/tests/4783-doctest-deps/files/acme-dont-copy/Acme/Dont.hs similarity index 96% rename from test/integration/tests/4783-doctest-deps/files/acme-dont-copy/Acme/Dont.hs rename to tests/integration/tests/4783-doctest-deps/files/acme-dont-copy/Acme/Dont.hs index b1a35a6cc5..e0a9cc03c3 100644 --- a/test/integration/tests/4783-doctest-deps/files/acme-dont-copy/Acme/Dont.hs +++ b/tests/integration/tests/4783-doctest-deps/files/acme-dont-copy/Acme/Dont.hs @@ -1,31 +1,31 @@ --- | --- Module : Acme.Dont --- Copyright : Gracjan Polak 2009 --- License : BSD-style --- Maintainer : Gracjan Polak --- Stability : experimental --- Portability : portable --- --- The Acme.Dont module provides the indispensable don't command, --- ported from Perl. --- --- For more information see influential documentation: --- --- --- Usage: --- --- > main = don't $ do --- > name <- getLine --- > putStrLn $ "hello " ++ name --- -module Acme.Dont where - --- | The Acme.Dont module provides a don't command, which is the --- opposite of Haskell's built-in do. It is used exactly like the do --- monadic construct except that, instead of executing the block it --- controls, it... well... doesn't. --- --- Regardless of the contents of the block, don't returns (). --- -don't :: (Monad m) => m a -> m () -don't _action = pure () +-- | +-- Module : Acme.Dont +-- Copyright : Gracjan Polak 2009 +-- License : BSD-style +-- Maintainer : Gracjan Polak +-- Stability : experimental +-- Portability : portable +-- +-- The Acme.Dont module provides the indispensable don't command, +-- ported from Perl. +-- +-- For more information see influential documentation: +-- +-- +-- Usage: +-- +-- > main = don't $ do +-- > name <- getLine +-- > putStrLn $ "hello " ++ name +-- +module Acme.Dont where + +-- | The Acme.Dont module provides a don't command, which is the +-- opposite of Haskell's built-in do. It is used exactly like the do +-- monadic construct except that, instead of executing the block it +-- controls, it... well... doesn't. +-- +-- Regardless of the contents of the block, don't returns (). +-- +don't :: (Monad m) => m a -> m () +don't _action = pure () diff --git a/test/integration/tests/4783-doctest-deps/files/acme-dont-copy/COPYRIGHT b/tests/integration/tests/4783-doctest-deps/files/acme-dont-copy/COPYRIGHT similarity index 100% rename from test/integration/tests/4783-doctest-deps/files/acme-dont-copy/COPYRIGHT rename to tests/integration/tests/4783-doctest-deps/files/acme-dont-copy/COPYRIGHT diff --git a/test/integration/tests/4783-doctest-deps/files/acme-dont-copy/Setup.hs b/tests/integration/tests/4783-doctest-deps/files/acme-dont-copy/Setup.hs similarity index 97% rename from test/integration/tests/4783-doctest-deps/files/acme-dont-copy/Setup.hs rename to tests/integration/tests/4783-doctest-deps/files/acme-dont-copy/Setup.hs index c2d38c4f4a..bf6890196c 100644 --- a/test/integration/tests/4783-doctest-deps/files/acme-dont-copy/Setup.hs +++ b/tests/integration/tests/4783-doctest-deps/files/acme-dont-copy/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain \ No newline at end of file diff --git a/test/integration/tests/4783-doctest-deps/files/acme-dont-copy/acme-dont-copy.cabal b/tests/integration/tests/4783-doctest-deps/files/acme-dont-copy/acme-dont-copy.cabal similarity index 100% rename from test/integration/tests/4783-doctest-deps/files/acme-dont-copy/acme-dont-copy.cabal rename to tests/integration/tests/4783-doctest-deps/files/acme-dont-copy/acme-dont-copy.cabal diff --git a/test/integration/tests/4783-doctest-deps/files/package.yaml b/tests/integration/tests/4783-doctest-deps/files/package.yaml similarity index 100% rename from test/integration/tests/4783-doctest-deps/files/package.yaml rename to tests/integration/tests/4783-doctest-deps/files/package.yaml diff --git a/test/integration/tests/4783-doctest-deps/files/snapshot.yaml b/tests/integration/tests/4783-doctest-deps/files/snapshot.yaml similarity index 100% rename from test/integration/tests/4783-doctest-deps/files/snapshot.yaml rename to tests/integration/tests/4783-doctest-deps/files/snapshot.yaml diff --git a/test/integration/tests/4783-doctest-deps/files/src/Foo.hs b/tests/integration/tests/4783-doctest-deps/files/src/Foo.hs similarity index 100% rename from test/integration/tests/4783-doctest-deps/files/src/Foo.hs rename to tests/integration/tests/4783-doctest-deps/files/src/Foo.hs diff --git a/test/integration/tests/4783-doctest-deps/files/stack.yaml b/tests/integration/tests/4783-doctest-deps/files/stack.yaml similarity index 100% rename from test/integration/tests/4783-doctest-deps/files/stack.yaml rename to tests/integration/tests/4783-doctest-deps/files/stack.yaml diff --git a/test/integration/tests/4783-doctest-deps/files/test/Main.hs b/tests/integration/tests/4783-doctest-deps/files/test/Main.hs similarity index 100% rename from test/integration/tests/4783-doctest-deps/files/test/Main.hs rename to tests/integration/tests/4783-doctest-deps/files/test/Main.hs diff --git a/test/integration/tests/4897-boot-package-pruned/Main.hs b/tests/integration/tests/4897-boot-package-pruned/Main.hs similarity index 100% rename from test/integration/tests/4897-boot-package-pruned/Main.hs rename to tests/integration/tests/4897-boot-package-pruned/Main.hs diff --git a/test/integration/tests/4897-boot-package-pruned/files/directory/directory.cabal b/tests/integration/tests/4897-boot-package-pruned/files/directory/directory.cabal similarity index 100% rename from test/integration/tests/4897-boot-package-pruned/files/directory/directory.cabal rename to tests/integration/tests/4897-boot-package-pruned/files/directory/directory.cabal diff --git a/test/integration/tests/4897-boot-package-pruned/files/files.cabal b/tests/integration/tests/4897-boot-package-pruned/files/files.cabal similarity index 100% rename from test/integration/tests/4897-boot-package-pruned/files/files.cabal rename to tests/integration/tests/4897-boot-package-pruned/files/files.cabal diff --git a/test/integration/tests/4897-boot-package-pruned/files/stack.yaml b/tests/integration/tests/4897-boot-package-pruned/files/stack.yaml similarity index 100% rename from test/integration/tests/4897-boot-package-pruned/files/stack.yaml rename to tests/integration/tests/4897-boot-package-pruned/files/stack.yaml diff --git a/test/integration/tests/4938-non-ascii-module-names/Main.hs b/tests/integration/tests/4938-non-ascii-module-names/Main.hs similarity index 100% rename from test/integration/tests/4938-non-ascii-module-names/Main.hs rename to tests/integration/tests/4938-non-ascii-module-names/Main.hs diff --git a/test/integration/tests/4938-non-ascii-module-names/files/.gitignore b/tests/integration/tests/4938-non-ascii-module-names/files/.gitignore similarity index 100% rename from test/integration/tests/4938-non-ascii-module-names/files/.gitignore rename to tests/integration/tests/4938-non-ascii-module-names/files/.gitignore diff --git a/test/integration/tests/4938-non-ascii-module-names/files/Lib.hs b/tests/integration/tests/4938-non-ascii-module-names/files/Lib.hs similarity index 100% rename from test/integration/tests/4938-non-ascii-module-names/files/Lib.hs rename to tests/integration/tests/4938-non-ascii-module-names/files/Lib.hs diff --git "a/test/integration/tests/4938-non-ascii-module-names/files/T\303\244st.hs" "b/tests/integration/tests/4938-non-ascii-module-names/files/T\303\244st.hs" similarity index 100% rename from "test/integration/tests/4938-non-ascii-module-names/files/T\303\244st.hs" rename to "tests/integration/tests/4938-non-ascii-module-names/files/T\303\244st.hs" diff --git a/test/integration/tests/4938-non-ascii-module-names/files/app/Main.hs b/tests/integration/tests/4938-non-ascii-module-names/files/app/Main.hs similarity index 100% rename from test/integration/tests/4938-non-ascii-module-names/files/app/Main.hs rename to tests/integration/tests/4938-non-ascii-module-names/files/app/Main.hs diff --git a/test/integration/tests/4938-non-ascii-module-names/files/package.yaml b/tests/integration/tests/4938-non-ascii-module-names/files/package.yaml similarity index 100% rename from test/integration/tests/4938-non-ascii-module-names/files/package.yaml rename to tests/integration/tests/4938-non-ascii-module-names/files/package.yaml diff --git a/test/integration/tests/4938-non-ascii-module-names/files/stack.yaml b/tests/integration/tests/4938-non-ascii-module-names/files/stack.yaml similarity index 100% rename from test/integration/tests/4938-non-ascii-module-names/files/stack.yaml rename to tests/integration/tests/4938-non-ascii-module-names/files/stack.yaml diff --git a/test/integration/tests/5180-ghc-rts-flags/Main.hs b/tests/integration/tests/5180-ghc-rts-flags/Main.hs similarity index 100% rename from test/integration/tests/5180-ghc-rts-flags/Main.hs rename to tests/integration/tests/5180-ghc-rts-flags/Main.hs diff --git a/test/integration/tests/5180-ghc-rts-flags/files/files.cabal b/tests/integration/tests/5180-ghc-rts-flags/files/files.cabal similarity index 100% rename from test/integration/tests/5180-ghc-rts-flags/files/files.cabal rename to tests/integration/tests/5180-ghc-rts-flags/files/files.cabal diff --git a/test/integration/tests/5180-ghc-rts-flags/files/src/Lib.hs b/tests/integration/tests/5180-ghc-rts-flags/files/src/Lib.hs similarity index 100% rename from test/integration/tests/5180-ghc-rts-flags/files/src/Lib.hs rename to tests/integration/tests/5180-ghc-rts-flags/files/src/Lib.hs diff --git a/test/integration/tests/5180-ghc-rts-flags/files/stack.yaml b/tests/integration/tests/5180-ghc-rts-flags/files/stack.yaml similarity index 100% rename from test/integration/tests/5180-ghc-rts-flags/files/stack.yaml rename to tests/integration/tests/5180-ghc-rts-flags/files/stack.yaml diff --git a/test/integration/tests/5272-only-locals/Main.hs b/tests/integration/tests/5272-only-locals/Main.hs similarity index 100% rename from test/integration/tests/5272-only-locals/Main.hs rename to tests/integration/tests/5272-only-locals/Main.hs diff --git a/test/integration/tests/5272-only-locals/files/.gitignore b/tests/integration/tests/5272-only-locals/files/.gitignore similarity index 100% rename from test/integration/tests/5272-only-locals/files/.gitignore rename to tests/integration/tests/5272-only-locals/files/.gitignore diff --git a/test/integration/tests/5272-only-locals/files/package.yaml b/tests/integration/tests/5272-only-locals/files/package.yaml similarity index 100% rename from test/integration/tests/5272-only-locals/files/package.yaml rename to tests/integration/tests/5272-only-locals/files/package.yaml diff --git a/test/integration/tests/5272-only-locals/files/src/Foo.hs b/tests/integration/tests/5272-only-locals/files/src/Foo.hs similarity index 100% rename from test/integration/tests/5272-only-locals/files/src/Foo.hs rename to tests/integration/tests/5272-only-locals/files/src/Foo.hs diff --git a/test/integration/tests/5272-only-locals/files/stack.yaml b/tests/integration/tests/5272-only-locals/files/stack.yaml similarity index 100% rename from test/integration/tests/5272-only-locals/files/stack.yaml rename to tests/integration/tests/5272-only-locals/files/stack.yaml diff --git a/test/integration/tests/5680-share-package-across-projects/Main.hs b/tests/integration/tests/5680-share-package-across-projects/Main.hs similarity index 100% rename from test/integration/tests/5680-share-package-across-projects/Main.hs rename to tests/integration/tests/5680-share-package-across-projects/Main.hs diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-a/package.yaml b/tests/integration/tests/5680-share-package-across-projects/files/package-a/package.yaml similarity index 100% rename from test/integration/tests/5680-share-package-across-projects/files/package-a/package.yaml rename to tests/integration/tests/5680-share-package-across-projects/files/package-a/package.yaml diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-a/src/Lib.hs b/tests/integration/tests/5680-share-package-across-projects/files/package-a/src/Lib.hs similarity index 100% rename from test/integration/tests/5680-share-package-across-projects/files/package-a/src/Lib.hs rename to tests/integration/tests/5680-share-package-across-projects/files/package-a/src/Lib.hs diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml b/tests/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml similarity index 100% rename from test/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml rename to tests/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-b/package.yaml b/tests/integration/tests/5680-share-package-across-projects/files/package-b/package.yaml similarity index 100% rename from test/integration/tests/5680-share-package-across-projects/files/package-b/package.yaml rename to tests/integration/tests/5680-share-package-across-projects/files/package-b/package.yaml diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-b/src/Lib.hs b/tests/integration/tests/5680-share-package-across-projects/files/package-b/src/Lib.hs similarity index 100% rename from test/integration/tests/5680-share-package-across-projects/files/package-b/src/Lib.hs rename to tests/integration/tests/5680-share-package-across-projects/files/package-b/src/Lib.hs diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml b/tests/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml similarity index 100% rename from test/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml rename to tests/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-c/package.yaml b/tests/integration/tests/5680-share-package-across-projects/files/package-c/package.yaml similarity index 100% rename from test/integration/tests/5680-share-package-across-projects/files/package-c/package.yaml rename to tests/integration/tests/5680-share-package-across-projects/files/package-c/package.yaml diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-c/src/Lib.hs b/tests/integration/tests/5680-share-package-across-projects/files/package-c/src/Lib.hs similarity index 100% rename from test/integration/tests/5680-share-package-across-projects/files/package-c/src/Lib.hs rename to tests/integration/tests/5680-share-package-across-projects/files/package-c/src/Lib.hs diff --git a/test/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml b/tests/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml similarity index 100% rename from test/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml rename to tests/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml diff --git a/test/integration/tests/6046-missing-sublib-unregister/Main.hs b/tests/integration/tests/6046-missing-sublib-unregister/Main.hs similarity index 100% rename from test/integration/tests/6046-missing-sublib-unregister/Main.hs rename to tests/integration/tests/6046-missing-sublib-unregister/Main.hs diff --git a/test/integration/tests/6046-missing-sublib-unregister/files/foo.cabal1 b/tests/integration/tests/6046-missing-sublib-unregister/files/foo.cabal1 similarity index 100% rename from test/integration/tests/6046-missing-sublib-unregister/files/foo.cabal1 rename to tests/integration/tests/6046-missing-sublib-unregister/files/foo.cabal1 diff --git a/test/integration/tests/6046-missing-sublib-unregister/files/foo.cabal2 b/tests/integration/tests/6046-missing-sublib-unregister/files/foo.cabal2 similarity index 100% rename from test/integration/tests/6046-missing-sublib-unregister/files/foo.cabal2 rename to tests/integration/tests/6046-missing-sublib-unregister/files/foo.cabal2 diff --git a/test/integration/tests/6046-missing-sublib-unregister/files/src/Lib.hs b/tests/integration/tests/6046-missing-sublib-unregister/files/src/Lib.hs similarity index 100% rename from test/integration/tests/6046-missing-sublib-unregister/files/src/Lib.hs rename to tests/integration/tests/6046-missing-sublib-unregister/files/src/Lib.hs diff --git a/test/integration/tests/6046-missing-sublib-unregister/files/src/Sub.hs b/tests/integration/tests/6046-missing-sublib-unregister/files/src/Sub.hs similarity index 100% rename from test/integration/tests/6046-missing-sublib-unregister/files/src/Sub.hs rename to tests/integration/tests/6046-missing-sublib-unregister/files/src/Sub.hs diff --git a/test/integration/tests/6046-missing-sublib-unregister/files/stack.yaml b/tests/integration/tests/6046-missing-sublib-unregister/files/stack.yaml similarity index 100% rename from test/integration/tests/6046-missing-sublib-unregister/files/stack.yaml rename to tests/integration/tests/6046-missing-sublib-unregister/files/stack.yaml diff --git a/test/integration/tests/606-local-version-not-exist/Main.hs b/tests/integration/tests/606-local-version-not-exist/Main.hs similarity index 100% rename from test/integration/tests/606-local-version-not-exist/Main.hs rename to tests/integration/tests/606-local-version-not-exist/Main.hs diff --git a/test/integration/tests/606-local-version-not-exist/files/files.cabal b/tests/integration/tests/606-local-version-not-exist/files/files.cabal similarity index 100% rename from test/integration/tests/606-local-version-not-exist/files/files.cabal rename to tests/integration/tests/606-local-version-not-exist/files/files.cabal diff --git a/test/integration/tests/606-local-version-not-exist/files/src/Lib.hs b/tests/integration/tests/606-local-version-not-exist/files/src/Lib.hs similarity index 100% rename from test/integration/tests/606-local-version-not-exist/files/src/Lib.hs rename to tests/integration/tests/606-local-version-not-exist/files/src/Lib.hs diff --git a/test/integration/tests/606-local-version-not-exist/files/stack.yaml b/tests/integration/tests/606-local-version-not-exist/files/stack.yaml similarity index 100% rename from test/integration/tests/606-local-version-not-exist/files/stack.yaml rename to tests/integration/tests/606-local-version-not-exist/files/stack.yaml diff --git a/test/integration/tests/617-extra-dep-flag/Main.hs b/tests/integration/tests/617-extra-dep-flag/Main.hs similarity index 100% rename from test/integration/tests/617-extra-dep-flag/Main.hs rename to tests/integration/tests/617-extra-dep-flag/Main.hs diff --git a/test/integration/tests/617-extra-dep-flag/files/stack.yaml b/tests/integration/tests/617-extra-dep-flag/files/stack.yaml similarity index 100% rename from test/integration/tests/617-extra-dep-flag/files/stack.yaml rename to tests/integration/tests/617-extra-dep-flag/files/stack.yaml diff --git a/test/integration/tests/617-unused-flag-cli/Main.hs b/tests/integration/tests/617-unused-flag-cli/Main.hs similarity index 100% rename from test/integration/tests/617-unused-flag-cli/Main.hs rename to tests/integration/tests/617-unused-flag-cli/Main.hs diff --git a/test/integration/tests/617-unused-flag-cli/files/files.cabal b/tests/integration/tests/617-unused-flag-cli/files/files.cabal similarity index 100% rename from test/integration/tests/617-unused-flag-cli/files/files.cabal rename to tests/integration/tests/617-unused-flag-cli/files/files.cabal diff --git a/test/integration/tests/617-unused-flag-cli/files/src/Lib.hs b/tests/integration/tests/617-unused-flag-cli/files/src/Lib.hs similarity index 100% rename from test/integration/tests/617-unused-flag-cli/files/src/Lib.hs rename to tests/integration/tests/617-unused-flag-cli/files/src/Lib.hs diff --git a/test/integration/tests/617-unused-flag-cli/files/stack.yaml b/tests/integration/tests/617-unused-flag-cli/files/stack.yaml similarity index 100% rename from test/integration/tests/617-unused-flag-cli/files/stack.yaml rename to tests/integration/tests/617-unused-flag-cli/files/stack.yaml diff --git a/test/integration/tests/617-unused-flag-name-yaml/Main.hs b/tests/integration/tests/617-unused-flag-name-yaml/Main.hs similarity index 100% rename from test/integration/tests/617-unused-flag-name-yaml/Main.hs rename to tests/integration/tests/617-unused-flag-name-yaml/Main.hs diff --git a/test/integration/tests/617-unused-flag-name-yaml/files/files.cabal b/tests/integration/tests/617-unused-flag-name-yaml/files/files.cabal similarity index 100% rename from test/integration/tests/617-unused-flag-name-yaml/files/files.cabal rename to tests/integration/tests/617-unused-flag-name-yaml/files/files.cabal diff --git a/test/integration/tests/617-unused-flag-name-yaml/files/src/Lib.hs b/tests/integration/tests/617-unused-flag-name-yaml/files/src/Lib.hs similarity index 100% rename from test/integration/tests/617-unused-flag-name-yaml/files/src/Lib.hs rename to tests/integration/tests/617-unused-flag-name-yaml/files/src/Lib.hs diff --git a/test/integration/tests/617-unused-flag-name-yaml/files/stack.yaml b/tests/integration/tests/617-unused-flag-name-yaml/files/stack.yaml similarity index 100% rename from test/integration/tests/617-unused-flag-name-yaml/files/stack.yaml rename to tests/integration/tests/617-unused-flag-name-yaml/files/stack.yaml diff --git a/test/integration/tests/617-unused-flag-yaml/Main.hs b/tests/integration/tests/617-unused-flag-yaml/Main.hs similarity index 100% rename from test/integration/tests/617-unused-flag-yaml/Main.hs rename to tests/integration/tests/617-unused-flag-yaml/Main.hs diff --git a/test/integration/tests/617-unused-flag-yaml/files/files.cabal b/tests/integration/tests/617-unused-flag-yaml/files/files.cabal similarity index 100% rename from test/integration/tests/617-unused-flag-yaml/files/files.cabal rename to tests/integration/tests/617-unused-flag-yaml/files/files.cabal diff --git a/test/integration/tests/617-unused-flag-yaml/files/src/Lib.hs b/tests/integration/tests/617-unused-flag-yaml/files/src/Lib.hs similarity index 100% rename from test/integration/tests/617-unused-flag-yaml/files/src/Lib.hs rename to tests/integration/tests/617-unused-flag-yaml/files/src/Lib.hs diff --git a/test/integration/tests/617-unused-flag-yaml/files/stack.yaml b/tests/integration/tests/617-unused-flag-yaml/files/stack.yaml similarity index 100% rename from test/integration/tests/617-unused-flag-yaml/files/stack.yaml rename to tests/integration/tests/617-unused-flag-yaml/files/stack.yaml diff --git a/test/integration/tests/620-env-command/Main.hs b/tests/integration/tests/620-env-command/Main.hs similarity index 100% rename from test/integration/tests/620-env-command/Main.hs rename to tests/integration/tests/620-env-command/Main.hs diff --git a/test/integration/tests/620-env-command/files/.gitignore b/tests/integration/tests/620-env-command/files/.gitignore similarity index 100% rename from test/integration/tests/620-env-command/files/.gitignore rename to tests/integration/tests/620-env-command/files/.gitignore diff --git a/test/integration/tests/620-env-command/files/Main.hs b/tests/integration/tests/620-env-command/files/Main.hs similarity index 100% rename from test/integration/tests/620-env-command/files/Main.hs rename to tests/integration/tests/620-env-command/files/Main.hs diff --git a/test/integration/tests/620-env-command/files/run.sh b/tests/integration/tests/620-env-command/files/run.sh similarity index 100% rename from test/integration/tests/620-env-command/files/run.sh rename to tests/integration/tests/620-env-command/files/run.sh diff --git a/test/integration/tests/717-sdist-test/Main.hs b/tests/integration/tests/717-sdist-test/Main.hs similarity index 100% rename from test/integration/tests/717-sdist-test/Main.hs rename to tests/integration/tests/717-sdist-test/Main.hs diff --git a/test/integration/tests/717-sdist-test/files/package-with-failing-test/LICENSE b/tests/integration/tests/717-sdist-test/files/package-with-failing-test/LICENSE similarity index 100% rename from test/integration/tests/717-sdist-test/files/package-with-failing-test/LICENSE rename to tests/integration/tests/717-sdist-test/files/package-with-failing-test/LICENSE diff --git a/test/integration/tests/717-sdist-test/files/package-with-failing-test/README.md b/tests/integration/tests/717-sdist-test/files/package-with-failing-test/README.md similarity index 100% rename from test/integration/tests/717-sdist-test/files/package-with-failing-test/README.md rename to tests/integration/tests/717-sdist-test/files/package-with-failing-test/README.md diff --git a/test/integration/tests/717-sdist-test/files/package-with-failing-test/Setup.hs b/tests/integration/tests/717-sdist-test/files/package-with-failing-test/Setup.hs similarity index 100% rename from test/integration/tests/717-sdist-test/files/package-with-failing-test/Setup.hs rename to tests/integration/tests/717-sdist-test/files/package-with-failing-test/Setup.hs diff --git a/test/integration/tests/717-sdist-test/files/package-with-failing-test/files/file.txt b/tests/integration/tests/717-sdist-test/files/package-with-failing-test/files/file.txt similarity index 100% rename from test/integration/tests/717-sdist-test/files/package-with-failing-test/files/file.txt rename to tests/integration/tests/717-sdist-test/files/package-with-failing-test/files/file.txt diff --git a/test/integration/tests/717-sdist-test/files/package-with-failing-test/package-with-failing-test.cabal b/tests/integration/tests/717-sdist-test/files/package-with-failing-test/package-with-failing-test.cabal similarity index 100% rename from test/integration/tests/717-sdist-test/files/package-with-failing-test/package-with-failing-test.cabal rename to tests/integration/tests/717-sdist-test/files/package-with-failing-test/package-with-failing-test.cabal diff --git a/test/integration/tests/717-sdist-test/files/package-with-failing-test/src/Lib.hs b/tests/integration/tests/717-sdist-test/files/package-with-failing-test/src/Lib.hs similarity index 100% rename from test/integration/tests/717-sdist-test/files/package-with-failing-test/src/Lib.hs rename to tests/integration/tests/717-sdist-test/files/package-with-failing-test/src/Lib.hs diff --git a/test/integration/tests/717-sdist-test/files/package-with-failing-test/test/Test.hs b/tests/integration/tests/717-sdist-test/files/package-with-failing-test/test/Test.hs similarity index 100% rename from test/integration/tests/717-sdist-test/files/package-with-failing-test/test/Test.hs rename to tests/integration/tests/717-sdist-test/files/package-with-failing-test/test/Test.hs diff --git a/test/integration/tests/717-sdist-test/files/package-with-th/LICENSE b/tests/integration/tests/717-sdist-test/files/package-with-th/LICENSE similarity index 100% rename from test/integration/tests/717-sdist-test/files/package-with-th/LICENSE rename to tests/integration/tests/717-sdist-test/files/package-with-th/LICENSE diff --git a/test/integration/tests/717-sdist-test/files/package-with-th/README.md b/tests/integration/tests/717-sdist-test/files/package-with-th/README.md similarity index 100% rename from test/integration/tests/717-sdist-test/files/package-with-th/README.md rename to tests/integration/tests/717-sdist-test/files/package-with-th/README.md diff --git a/test/integration/tests/717-sdist-test/files/package-with-th/Setup.hs b/tests/integration/tests/717-sdist-test/files/package-with-th/Setup.hs similarity index 100% rename from test/integration/tests/717-sdist-test/files/package-with-th/Setup.hs rename to tests/integration/tests/717-sdist-test/files/package-with-th/Setup.hs diff --git a/test/integration/tests/717-sdist-test/files/package-with-th/files/file.txt b/tests/integration/tests/717-sdist-test/files/package-with-th/files/file.txt similarity index 100% rename from test/integration/tests/717-sdist-test/files/package-with-th/files/file.txt rename to tests/integration/tests/717-sdist-test/files/package-with-th/files/file.txt diff --git a/test/integration/tests/717-sdist-test/files/package-with-th/package-with-th.cabal b/tests/integration/tests/717-sdist-test/files/package-with-th/package-with-th.cabal similarity index 100% rename from test/integration/tests/717-sdist-test/files/package-with-th/package-with-th.cabal rename to tests/integration/tests/717-sdist-test/files/package-with-th/package-with-th.cabal diff --git a/test/integration/tests/717-sdist-test/files/package-with-th/src/Lib.hs b/tests/integration/tests/717-sdist-test/files/package-with-th/src/Lib.hs similarity index 100% rename from test/integration/tests/717-sdist-test/files/package-with-th/src/Lib.hs rename to tests/integration/tests/717-sdist-test/files/package-with-th/src/Lib.hs diff --git a/test/integration/tests/717-sdist-test/files/package-with-th/src/TH.hs b/tests/integration/tests/717-sdist-test/files/package-with-th/src/TH.hs similarity index 100% rename from test/integration/tests/717-sdist-test/files/package-with-th/src/TH.hs rename to tests/integration/tests/717-sdist-test/files/package-with-th/src/TH.hs diff --git a/test/integration/tests/717-sdist-test/files/package-with-working-th/LICENSE b/tests/integration/tests/717-sdist-test/files/package-with-working-th/LICENSE similarity index 100% rename from test/integration/tests/717-sdist-test/files/package-with-working-th/LICENSE rename to tests/integration/tests/717-sdist-test/files/package-with-working-th/LICENSE diff --git a/test/integration/tests/717-sdist-test/files/package-with-working-th/README.md b/tests/integration/tests/717-sdist-test/files/package-with-working-th/README.md similarity index 100% rename from test/integration/tests/717-sdist-test/files/package-with-working-th/README.md rename to tests/integration/tests/717-sdist-test/files/package-with-working-th/README.md diff --git a/test/integration/tests/717-sdist-test/files/package-with-working-th/Setup.hs b/tests/integration/tests/717-sdist-test/files/package-with-working-th/Setup.hs similarity index 100% rename from test/integration/tests/717-sdist-test/files/package-with-working-th/Setup.hs rename to tests/integration/tests/717-sdist-test/files/package-with-working-th/Setup.hs diff --git a/test/integration/tests/717-sdist-test/files/package-with-working-th/files/file.txt b/tests/integration/tests/717-sdist-test/files/package-with-working-th/files/file.txt similarity index 100% rename from test/integration/tests/717-sdist-test/files/package-with-working-th/files/file.txt rename to tests/integration/tests/717-sdist-test/files/package-with-working-th/files/file.txt diff --git a/test/integration/tests/717-sdist-test/files/package-with-working-th/package-with-working-th.cabal b/tests/integration/tests/717-sdist-test/files/package-with-working-th/package-with-working-th.cabal similarity index 100% rename from test/integration/tests/717-sdist-test/files/package-with-working-th/package-with-working-th.cabal rename to tests/integration/tests/717-sdist-test/files/package-with-working-th/package-with-working-th.cabal diff --git a/test/integration/tests/717-sdist-test/files/package-with-working-th/src/Lib.hs b/tests/integration/tests/717-sdist-test/files/package-with-working-th/src/Lib.hs similarity index 100% rename from test/integration/tests/717-sdist-test/files/package-with-working-th/src/Lib.hs rename to tests/integration/tests/717-sdist-test/files/package-with-working-th/src/Lib.hs diff --git a/test/integration/tests/717-sdist-test/files/package-with-working-th/src/TH.hs b/tests/integration/tests/717-sdist-test/files/package-with-working-th/src/TH.hs similarity index 100% rename from test/integration/tests/717-sdist-test/files/package-with-working-th/src/TH.hs rename to tests/integration/tests/717-sdist-test/files/package-with-working-th/src/TH.hs diff --git a/test/integration/tests/717-sdist-test/files/stack.yaml b/tests/integration/tests/717-sdist-test/files/stack.yaml similarity index 100% rename from test/integration/tests/717-sdist-test/files/stack.yaml rename to tests/integration/tests/717-sdist-test/files/stack.yaml diff --git a/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/LICENSE b/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/LICENSE similarity index 100% rename from test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/LICENSE rename to tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/LICENSE diff --git a/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/README.md b/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/README.md similarity index 100% rename from test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/README.md rename to tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/README.md diff --git a/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/Setup.hs b/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/Setup.hs similarity index 100% rename from test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/Setup.hs rename to tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/Setup.hs diff --git a/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/dependent-on-failing-packages.cabal b/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/dependent-on-failing-packages.cabal similarity index 100% rename from test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/dependent-on-failing-packages.cabal rename to tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/dependent-on-failing-packages.cabal diff --git a/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/files/file.txt b/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/files/file.txt similarity index 100% rename from test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/files/file.txt rename to tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/files/file.txt diff --git a/test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/src/LibD.hs b/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/src/LibD.hs similarity index 100% rename from test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/src/LibD.hs rename to tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/src/LibD.hs diff --git a/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/LICENSE b/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/LICENSE similarity index 100% rename from test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/LICENSE rename to tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/LICENSE diff --git a/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/README.md b/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/README.md similarity index 100% rename from test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/README.md rename to tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/README.md diff --git a/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/Setup.hs b/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/Setup.hs similarity index 100% rename from test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/Setup.hs rename to tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/Setup.hs diff --git a/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/failing-in-subdir.cabal b/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/failing-in-subdir.cabal similarity index 100% rename from test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/failing-in-subdir.cabal rename to tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/failing-in-subdir.cabal diff --git a/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/files/file.txt b/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/files/file.txt similarity index 100% rename from test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/files/file.txt rename to tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/files/file.txt diff --git a/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/LibC.hs b/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/LibC.hs similarity index 100% rename from test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/LibC.hs rename to tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/LibC.hs diff --git a/test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/THInSubdir.hs b/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/THInSubdir.hs similarity index 100% rename from test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/THInSubdir.hs rename to tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/THInSubdir.hs diff --git a/test/integration/tests/763-buildable-false/Main.hs b/tests/integration/tests/763-buildable-false/Main.hs similarity index 100% rename from test/integration/tests/763-buildable-false/Main.hs rename to tests/integration/tests/763-buildable-false/Main.hs diff --git a/test/integration/tests/763-buildable-false/files/app/Main.hs b/tests/integration/tests/763-buildable-false/files/app/Main.hs similarity index 100% rename from test/integration/tests/763-buildable-false/files/app/Main.hs rename to tests/integration/tests/763-buildable-false/files/app/Main.hs diff --git a/test/integration/tests/763-buildable-false/files/files.cabal b/tests/integration/tests/763-buildable-false/files/files.cabal similarity index 100% rename from test/integration/tests/763-buildable-false/files/files.cabal rename to tests/integration/tests/763-buildable-false/files/files.cabal diff --git a/test/integration/tests/763-buildable-false/files/stack.yaml b/tests/integration/tests/763-buildable-false/files/stack.yaml similarity index 100% rename from test/integration/tests/763-buildable-false/files/stack.yaml rename to tests/integration/tests/763-buildable-false/files/stack.yaml diff --git a/test/integration/tests/796-ghc-options/Main.hs b/tests/integration/tests/796-ghc-options/Main.hs similarity index 100% rename from test/integration/tests/796-ghc-options/Main.hs rename to tests/integration/tests/796-ghc-options/Main.hs diff --git a/test/integration/tests/796-ghc-options/files/ghc-options.cabal b/tests/integration/tests/796-ghc-options/files/ghc-options.cabal similarity index 100% rename from test/integration/tests/796-ghc-options/files/ghc-options.cabal rename to tests/integration/tests/796-ghc-options/files/ghc-options.cabal diff --git a/test/integration/tests/796-ghc-options/files/src/Lib.hs b/tests/integration/tests/796-ghc-options/files/src/Lib.hs similarity index 100% rename from test/integration/tests/796-ghc-options/files/src/Lib.hs rename to tests/integration/tests/796-ghc-options/files/src/Lib.hs diff --git a/test/integration/tests/796-ghc-options/files/stack.yaml b/tests/integration/tests/796-ghc-options/files/stack.yaml similarity index 100% rename from test/integration/tests/796-ghc-options/files/stack.yaml rename to tests/integration/tests/796-ghc-options/files/stack.yaml diff --git a/test/integration/tests/allow-newer-specific-packages/Main.hs b/tests/integration/tests/allow-newer-specific-packages/Main.hs similarity index 100% rename from test/integration/tests/allow-newer-specific-packages/Main.hs rename to tests/integration/tests/allow-newer-specific-packages/Main.hs diff --git a/test/integration/tests/allow-newer-specific-packages/files/foo.cabal b/tests/integration/tests/allow-newer-specific-packages/files/foo.cabal similarity index 100% rename from test/integration/tests/allow-newer-specific-packages/files/foo.cabal rename to tests/integration/tests/allow-newer-specific-packages/files/foo.cabal diff --git a/test/integration/tests/allow-newer-specific-packages/files/package.yaml b/tests/integration/tests/allow-newer-specific-packages/files/package.yaml similarity index 100% rename from test/integration/tests/allow-newer-specific-packages/files/package.yaml rename to tests/integration/tests/allow-newer-specific-packages/files/package.yaml diff --git a/test/integration/tests/allow-newer-specific-packages/files/src/Foo.hs b/tests/integration/tests/allow-newer-specific-packages/files/src/Foo.hs similarity index 100% rename from test/integration/tests/allow-newer-specific-packages/files/src/Foo.hs rename to tests/integration/tests/allow-newer-specific-packages/files/src/Foo.hs diff --git a/test/integration/tests/allow-newer-specific-packages/files/stack.yaml b/tests/integration/tests/allow-newer-specific-packages/files/stack.yaml similarity index 100% rename from test/integration/tests/allow-newer-specific-packages/files/stack.yaml rename to tests/integration/tests/allow-newer-specific-packages/files/stack.yaml diff --git a/test/integration/tests/basic-install/Main.hs b/tests/integration/tests/basic-install/Main.hs similarity index 100% rename from test/integration/tests/basic-install/Main.hs rename to tests/integration/tests/basic-install/Main.hs diff --git a/test/integration/tests/build-ghc/Main.hs b/tests/integration/tests/build-ghc/Main.hs similarity index 100% rename from test/integration/tests/build-ghc/Main.hs rename to tests/integration/tests/build-ghc/Main.hs diff --git a/test/integration/tests/cabal-non-buildable-bug/Main.hs b/tests/integration/tests/cabal-non-buildable-bug/Main.hs similarity index 100% rename from test/integration/tests/cabal-non-buildable-bug/Main.hs rename to tests/integration/tests/cabal-non-buildable-bug/Main.hs diff --git a/test/integration/tests/cabal-non-buildable-bug/files/.gitignore b/tests/integration/tests/cabal-non-buildable-bug/files/.gitignore similarity index 100% rename from test/integration/tests/cabal-non-buildable-bug/files/.gitignore rename to tests/integration/tests/cabal-non-buildable-bug/files/.gitignore diff --git a/test/integration/tests/cabal-non-buildable-bug/files/package.yaml b/tests/integration/tests/cabal-non-buildable-bug/files/package.yaml similarity index 100% rename from test/integration/tests/cabal-non-buildable-bug/files/package.yaml rename to tests/integration/tests/cabal-non-buildable-bug/files/package.yaml diff --git a/test/integration/tests/cabal-public-sublibraries/Main.hs b/tests/integration/tests/cabal-public-sublibraries/Main.hs similarity index 100% rename from test/integration/tests/cabal-public-sublibraries/Main.hs rename to tests/integration/tests/cabal-public-sublibraries/Main.hs diff --git a/test/integration/tests/cabal-public-sublibraries/files/Setup.hs b/tests/integration/tests/cabal-public-sublibraries/files/Setup.hs similarity index 100% rename from test/integration/tests/cabal-public-sublibraries/files/Setup.hs rename to tests/integration/tests/cabal-public-sublibraries/files/Setup.hs diff --git a/test/integration/tests/cabal-public-sublibraries/files/files.cabal b/tests/integration/tests/cabal-public-sublibraries/files/files.cabal similarity index 100% rename from test/integration/tests/cabal-public-sublibraries/files/files.cabal rename to tests/integration/tests/cabal-public-sublibraries/files/files.cabal diff --git a/test/integration/tests/cabal-public-sublibraries/files/src/Lib.hs b/tests/integration/tests/cabal-public-sublibraries/files/src/Lib.hs similarity index 100% rename from test/integration/tests/cabal-public-sublibraries/files/src/Lib.hs rename to tests/integration/tests/cabal-public-sublibraries/files/src/Lib.hs diff --git a/test/integration/tests/cabal-public-sublibraries/files/src/Sub.hs b/tests/integration/tests/cabal-public-sublibraries/files/src/Sub.hs similarity index 100% rename from test/integration/tests/cabal-public-sublibraries/files/src/Sub.hs rename to tests/integration/tests/cabal-public-sublibraries/files/src/Sub.hs diff --git a/test/integration/tests/cabal-public-sublibraries/files/stack.yaml b/tests/integration/tests/cabal-public-sublibraries/files/stack.yaml similarity index 100% rename from test/integration/tests/cabal-public-sublibraries/files/stack.yaml rename to tests/integration/tests/cabal-public-sublibraries/files/stack.yaml diff --git a/tests/integration/tests/cabal-public-sublibraries/files/stack.yaml.lock b/tests/integration/tests/cabal-public-sublibraries/files/stack.yaml.lock new file mode 100644 index 0000000000..44b4120015 --- /dev/null +++ b/tests/integration/tests/cabal-public-sublibraries/files/stack.yaml.lock @@ -0,0 +1,23 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: +- completed: + name: filelock + pantry-tree: + sha256: 0563d664aefb56cacfa89bc244d377c5e63597abd827a5a3f8d6be21a2b3b4d9 + size: 584 + sha256: c27641e26137f52b27e3ef9e27e7ac3f845f719ea54a12475f00f2ea7e6d9afc + size: 9228 + url: https://github.com/snoyberg/filelock/archive/4f080496d8bf153fbe26e64d1f52cf73c7db25f6.tar.gz + version: 0.1.1.2 + original: + url: https://github.com/snoyberg/filelock/archive/4f080496d8bf153fbe26e64d1f52cf73c7db25f6.tar.gz +snapshots: +- completed: + sha256: bfafe5735ccb74527d754b1f9999ded72d7c3a6c3a88529449661431ccfbd6cc + size: 649327 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/8.yaml + original: lts-20.8 diff --git a/test/integration/tests/cabal-sublibrary-dependency/Main.hs b/tests/integration/tests/cabal-sublibrary-dependency/Main.hs similarity index 100% rename from test/integration/tests/cabal-sublibrary-dependency/Main.hs rename to tests/integration/tests/cabal-sublibrary-dependency/Main.hs diff --git a/test/integration/tests/cabal-sublibrary-dependency/files/Setup.hs b/tests/integration/tests/cabal-sublibrary-dependency/files/Setup.hs similarity index 100% rename from test/integration/tests/cabal-sublibrary-dependency/files/Setup.hs rename to tests/integration/tests/cabal-sublibrary-dependency/files/Setup.hs diff --git a/test/integration/tests/cabal-sublibrary-dependency/files/files.cabal b/tests/integration/tests/cabal-sublibrary-dependency/files/files.cabal similarity index 100% rename from test/integration/tests/cabal-sublibrary-dependency/files/files.cabal rename to tests/integration/tests/cabal-sublibrary-dependency/files/files.cabal diff --git a/test/integration/tests/cabal-sublibrary-dependency/files/src/Lib.hs b/tests/integration/tests/cabal-sublibrary-dependency/files/src/Lib.hs similarity index 100% rename from test/integration/tests/cabal-sublibrary-dependency/files/src/Lib.hs rename to tests/integration/tests/cabal-sublibrary-dependency/files/src/Lib.hs diff --git a/test/integration/tests/cabal-sublibrary-dependency/files/stack.yaml b/tests/integration/tests/cabal-sublibrary-dependency/files/stack.yaml similarity index 100% rename from test/integration/tests/cabal-sublibrary-dependency/files/stack.yaml rename to tests/integration/tests/cabal-sublibrary-dependency/files/stack.yaml diff --git a/tests/integration/tests/cabal-sublibrary-dependency/files/stack.yaml.lock b/tests/integration/tests/cabal-sublibrary-dependency/files/stack.yaml.lock new file mode 100644 index 0000000000..8e0b3a647f --- /dev/null +++ b/tests/integration/tests/cabal-sublibrary-dependency/files/stack.yaml.lock @@ -0,0 +1,12 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: [] +snapshots: +- completed: + sha256: c4233cb7ff3bc39c1eaad6153615331c9adc624559391142a8b812248a31300d + size: 598787 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/3/4.yaml + original: nightly-2023-03-04 diff --git a/test/integration/tests/cabal-sublibrary-dependency/files/subproject/src/Subproject/Lib.hs b/tests/integration/tests/cabal-sublibrary-dependency/files/subproject/src/Subproject/Lib.hs similarity index 100% rename from test/integration/tests/cabal-sublibrary-dependency/files/subproject/src/Subproject/Lib.hs rename to tests/integration/tests/cabal-sublibrary-dependency/files/subproject/src/Subproject/Lib.hs diff --git a/test/integration/tests/cabal-sublibrary-dependency/files/subproject/src/Subproject/SubLib.hs b/tests/integration/tests/cabal-sublibrary-dependency/files/subproject/src/Subproject/SubLib.hs similarity index 100% rename from test/integration/tests/cabal-sublibrary-dependency/files/subproject/src/Subproject/SubLib.hs rename to tests/integration/tests/cabal-sublibrary-dependency/files/subproject/src/Subproject/SubLib.hs diff --git a/test/integration/tests/cabal-sublibrary-dependency/files/subproject/subproject.cabal b/tests/integration/tests/cabal-sublibrary-dependency/files/subproject/subproject.cabal similarity index 100% rename from test/integration/tests/cabal-sublibrary-dependency/files/subproject/subproject.cabal rename to tests/integration/tests/cabal-sublibrary-dependency/files/subproject/subproject.cabal diff --git a/test/integration/tests/copy-bins-works/Main.hs b/tests/integration/tests/copy-bins-works/Main.hs similarity index 100% rename from test/integration/tests/copy-bins-works/Main.hs rename to tests/integration/tests/copy-bins-works/Main.hs diff --git a/test/integration/tests/copy-bins-works/files/.gitignore b/tests/integration/tests/copy-bins-works/files/.gitignore similarity index 100% rename from test/integration/tests/copy-bins-works/files/.gitignore rename to tests/integration/tests/copy-bins-works/files/.gitignore diff --git a/test/integration/tests/copy-bins-works/files/package.yaml b/tests/integration/tests/copy-bins-works/files/package.yaml similarity index 100% rename from test/integration/tests/copy-bins-works/files/package.yaml rename to tests/integration/tests/copy-bins-works/files/package.yaml diff --git a/test/integration/tests/copy-bins-works/files/src/Main.hs b/tests/integration/tests/copy-bins-works/files/src/Main.hs similarity index 100% rename from test/integration/tests/copy-bins-works/files/src/Main.hs rename to tests/integration/tests/copy-bins-works/files/src/Main.hs diff --git a/test/integration/tests/copy-bins-works/files/stack.yaml b/tests/integration/tests/copy-bins-works/files/stack.yaml similarity index 100% rename from test/integration/tests/copy-bins-works/files/stack.yaml rename to tests/integration/tests/copy-bins-works/files/stack.yaml diff --git a/test/integration/tests/cyclic-test-deps/.gitignore b/tests/integration/tests/cyclic-test-deps/.gitignore similarity index 100% rename from test/integration/tests/cyclic-test-deps/.gitignore rename to tests/integration/tests/cyclic-test-deps/.gitignore diff --git a/test/integration/tests/cyclic-test-deps/Main.hs b/tests/integration/tests/cyclic-test-deps/Main.hs similarity index 100% rename from test/integration/tests/cyclic-test-deps/Main.hs rename to tests/integration/tests/cyclic-test-deps/Main.hs diff --git a/test/integration/tests/drop-packages/Main.hs b/tests/integration/tests/drop-packages/Main.hs similarity index 100% rename from test/integration/tests/drop-packages/Main.hs rename to tests/integration/tests/drop-packages/Main.hs diff --git a/test/integration/tests/drop-packages/files/.gitignore b/tests/integration/tests/drop-packages/files/.gitignore similarity index 100% rename from test/integration/tests/drop-packages/files/.gitignore rename to tests/integration/tests/drop-packages/files/.gitignore diff --git a/test/integration/tests/drop-packages/files/package.yaml b/tests/integration/tests/drop-packages/files/package.yaml similarity index 100% rename from test/integration/tests/drop-packages/files/package.yaml rename to tests/integration/tests/drop-packages/files/package.yaml diff --git a/test/integration/tests/drop-packages/files/stack.yaml b/tests/integration/tests/drop-packages/files/stack.yaml similarity index 100% rename from test/integration/tests/drop-packages/files/stack.yaml rename to tests/integration/tests/drop-packages/files/stack.yaml diff --git a/test/integration/tests/duplicate-package-ids/Main.hs b/tests/integration/tests/duplicate-package-ids/Main.hs similarity index 100% rename from test/integration/tests/duplicate-package-ids/Main.hs rename to tests/integration/tests/duplicate-package-ids/Main.hs diff --git a/test/integration/tests/duplicate-package-ids/files/.gitignore b/tests/integration/tests/duplicate-package-ids/files/.gitignore similarity index 100% rename from test/integration/tests/duplicate-package-ids/files/.gitignore rename to tests/integration/tests/duplicate-package-ids/files/.gitignore diff --git a/test/integration/tests/duplicate-package-ids/files/stack1.yaml b/tests/integration/tests/duplicate-package-ids/files/stack1.yaml similarity index 100% rename from test/integration/tests/duplicate-package-ids/files/stack1.yaml rename to tests/integration/tests/duplicate-package-ids/files/stack1.yaml diff --git a/test/integration/tests/duplicate-package-ids/files/stack2.yaml b/tests/integration/tests/duplicate-package-ids/files/stack2.yaml similarity index 100% rename from test/integration/tests/duplicate-package-ids/files/stack2.yaml rename to tests/integration/tests/duplicate-package-ids/files/stack2.yaml diff --git a/test/integration/tests/ghc-install-hooks/Main.hs b/tests/integration/tests/ghc-install-hooks/Main.hs similarity index 100% rename from test/integration/tests/ghc-install-hooks/Main.hs rename to tests/integration/tests/ghc-install-hooks/Main.hs diff --git a/test/integration/tests/ghc-install-hooks/files/.gitignore b/tests/integration/tests/ghc-install-hooks/files/.gitignore similarity index 100% rename from test/integration/tests/ghc-install-hooks/files/.gitignore rename to tests/integration/tests/ghc-install-hooks/files/.gitignore diff --git a/test/integration/tests/ghc-install-hooks/files/foo.hs b/tests/integration/tests/ghc-install-hooks/files/foo.hs similarity index 100% rename from test/integration/tests/ghc-install-hooks/files/foo.hs rename to tests/integration/tests/ghc-install-hooks/files/foo.hs diff --git a/test/integration/tests/ghc-install-hooks/files/run.sh b/tests/integration/tests/ghc-install-hooks/files/run.sh old mode 100755 new mode 100644 similarity index 100% rename from test/integration/tests/ghc-install-hooks/files/run.sh rename to tests/integration/tests/ghc-install-hooks/files/run.sh diff --git a/test/integration/tests/git-submodules/Main.hs b/tests/integration/tests/git-submodules/Main.hs similarity index 100% rename from test/integration/tests/git-submodules/Main.hs rename to tests/integration/tests/git-submodules/Main.hs diff --git a/test/integration/tests/git-submodules/files/.gitignore b/tests/integration/tests/git-submodules/files/.gitignore similarity index 100% rename from test/integration/tests/git-submodules/files/.gitignore rename to tests/integration/tests/git-submodules/files/.gitignore diff --git a/test/integration/tests/haddock-options/Main.hs b/tests/integration/tests/haddock-options/Main.hs similarity index 100% rename from test/integration/tests/haddock-options/Main.hs rename to tests/integration/tests/haddock-options/Main.hs diff --git a/test/integration/tests/haddock-options/files/haddock-options.cabal b/tests/integration/tests/haddock-options/files/haddock-options.cabal similarity index 100% rename from test/integration/tests/haddock-options/files/haddock-options.cabal rename to tests/integration/tests/haddock-options/files/haddock-options.cabal diff --git a/test/integration/tests/haddock-options/files/src/Lib.hs b/tests/integration/tests/haddock-options/files/src/Lib.hs similarity index 100% rename from test/integration/tests/haddock-options/files/src/Lib.hs rename to tests/integration/tests/haddock-options/files/src/Lib.hs diff --git a/test/integration/tests/haddock-options/files/stack.yaml b/tests/integration/tests/haddock-options/files/stack.yaml similarity index 100% rename from test/integration/tests/haddock-options/files/stack.yaml rename to tests/integration/tests/haddock-options/files/stack.yaml diff --git a/test/integration/tests/hpack-repo/Main.hs b/tests/integration/tests/hpack-repo/Main.hs similarity index 100% rename from test/integration/tests/hpack-repo/Main.hs rename to tests/integration/tests/hpack-repo/Main.hs diff --git a/test/integration/tests/hpack-repo/files/files.cabal b/tests/integration/tests/hpack-repo/files/files.cabal similarity index 100% rename from test/integration/tests/hpack-repo/files/files.cabal rename to tests/integration/tests/hpack-repo/files/files.cabal diff --git a/test/integration/tests/hpack-repo/files/src/Lib.hs b/tests/integration/tests/hpack-repo/files/src/Lib.hs similarity index 100% rename from test/integration/tests/hpack-repo/files/src/Lib.hs rename to tests/integration/tests/hpack-repo/files/src/Lib.hs diff --git a/test/integration/tests/hpack-repo/files/stack.yaml b/tests/integration/tests/hpack-repo/files/stack.yaml similarity index 100% rename from test/integration/tests/hpack-repo/files/stack.yaml rename to tests/integration/tests/hpack-repo/files/stack.yaml diff --git a/test/integration/tests/init-omit-packages/Main.hs b/tests/integration/tests/init-omit-packages/Main.hs similarity index 100% rename from test/integration/tests/init-omit-packages/Main.hs rename to tests/integration/tests/init-omit-packages/Main.hs diff --git a/test/integration/tests/init-omit-packages/files/.gitignore b/tests/integration/tests/init-omit-packages/files/.gitignore similarity index 100% rename from test/integration/tests/init-omit-packages/files/.gitignore rename to tests/integration/tests/init-omit-packages/files/.gitignore diff --git a/test/integration/tests/init-omit-packages/files/bad/Bad.hs b/tests/integration/tests/init-omit-packages/files/bad/Bad.hs similarity index 100% rename from test/integration/tests/init-omit-packages/files/bad/Bad.hs rename to tests/integration/tests/init-omit-packages/files/bad/Bad.hs diff --git a/test/integration/tests/init-omit-packages/files/bad/bad.cabal b/tests/integration/tests/init-omit-packages/files/bad/bad.cabal similarity index 100% rename from test/integration/tests/init-omit-packages/files/bad/bad.cabal rename to tests/integration/tests/init-omit-packages/files/bad/bad.cabal diff --git a/test/integration/tests/init-omit-packages/files/good/Good.hs b/tests/integration/tests/init-omit-packages/files/good/Good.hs similarity index 100% rename from test/integration/tests/init-omit-packages/files/good/Good.hs rename to tests/integration/tests/init-omit-packages/files/good/Good.hs diff --git a/test/integration/tests/init-omit-packages/files/good/good.cabal b/tests/integration/tests/init-omit-packages/files/good/good.cabal similarity index 100% rename from test/integration/tests/init-omit-packages/files/good/good.cabal rename to tests/integration/tests/init-omit-packages/files/good/good.cabal diff --git a/test/integration/tests/internal-libraries/Main.hs b/tests/integration/tests/internal-libraries/Main.hs similarity index 100% rename from test/integration/tests/internal-libraries/Main.hs rename to tests/integration/tests/internal-libraries/Main.hs diff --git a/test/integration/tests/internal-libraries/files/Setup.hs b/tests/integration/tests/internal-libraries/files/Setup.hs similarity index 100% rename from test/integration/tests/internal-libraries/files/Setup.hs rename to tests/integration/tests/internal-libraries/files/Setup.hs diff --git a/test/integration/tests/internal-libraries/files/files.cabal b/tests/integration/tests/internal-libraries/files/files.cabal similarity index 100% rename from test/integration/tests/internal-libraries/files/files.cabal rename to tests/integration/tests/internal-libraries/files/files.cabal diff --git a/test/integration/tests/internal-libraries/files/src-bar/Main.hs b/tests/integration/tests/internal-libraries/files/src-bar/Main.hs similarity index 100% rename from test/integration/tests/internal-libraries/files/src-bar/Main.hs rename to tests/integration/tests/internal-libraries/files/src-bar/Main.hs diff --git a/test/integration/tests/internal-libraries/files/src-baz/Baz.hs b/tests/integration/tests/internal-libraries/files/src-baz/Baz.hs similarity index 100% rename from test/integration/tests/internal-libraries/files/src-baz/Baz.hs rename to tests/integration/tests/internal-libraries/files/src-baz/Baz.hs diff --git a/test/integration/tests/internal-libraries/files/src-foo/Foo.hs b/tests/integration/tests/internal-libraries/files/src-foo/Foo.hs similarity index 100% rename from test/integration/tests/internal-libraries/files/src-foo/Foo.hs rename to tests/integration/tests/internal-libraries/files/src-foo/Foo.hs diff --git a/test/integration/tests/internal-libraries/files/src/Files.hs b/tests/integration/tests/internal-libraries/files/src/Files.hs similarity index 100% rename from test/integration/tests/internal-libraries/files/src/Files.hs rename to tests/integration/tests/internal-libraries/files/src/Files.hs diff --git a/test/integration/tests/internal-libraries/files/stack.yaml b/tests/integration/tests/internal-libraries/files/stack.yaml similarity index 100% rename from test/integration/tests/internal-libraries/files/stack.yaml rename to tests/integration/tests/internal-libraries/files/stack.yaml diff --git a/test/integration/tests/lock-files/Main.hs b/tests/integration/tests/lock-files/Main.hs similarity index 100% rename from test/integration/tests/lock-files/Main.hs rename to tests/integration/tests/lock-files/Main.hs diff --git a/test/integration/tests/lock-files/files/Lib.hs b/tests/integration/tests/lock-files/files/Lib.hs similarity index 100% rename from test/integration/tests/lock-files/files/Lib.hs rename to tests/integration/tests/lock-files/files/Lib.hs diff --git a/test/integration/tests/lock-files/files/package.yaml b/tests/integration/tests/lock-files/files/package.yaml similarity index 100% rename from test/integration/tests/lock-files/files/package.yaml rename to tests/integration/tests/lock-files/files/package.yaml diff --git a/test/integration/tests/lock-files/files/stack-1-extra b/tests/integration/tests/lock-files/files/stack-1-extra similarity index 100% rename from test/integration/tests/lock-files/files/stack-1-extra rename to tests/integration/tests/lock-files/files/stack-1-extra diff --git a/test/integration/tests/lock-files/files/stack-2-extras b/tests/integration/tests/lock-files/files/stack-2-extras similarity index 100% rename from test/integration/tests/lock-files/files/stack-2-extras rename to tests/integration/tests/lock-files/files/stack-2-extras diff --git a/test/integration/tests/module-added-multiple-times/Main.hs b/tests/integration/tests/module-added-multiple-times/Main.hs similarity index 100% rename from test/integration/tests/module-added-multiple-times/Main.hs rename to tests/integration/tests/module-added-multiple-times/Main.hs diff --git a/test/integration/tests/module-added-multiple-times/files/LICENSE b/tests/integration/tests/module-added-multiple-times/files/LICENSE similarity index 100% rename from test/integration/tests/module-added-multiple-times/files/LICENSE rename to tests/integration/tests/module-added-multiple-times/files/LICENSE diff --git a/test/integration/tests/module-added-multiple-times/files/Setup.hs b/tests/integration/tests/module-added-multiple-times/files/Setup.hs similarity index 100% rename from test/integration/tests/module-added-multiple-times/files/Setup.hs rename to tests/integration/tests/module-added-multiple-times/files/Setup.hs diff --git a/test/integration/tests/module-added-multiple-times/files/exe/Main.hs b/tests/integration/tests/module-added-multiple-times/files/exe/Main.hs similarity index 100% rename from test/integration/tests/module-added-multiple-times/files/exe/Main.hs rename to tests/integration/tests/module-added-multiple-times/files/exe/Main.hs diff --git a/test/integration/tests/module-added-multiple-times/files/project-a.cabal b/tests/integration/tests/module-added-multiple-times/files/project-a.cabal similarity index 100% rename from test/integration/tests/module-added-multiple-times/files/project-a.cabal rename to tests/integration/tests/module-added-multiple-times/files/project-a.cabal diff --git a/test/integration/tests/module-added-multiple-times/files/src/Lib/A.hs b/tests/integration/tests/module-added-multiple-times/files/src/Lib/A.hs similarity index 100% rename from test/integration/tests/module-added-multiple-times/files/src/Lib/A.hs rename to tests/integration/tests/module-added-multiple-times/files/src/Lib/A.hs diff --git a/test/integration/tests/module-added-multiple-times/files/stack.yaml b/tests/integration/tests/module-added-multiple-times/files/stack.yaml similarity index 100% rename from test/integration/tests/module-added-multiple-times/files/stack.yaml rename to tests/integration/tests/module-added-multiple-times/files/stack.yaml diff --git a/tests/integration/tests/module-added-multiple-times/files/stack.yaml.lock b/tests/integration/tests/module-added-multiple-times/files/stack.yaml.lock new file mode 100644 index 0000000000..a4a15c4c15 --- /dev/null +++ b/tests/integration/tests/module-added-multiple-times/files/stack.yaml.lock @@ -0,0 +1,12 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: [] +snapshots: +- completed: + sha256: 4c972e067bae16b95961dbfdd12e07f1ee6c8fffabbfa05c3d65100b03f548b7 + size: 650253 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/23.yaml + original: lts-20.23 diff --git a/test/integration/tests/multi-test/Main.hs b/tests/integration/tests/multi-test/Main.hs similarity index 100% rename from test/integration/tests/multi-test/Main.hs rename to tests/integration/tests/multi-test/Main.hs diff --git a/test/integration/tests/multi-test/files/LICENSE b/tests/integration/tests/multi-test/files/LICENSE similarity index 100% rename from test/integration/tests/multi-test/files/LICENSE rename to tests/integration/tests/multi-test/files/LICENSE diff --git a/test/integration/tests/multi-test/files/Setup.hs b/tests/integration/tests/multi-test/files/Setup.hs similarity index 100% rename from test/integration/tests/multi-test/files/Setup.hs rename to tests/integration/tests/multi-test/files/Setup.hs diff --git a/test/integration/tests/multi-test/files/app/Main.hs b/tests/integration/tests/multi-test/files/app/Main.hs similarity index 100% rename from test/integration/tests/multi-test/files/app/Main.hs rename to tests/integration/tests/multi-test/files/app/Main.hs diff --git a/test/integration/tests/multi-test/files/cyclic/Cyclic.hs b/tests/integration/tests/multi-test/files/cyclic/Cyclic.hs similarity index 100% rename from test/integration/tests/multi-test/files/cyclic/Cyclic.hs rename to tests/integration/tests/multi-test/files/cyclic/Cyclic.hs diff --git a/test/integration/tests/multi-test/files/cyclic/LICENSE b/tests/integration/tests/multi-test/files/cyclic/LICENSE similarity index 100% rename from test/integration/tests/multi-test/files/cyclic/LICENSE rename to tests/integration/tests/multi-test/files/cyclic/LICENSE diff --git a/test/integration/tests/multi-test/files/cyclic/Setup.hs b/tests/integration/tests/multi-test/files/cyclic/Setup.hs similarity index 100% rename from test/integration/tests/multi-test/files/cyclic/Setup.hs rename to tests/integration/tests/multi-test/files/cyclic/Setup.hs diff --git a/test/integration/tests/multi-test/files/cyclic/Spec.hs b/tests/integration/tests/multi-test/files/cyclic/Spec.hs similarity index 100% rename from test/integration/tests/multi-test/files/cyclic/Spec.hs rename to tests/integration/tests/multi-test/files/cyclic/Spec.hs diff --git a/test/integration/tests/multi-test/files/cyclic/cyclic.cabal b/tests/integration/tests/multi-test/files/cyclic/cyclic.cabal similarity index 100% rename from test/integration/tests/multi-test/files/cyclic/cyclic.cabal rename to tests/integration/tests/multi-test/files/cyclic/cyclic.cabal diff --git a/test/integration/tests/multi-test/files/multi-test-suite.cabal b/tests/integration/tests/multi-test/files/multi-test-suite.cabal similarity index 100% rename from test/integration/tests/multi-test/files/multi-test-suite.cabal rename to tests/integration/tests/multi-test/files/multi-test-suite.cabal diff --git a/test/integration/tests/multi-test/files/src/Lib.hs b/tests/integration/tests/multi-test/files/src/Lib.hs similarity index 100% rename from test/integration/tests/multi-test/files/src/Lib.hs rename to tests/integration/tests/multi-test/files/src/Lib.hs diff --git a/test/integration/tests/multi-test/files/stack.yaml b/tests/integration/tests/multi-test/files/stack.yaml similarity index 100% rename from test/integration/tests/multi-test/files/stack.yaml rename to tests/integration/tests/multi-test/files/stack.yaml diff --git a/test/integration/tests/multi-test/files/sub-package/src/Lib2.hs b/tests/integration/tests/multi-test/files/sub-package/src/Lib2.hs similarity index 100% rename from test/integration/tests/multi-test/files/sub-package/src/Lib2.hs rename to tests/integration/tests/multi-test/files/sub-package/src/Lib2.hs diff --git a/test/integration/tests/multi-test/files/sub-package/src/main.hs b/tests/integration/tests/multi-test/files/sub-package/src/main.hs similarity index 100% rename from test/integration/tests/multi-test/files/sub-package/src/main.hs rename to tests/integration/tests/multi-test/files/sub-package/src/main.hs diff --git a/test/integration/tests/multi-test/files/sub-package/sub-package.cabal b/tests/integration/tests/multi-test/files/sub-package/sub-package.cabal similarity index 100% rename from test/integration/tests/multi-test/files/sub-package/sub-package.cabal rename to tests/integration/tests/multi-test/files/sub-package/sub-package.cabal diff --git a/test/integration/tests/multi-test/files/sub-package/test/Spec.hs b/tests/integration/tests/multi-test/files/sub-package/test/Spec.hs similarity index 100% rename from test/integration/tests/multi-test/files/sub-package/test/Spec.hs rename to tests/integration/tests/multi-test/files/sub-package/test/Spec.hs diff --git a/test/integration/tests/multi-test/files/test-2/Spec.hs b/tests/integration/tests/multi-test/files/test-2/Spec.hs similarity index 100% rename from test/integration/tests/multi-test/files/test-2/Spec.hs rename to tests/integration/tests/multi-test/files/test-2/Spec.hs diff --git a/test/integration/tests/multi-test/files/test-3/Spec.hs b/tests/integration/tests/multi-test/files/test-3/Spec.hs similarity index 100% rename from test/integration/tests/multi-test/files/test-3/Spec.hs rename to tests/integration/tests/multi-test/files/test-3/Spec.hs diff --git a/test/integration/tests/multi-test/files/test/OtherModule.hs b/tests/integration/tests/multi-test/files/test/OtherModule.hs similarity index 100% rename from test/integration/tests/multi-test/files/test/OtherModule.hs rename to tests/integration/tests/multi-test/files/test/OtherModule.hs diff --git a/test/integration/tests/multi-test/files/test/Spec.hs b/tests/integration/tests/multi-test/files/test/Spec.hs similarity index 100% rename from test/integration/tests/multi-test/files/test/Spec.hs rename to tests/integration/tests/multi-test/files/test/Spec.hs diff --git a/test/integration/tests/mutable-deps/Main.hs b/tests/integration/tests/mutable-deps/Main.hs similarity index 100% rename from test/integration/tests/mutable-deps/Main.hs rename to tests/integration/tests/mutable-deps/Main.hs diff --git a/test/integration/tests/mutable-deps/files/app/Main.hs b/tests/integration/tests/mutable-deps/files/app/Main.hs similarity index 100% rename from test/integration/tests/mutable-deps/files/app/Main.hs rename to tests/integration/tests/mutable-deps/files/app/Main.hs diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/HACKING.md b/tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/HACKING.md similarity index 100% rename from test/integration/tests/mutable-deps/files/filepath-1.4.2.2/HACKING.md rename to tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/HACKING.md diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/LICENSE b/tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/LICENSE similarity index 100% rename from test/integration/tests/mutable-deps/files/filepath-1.4.2.2/LICENSE rename to tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/LICENSE diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/Makefile b/tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/Makefile similarity index 100% rename from test/integration/tests/mutable-deps/files/filepath-1.4.2.2/Makefile rename to tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/Makefile diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/README.md b/tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/README.md similarity index 100% rename from test/integration/tests/mutable-deps/files/filepath-1.4.2.2/README.md rename to tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/README.md diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/Setup.hs b/tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/Setup.hs similarity index 100% rename from test/integration/tests/mutable-deps/files/filepath-1.4.2.2/Setup.hs rename to tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/Setup.hs diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath.hs b/tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath.hs similarity index 100% rename from test/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath.hs rename to tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath.hs diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath/Internal.hs b/tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath/Internal.hs similarity index 100% rename from test/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath/Internal.hs rename to tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath/Internal.hs diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath/Posix.hs b/tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath/Posix.hs similarity index 100% rename from test/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath/Posix.hs rename to tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath/Posix.hs diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath/Windows.hs b/tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath/Windows.hs similarity index 100% rename from test/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath/Windows.hs rename to tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/System/FilePath/Windows.hs diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/changelog.md b/tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/changelog.md similarity index 100% rename from test/integration/tests/mutable-deps/files/filepath-1.4.2.2/changelog.md rename to tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/changelog.md diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/filepath.cabal b/tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/filepath.cabal similarity index 100% rename from test/integration/tests/mutable-deps/files/filepath-1.4.2.2/filepath.cabal rename to tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/filepath.cabal diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/Test.hs b/tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/Test.hs similarity index 100% rename from test/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/Test.hs rename to tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/Test.hs diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/TestGen.hs b/tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/TestGen.hs similarity index 100% rename from test/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/TestGen.hs rename to tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/TestGen.hs diff --git a/test/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/TestUtil.hs b/tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/TestUtil.hs similarity index 100% rename from test/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/TestUtil.hs rename to tests/integration/tests/mutable-deps/files/filepath-1.4.2.2/tests/TestUtil.hs diff --git a/test/integration/tests/mutable-deps/files/files.cabal b/tests/integration/tests/mutable-deps/files/files.cabal similarity index 100% rename from test/integration/tests/mutable-deps/files/files.cabal rename to tests/integration/tests/mutable-deps/files/files.cabal diff --git a/test/integration/tests/mutable-deps/files/src/Files.hs b/tests/integration/tests/mutable-deps/files/src/Files.hs similarity index 100% rename from test/integration/tests/mutable-deps/files/src/Files.hs rename to tests/integration/tests/mutable-deps/files/src/Files.hs diff --git a/test/integration/tests/mutable-deps/files/stack.yaml b/tests/integration/tests/mutable-deps/files/stack.yaml similarity index 100% rename from test/integration/tests/mutable-deps/files/stack.yaml rename to tests/integration/tests/mutable-deps/files/stack.yaml diff --git a/test/integration/tests/nice-resolver-names/Main.hs b/tests/integration/tests/nice-resolver-names/Main.hs similarity index 100% rename from test/integration/tests/nice-resolver-names/Main.hs rename to tests/integration/tests/nice-resolver-names/Main.hs diff --git a/test/integration/tests/nice-resolver-names/files/.gitignore b/tests/integration/tests/nice-resolver-names/files/.gitignore similarity index 100% rename from test/integration/tests/nice-resolver-names/files/.gitignore rename to tests/integration/tests/nice-resolver-names/files/.gitignore diff --git a/test/integration/tests/nice-resolver-names/files/package.yaml b/tests/integration/tests/nice-resolver-names/files/package.yaml similarity index 100% rename from test/integration/tests/nice-resolver-names/files/package.yaml rename to tests/integration/tests/nice-resolver-names/files/package.yaml diff --git a/test/integration/tests/no-rerun-tests/Main.hs b/tests/integration/tests/no-rerun-tests/Main.hs similarity index 100% rename from test/integration/tests/no-rerun-tests/Main.hs rename to tests/integration/tests/no-rerun-tests/Main.hs diff --git a/test/integration/tests/no-rerun-tests/files/.gitignore b/tests/integration/tests/no-rerun-tests/files/.gitignore similarity index 100% rename from test/integration/tests/no-rerun-tests/files/.gitignore rename to tests/integration/tests/no-rerun-tests/files/.gitignore diff --git a/test/integration/tests/no-rerun-tests/files/package.yaml b/tests/integration/tests/no-rerun-tests/files/package.yaml similarity index 100% rename from test/integration/tests/no-rerun-tests/files/package.yaml rename to tests/integration/tests/no-rerun-tests/files/package.yaml diff --git a/test/integration/tests/no-rerun-tests/files/stack.yaml b/tests/integration/tests/no-rerun-tests/files/stack.yaml similarity index 100% rename from test/integration/tests/no-rerun-tests/files/stack.yaml rename to tests/integration/tests/no-rerun-tests/files/stack.yaml diff --git a/test/integration/tests/no-rerun-tests/files/test/Spec.hs b/tests/integration/tests/no-rerun-tests/files/test/Spec.hs similarity index 100% rename from test/integration/tests/no-rerun-tests/files/test/Spec.hs rename to tests/integration/tests/no-rerun-tests/files/test/Spec.hs diff --git a/test/integration/tests/override-compiler/Main.hs b/tests/integration/tests/override-compiler/Main.hs similarity index 100% rename from test/integration/tests/override-compiler/Main.hs rename to tests/integration/tests/override-compiler/Main.hs diff --git a/test/integration/tests/override-compiler/files/stack.yaml b/tests/integration/tests/override-compiler/files/stack.yaml similarity index 100% rename from test/integration/tests/override-compiler/files/stack.yaml rename to tests/integration/tests/override-compiler/files/stack.yaml diff --git a/test/integration/tests/proper-rebuilds/Main.hs b/tests/integration/tests/proper-rebuilds/Main.hs similarity index 100% rename from test/integration/tests/proper-rebuilds/Main.hs rename to tests/integration/tests/proper-rebuilds/Main.hs diff --git a/test/integration/tests/proper-rebuilds/files/.gitignore b/tests/integration/tests/proper-rebuilds/files/.gitignore similarity index 100% rename from test/integration/tests/proper-rebuilds/files/.gitignore rename to tests/integration/tests/proper-rebuilds/files/.gitignore diff --git a/test/integration/tests/proper-rebuilds/files/app/Main.hs b/tests/integration/tests/proper-rebuilds/files/app/Main.hs similarity index 100% rename from test/integration/tests/proper-rebuilds/files/app/Main.hs rename to tests/integration/tests/proper-rebuilds/files/app/Main.hs diff --git a/test/integration/tests/proper-rebuilds/files/files.cabal b/tests/integration/tests/proper-rebuilds/files/files.cabal similarity index 100% rename from test/integration/tests/proper-rebuilds/files/files.cabal rename to tests/integration/tests/proper-rebuilds/files/files.cabal diff --git a/test/integration/tests/proper-rebuilds/files/src/Lib.hs.v1 b/tests/integration/tests/proper-rebuilds/files/src/Lib.hs.v1 similarity index 100% rename from test/integration/tests/proper-rebuilds/files/src/Lib.hs.v1 rename to tests/integration/tests/proper-rebuilds/files/src/Lib.hs.v1 diff --git a/test/integration/tests/proper-rebuilds/files/src/Lib.hs.v2 b/tests/integration/tests/proper-rebuilds/files/src/Lib.hs.v2 similarity index 100% rename from test/integration/tests/proper-rebuilds/files/src/Lib.hs.v2 rename to tests/integration/tests/proper-rebuilds/files/src/Lib.hs.v2 diff --git a/test/integration/tests/proper-rebuilds/files/stack.yaml b/tests/integration/tests/proper-rebuilds/files/stack.yaml similarity index 100% rename from test/integration/tests/proper-rebuilds/files/stack.yaml rename to tests/integration/tests/proper-rebuilds/files/stack.yaml diff --git a/test/integration/tests/relative-script-snapshots/Main.hs b/tests/integration/tests/relative-script-snapshots/Main.hs similarity index 100% rename from test/integration/tests/relative-script-snapshots/Main.hs rename to tests/integration/tests/relative-script-snapshots/Main.hs diff --git a/test/integration/tests/relative-script-snapshots/files/subdir/script.hs b/tests/integration/tests/relative-script-snapshots/files/subdir/script.hs similarity index 100% rename from test/integration/tests/relative-script-snapshots/files/subdir/script.hs rename to tests/integration/tests/relative-script-snapshots/files/subdir/script.hs diff --git a/test/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml b/tests/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml similarity index 100% rename from test/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml rename to tests/integration/tests/relative-script-snapshots/files/subdir/snapshot.yaml diff --git a/test/integration/tests/sanity/Main.hs b/tests/integration/tests/sanity/Main.hs similarity index 100% rename from test/integration/tests/sanity/Main.hs rename to tests/integration/tests/sanity/Main.hs diff --git a/test/integration/tests/sanity/files/.gitignore b/tests/integration/tests/sanity/files/.gitignore similarity index 100% rename from test/integration/tests/sanity/files/.gitignore rename to tests/integration/tests/sanity/files/.gitignore diff --git a/test/integration/tests/sanity/files/foo.bat b/tests/integration/tests/sanity/files/foo.bat similarity index 100% rename from test/integration/tests/sanity/files/foo.bat rename to tests/integration/tests/sanity/files/foo.bat diff --git a/test/integration/tests/sanity/files/foo.sh b/tests/integration/tests/sanity/files/foo.sh similarity index 100% rename from test/integration/tests/sanity/files/foo.sh rename to tests/integration/tests/sanity/files/foo.sh diff --git a/test/integration/tests/script-extra-dep/Main.hs b/tests/integration/tests/script-extra-dep/Main.hs similarity index 100% rename from test/integration/tests/script-extra-dep/Main.hs rename to tests/integration/tests/script-extra-dep/Main.hs diff --git a/test/integration/tests/script-extra-dep/files/script.hs b/tests/integration/tests/script-extra-dep/files/script.hs similarity index 100% rename from test/integration/tests/script-extra-dep/files/script.hs rename to tests/integration/tests/script-extra-dep/files/script.hs diff --git a/test/integration/tests/skip-unreachable-dirs/Main.hs b/tests/integration/tests/skip-unreachable-dirs/Main.hs similarity index 100% rename from test/integration/tests/skip-unreachable-dirs/Main.hs rename to tests/integration/tests/skip-unreachable-dirs/Main.hs diff --git a/test/integration/tests/skip-unreachable-dirs/files/.gitignore b/tests/integration/tests/skip-unreachable-dirs/files/.gitignore similarity index 100% rename from test/integration/tests/skip-unreachable-dirs/files/.gitignore rename to tests/integration/tests/skip-unreachable-dirs/files/.gitignore diff --git a/test/integration/tests/skip-unreachable-dirs/files/foo.cabal b/tests/integration/tests/skip-unreachable-dirs/files/foo.cabal similarity index 100% rename from test/integration/tests/skip-unreachable-dirs/files/foo.cabal rename to tests/integration/tests/skip-unreachable-dirs/files/foo.cabal diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/Main.hs b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/Main.hs similarity index 100% rename from test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/Main.hs rename to tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/Main.hs diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/.gitignore b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/.gitignore similarity index 100% rename from test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/.gitignore rename to tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/.gitignore diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/README.md b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/README.md similarity index 100% rename from test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/README.md rename to tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/README.md diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml similarity index 100% rename from test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml rename to tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-extra-dep.yaml diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-snapshot.yaml b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-snapshot.yaml similarity index 100% rename from test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-snapshot.yaml rename to tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/as-snapshot.yaml diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/package.yaml b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/package.yaml similarity index 100% rename from test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/package.yaml rename to tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/package.yaml diff --git a/test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml similarity index 100% rename from test/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml rename to tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/files/snapshot.yaml diff --git a/test/integration/tests/upload/Main.hs b/tests/integration/tests/upload/Main.hs similarity index 100% rename from test/integration/tests/upload/Main.hs rename to tests/integration/tests/upload/Main.hs diff --git a/test/integration/tests/upload/files/FakeHackage.hs b/tests/integration/tests/upload/files/FakeHackage.hs similarity index 100% rename from test/integration/tests/upload/files/FakeHackage.hs rename to tests/integration/tests/upload/files/FakeHackage.hs diff --git a/test/integration/tests/upload/files/FakeHackageStart.hs b/tests/integration/tests/upload/files/FakeHackageStart.hs similarity index 100% rename from test/integration/tests/upload/files/FakeHackageStart.hs rename to tests/integration/tests/upload/files/FakeHackageStart.hs diff --git a/test/integration/tests/upload/files/Foo.hs b/tests/integration/tests/upload/files/Foo.hs similarity index 100% rename from test/integration/tests/upload/files/Foo.hs rename to tests/integration/tests/upload/files/Foo.hs diff --git a/test/integration/tests/upload/files/gpg-disabled/gpg b/tests/integration/tests/upload/files/gpg-disabled/gpg old mode 100755 new mode 100644 similarity index 100% rename from test/integration/tests/upload/files/gpg-disabled/gpg rename to tests/integration/tests/upload/files/gpg-disabled/gpg diff --git a/test/integration/tests/upload/files/gpg-disabled/gpg.bat b/tests/integration/tests/upload/files/gpg-disabled/gpg.bat similarity index 100% rename from test/integration/tests/upload/files/gpg-disabled/gpg.bat rename to tests/integration/tests/upload/files/gpg-disabled/gpg.bat diff --git a/test/integration/tests/upload/files/gpg-disabled/gpg2 b/tests/integration/tests/upload/files/gpg-disabled/gpg2 similarity index 100% rename from test/integration/tests/upload/files/gpg-disabled/gpg2 rename to tests/integration/tests/upload/files/gpg-disabled/gpg2 diff --git a/test/integration/tests/upload/files/gpg-disabled/gpg2.bat b/tests/integration/tests/upload/files/gpg-disabled/gpg2.bat similarity index 100% rename from test/integration/tests/upload/files/gpg-disabled/gpg2.bat rename to tests/integration/tests/upload/files/gpg-disabled/gpg2.bat diff --git a/test/integration/tests/upload/files/stack.yaml b/tests/integration/tests/upload/files/stack.yaml similarity index 100% rename from test/integration/tests/upload/files/stack.yaml rename to tests/integration/tests/upload/files/stack.yaml diff --git a/test/integration/tests/upload/files/uploadtest.cabal b/tests/integration/tests/upload/files/uploadtest.cabal similarity index 100% rename from test/integration/tests/upload/files/uploadtest.cabal rename to tests/integration/tests/upload/files/uploadtest.cabal diff --git a/test/integration/tests/variables-in-template-file-names/Main.hs b/tests/integration/tests/variables-in-template-file-names/Main.hs similarity index 100% rename from test/integration/tests/variables-in-template-file-names/Main.hs rename to tests/integration/tests/variables-in-template-file-names/Main.hs diff --git a/test/integration/tests/variables-in-template-file-names/files/.gitignore b/tests/integration/tests/variables-in-template-file-names/files/.gitignore similarity index 100% rename from test/integration/tests/variables-in-template-file-names/files/.gitignore rename to tests/integration/tests/variables-in-template-file-names/files/.gitignore diff --git a/test/integration/tests/variables-in-template-file-names/files/template.hsfiles b/tests/integration/tests/variables-in-template-file-names/files/template.hsfiles similarity index 100% rename from test/integration/tests/variables-in-template-file-names/files/template.hsfiles rename to tests/integration/tests/variables-in-template-file-names/files/template.hsfiles diff --git a/test/integration/tests/watched-files/Main.hs b/tests/integration/tests/watched-files/Main.hs similarity index 100% rename from test/integration/tests/watched-files/Main.hs rename to tests/integration/tests/watched-files/Main.hs diff --git a/test/integration/tests/watched-files/files/.gitignore b/tests/integration/tests/watched-files/files/.gitignore similarity index 100% rename from test/integration/tests/watched-files/files/.gitignore rename to tests/integration/tests/watched-files/files/.gitignore diff --git a/test/integration/tests/watched-files/files/Main.hs b/tests/integration/tests/watched-files/files/Main.hs similarity index 100% rename from test/integration/tests/watched-files/files/Main.hs rename to tests/integration/tests/watched-files/files/Main.hs diff --git a/test/integration/tests/watched-files/files/package.yaml b/tests/integration/tests/watched-files/files/package.yaml similarity index 100% rename from test/integration/tests/watched-files/files/package.yaml rename to tests/integration/tests/watched-files/files/package.yaml diff --git a/test/integration/tests/watched-files/files/stack.yaml b/tests/integration/tests/watched-files/files/stack.yaml similarity index 100% rename from test/integration/tests/watched-files/files/stack.yaml rename to tests/integration/tests/watched-files/files/stack.yaml diff --git a/src/test/Spec.hs b/tests/unit/Spec.hs similarity index 100% rename from src/test/Spec.hs rename to tests/unit/Spec.hs diff --git a/src/test/Stack/ArgsSpec.hs b/tests/unit/Stack/ArgsSpec.hs similarity index 100% rename from src/test/Stack/ArgsSpec.hs rename to tests/unit/Stack/ArgsSpec.hs diff --git a/src/test/Stack/Build/ExecuteSpec.hs b/tests/unit/Stack/Build/ExecuteSpec.hs similarity index 100% rename from src/test/Stack/Build/ExecuteSpec.hs rename to tests/unit/Stack/Build/ExecuteSpec.hs diff --git a/src/test/Stack/Build/TargetSpec.hs b/tests/unit/Stack/Build/TargetSpec.hs similarity index 100% rename from src/test/Stack/Build/TargetSpec.hs rename to tests/unit/Stack/Build/TargetSpec.hs diff --git a/src/test/Stack/Config/DockerSpec.hs b/tests/unit/Stack/Config/DockerSpec.hs similarity index 100% rename from src/test/Stack/Config/DockerSpec.hs rename to tests/unit/Stack/Config/DockerSpec.hs diff --git a/src/test/Stack/ConfigSpec.hs b/tests/unit/Stack/ConfigSpec.hs similarity index 100% rename from src/test/Stack/ConfigSpec.hs rename to tests/unit/Stack/ConfigSpec.hs diff --git a/src/test/Stack/DotSpec.hs b/tests/unit/Stack/DotSpec.hs similarity index 100% rename from src/test/Stack/DotSpec.hs rename to tests/unit/Stack/DotSpec.hs diff --git a/src/test/Stack/Ghci/ScriptSpec.hs b/tests/unit/Stack/Ghci/ScriptSpec.hs similarity index 100% rename from src/test/Stack/Ghci/ScriptSpec.hs rename to tests/unit/Stack/Ghci/ScriptSpec.hs diff --git a/src/test/Stack/GhciSpec.hs b/tests/unit/Stack/GhciSpec.hs similarity index 100% rename from src/test/Stack/GhciSpec.hs rename to tests/unit/Stack/GhciSpec.hs diff --git a/src/test/Stack/LockSpec.hs b/tests/unit/Stack/LockSpec.hs similarity index 100% rename from src/test/Stack/LockSpec.hs rename to tests/unit/Stack/LockSpec.hs diff --git a/src/test/Stack/NixSpec.hs b/tests/unit/Stack/NixSpec.hs similarity index 100% rename from src/test/Stack/NixSpec.hs rename to tests/unit/Stack/NixSpec.hs diff --git a/src/test/Stack/PackageDumpSpec.hs b/tests/unit/Stack/PackageDumpSpec.hs similarity index 97% rename from src/test/Stack/PackageDumpSpec.hs rename to tests/unit/Stack/PackageDumpSpec.hs index a262ec6d2d..e292b76c89 100644 --- a/src/test/Stack/PackageDumpSpec.hs +++ b/tests/unit/Stack/PackageDumpSpec.hs @@ -78,7 +78,7 @@ spec = do describe "conduitDumpPackage" $ do it "ghc 7.8" $ do haskell2010:_ <- - withSourceFile "test/package-dump/ghc-7.8.txt" $ \src -> + withSourceFile "tests/unit/package-dump/ghc-7.8.txt" $ \src -> runConduit $ src .| decodeUtf8 @@ -109,7 +109,7 @@ spec = do it "ghc 7.10" $ do haskell2010:_ <- - withSourceFile "test/package-dump/ghc-7.10.txt" $ \src -> + withSourceFile "tests/unit/package-dump/ghc-7.10.txt" $ \src -> runConduit $ src .| decodeUtf8 @@ -150,7 +150,7 @@ spec = do } it "ghc 7.8.4 (osx)" $ do hmatrix:_ <- - withSourceFile "test/package-dump/ghc-7.8.4-osx.txt" $ \src -> + withSourceFile "tests/unit/package-dump/ghc-7.8.4-osx.txt" $ \src -> runConduit $ src .| decodeUtf8 @@ -189,7 +189,7 @@ spec = do } it "ghc HEAD" $ do ghcBoot:_ <- - withSourceFile "test/package-dump/ghc-head.txt" $ \src -> + withSourceFile "tests/unit/package-dump/ghc-head.txt" $ \src -> runConduit $ src .| decodeUtf8 diff --git a/src/test/Stack/Types/TemplateNameSpec.hs b/tests/unit/Stack/Types/TemplateNameSpec.hs similarity index 100% rename from src/test/Stack/Types/TemplateNameSpec.hs rename to tests/unit/Stack/Types/TemplateNameSpec.hs diff --git a/src/test/Stack/Untar/README.md b/tests/unit/Stack/Untar/README.md similarity index 100% rename from src/test/Stack/Untar/README.md rename to tests/unit/Stack/Untar/README.md diff --git a/src/test/Stack/Untar/createFiles.sh b/tests/unit/Stack/Untar/createFiles.sh old mode 100755 new mode 100644 similarity index 100% rename from src/test/Stack/Untar/createFiles.sh rename to tests/unit/Stack/Untar/createFiles.sh diff --git a/src/test/Stack/Untar/test1.tar.gz b/tests/unit/Stack/Untar/test1.tar.gz similarity index 100% rename from src/test/Stack/Untar/test1.tar.gz rename to tests/unit/Stack/Untar/test1.tar.gz diff --git a/src/test/Stack/Untar/test2.tar.gz b/tests/unit/Stack/Untar/test2.tar.gz similarity index 100% rename from src/test/Stack/Untar/test2.tar.gz rename to tests/unit/Stack/Untar/test2.tar.gz diff --git a/src/test/Stack/UploadSpec.hs b/tests/unit/Stack/UploadSpec.hs similarity index 100% rename from src/test/Stack/UploadSpec.hs rename to tests/unit/Stack/UploadSpec.hs diff --git a/test/package-dump/ghc-7.10.txt b/tests/unit/package-dump/ghc-7.10.txt similarity index 100% rename from test/package-dump/ghc-7.10.txt rename to tests/unit/package-dump/ghc-7.10.txt diff --git a/test/package-dump/ghc-7.8.4-osx.txt b/tests/unit/package-dump/ghc-7.8.4-osx.txt similarity index 100% rename from test/package-dump/ghc-7.8.4-osx.txt rename to tests/unit/package-dump/ghc-7.8.4-osx.txt diff --git a/test/package-dump/ghc-7.8.txt b/tests/unit/package-dump/ghc-7.8.txt similarity index 100% rename from test/package-dump/ghc-7.8.txt rename to tests/unit/package-dump/ghc-7.8.txt diff --git a/test/package-dump/ghc-head.txt b/tests/unit/package-dump/ghc-head.txt similarity index 100% rename from test/package-dump/ghc-head.txt rename to tests/unit/package-dump/ghc-head.txt diff --git a/src/test/unix/Stack/Ghci/FakePaths.hs b/tests/unit/unix/Stack/Ghci/FakePaths.hs similarity index 100% rename from src/test/unix/Stack/Ghci/FakePaths.hs rename to tests/unit/unix/Stack/Ghci/FakePaths.hs diff --git a/src/test/windows/Stack/Ghci/FakePaths.hs b/tests/unit/windows/Stack/Ghci/FakePaths.hs similarity index 100% rename from src/test/windows/Stack/Ghci/FakePaths.hs rename to tests/unit/windows/Stack/Ghci/FakePaths.hs