Fix #6230 Reorganise repository folders

Author: mpilgrem

.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

.hlint-test.yaml

@@ -9,7 +9,10 @@
   - name:
     - NoImplicitPrelude
     - CPP
+    - OverloadedLists
     - OverloadedStrings
+    - QuasiQuotes
+    - RecordWildCards
     - ScopedTypeVariables
     - TemplateHaskell
     - ViewPatterns

CONTRIBUTING.md

@@ -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:

doc/ide_command.md

@@ -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

package.yaml

@@ -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
 

stack.cabal

@@ -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: []

test/integration/.gitignore renamed to tests/integration/.gitignore

@@ -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: []

test/integration/IntegrationSpec.hs renamed to tests/integration/IntegrationSpec.hs

@@ -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

test/integration/README.md renamed to tests/integration/README.md

@@ -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: []