Break tests dependency cycle

- move source to src/
- Use symbolic links for package replicas

Author: phadej

.travis.yml

@@ -1,6 +1,6 @@
 # This Travis job script has been generated by a script via
 #
-#   haskell-ci 'text.cabal'
+#   haskell-ci '--config=cabal.haskell-ci' 'cabal.project'
 #
 # To regenerate the script (for example after adjusting tested-with) run
 #
@@ -85,6 +85,7 @@ before_install:
   - set -o pipefail
   - TEST=--enable-tests
   - BENCH=--enable-benchmarks
+  - if [ $HCNUMVER -lt 70400 ] ; then BENCH=--disable-benchmarks ; fi
   - HEADHACKAGE=false
   - rm -f $CABALHOME/config
   - |
@@ -117,18 +118,28 @@ install:
   - touch cabal.project
   - |
     echo "packages: ." >> cabal.project
+    echo "packages: tests" >> cabal.project
+    echo "packages: th-tests" >> cabal.project
+    if [ $HCNUMVER -ge 71000 ] ; then echo "packages: benchmarks" >> cabal.project ; fi
   - if [ $HCNUMVER -ge 80200 ] ; then echo 'package text' >> cabal.project ; fi
   - "if [ $HCNUMVER -ge 80200 ] ; then echo '  ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
+  - if [ $HCNUMVER -ge 80200 ] ; then echo 'package text-tests' >> cabal.project ; fi
+  - "if [ $HCNUMVER -ge 80200 ] ; then echo '  ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
+  - if [ $HCNUMVER -ge 80200 ] ; then echo 'package th-tests' >> cabal.project ; fi
+  - "if [ $HCNUMVER -ge 80200 ] ; then echo '  ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
+  - if [ $HCNUMVER -ge 80200 ] ; then echo 'package text-benchmarks' >> cabal.project ; fi
+  - "if [ $HCNUMVER -ge 80200 ] ; then echo '  ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
   - |
-  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(text)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
+  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(parsec|text|text-benchmarks|text-tests|th-tests)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
   - cat cabal.project || true
   - cat cabal.project.local || true
   - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
+  - if [ -f "tests/configure.ac" ]; then (cd "tests" && autoreconf -i); fi
+  - if [ -f "th-tests/configure.ac" ]; then (cd "th-tests" && autoreconf -i); fi
+  - if [ -f "benchmarks/configure.ac" ]; then (cd "benchmarks" && autoreconf -i); fi
   - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
   - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
   - rm  cabal.project.freeze
-  - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
-  - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
 script:
   - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
   # Packaging...
@@ -139,15 +150,27 @@ script:
   - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
   - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm       '{}' \;
   - PKGDIR_text="$(find . -maxdepth 1 -type d -regex '.*/text-[0-9.]*')"
+  - PKGDIR_text_tests="$(find . -maxdepth 1 -type d -regex '.*/text-tests-[0-9.]*')"
+  - PKGDIR_th_tests="$(find . -maxdepth 1 -type d -regex '.*/th-tests-[0-9.]*')"
+  - PKGDIR_text_benchmarks="$(find . -maxdepth 1 -type d -regex '.*/text-benchmarks-[0-9.]*')"
   # Generate cabal.project
   - rm -rf cabal.project cabal.project.local cabal.project.freeze
   - touch cabal.project
   - |
     echo "packages: ${PKGDIR_text}" >> cabal.project
+    echo "packages: ${PKGDIR_text_tests}" >> cabal.project
+    echo "packages: ${PKGDIR_th_tests}" >> cabal.project
+    if [ $HCNUMVER -ge 71000 ] ; then echo "packages: ${PKGDIR_text_benchmarks}" >> cabal.project ; fi
   - if [ $HCNUMVER -ge 80200 ] ; then echo 'package text' >> cabal.project ; fi
   - "if [ $HCNUMVER -ge 80200 ] ; then echo '  ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
+  - if [ $HCNUMVER -ge 80200 ] ; then echo 'package text-tests' >> cabal.project ; fi
+  - "if [ $HCNUMVER -ge 80200 ] ; then echo '  ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
+  - if [ $HCNUMVER -ge 80200 ] ; then echo 'package th-tests' >> cabal.project ; fi
+  - "if [ $HCNUMVER -ge 80200 ] ; then echo '  ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
+  - if [ $HCNUMVER -ge 80200 ] ; then echo 'package text-benchmarks' >> cabal.project ; fi
+  - "if [ $HCNUMVER -ge 80200 ] ; then echo '  ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
   - |
-  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(text)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
+  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(parsec|text|text-benchmarks|text-tests|th-tests)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
   - cat cabal.project || true
   - cat cabal.project.local || true
   # Building...
@@ -160,11 +183,14 @@ script:
   - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all
   # cabal check...
   - (cd ${PKGDIR_text} && ${CABAL} -vnormal check)
+  - (cd ${PKGDIR_text_tests} && ${CABAL} -vnormal check)
+  - (cd ${PKGDIR_th_tests} && ${CABAL} -vnormal check)
+  - if [ $HCNUMVER -ge 71000 ] ; then (cd ${PKGDIR_text_benchmarks} && ${CABAL} -vnormal check) ; fi
   # haddock...
   - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
   # Building without installed constraints for packages in global-db...
   - rm -f cabal.project.local
   - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
 
-# REGENDATA ("0.10.1",["text.cabal"])
+# REGENDATA ("0.10.1",["--config=cabal.haskell-ci","cabal.project"])
 # EOF

benchmarks/LICENSE

@@ -0,0 +1 @@
+../LICENSE

benchmarks/cbits

@@ -0,0 +1 @@
+../cbits

benchmarks/cbits/time_iconv.c renamed to benchmarks/cbits-bench/time_iconv.c

@@ -0,0 +1 @@
+../include

benchmarks/include

@@ -0,0 +1 @@
+../src

benchmarks/src

@@ -2,17 +2,22 @@ cabal-version:       1.12
 name:                text-benchmarks
 version:             0.0.0.0
 synopsis:            Benchmarks for the text package
-description:         Benchmarks for the text package
+description:         Benchmarks for the text package.
 homepage:            https://bitbucket.org/bos/text
 license:             BSD2
-license-file:        ../LICENSE
+license-file:        LICENSE
 author:              Jasper Van der Jeugt <[email protected]>,
                      Bryan O'Sullivan <[email protected]>,
                      Tom Harper <[email protected]>,
                      Duncan Coutts <[email protected]>
 maintainer:          [email protected]
 category:            Text
 build-type:          Simple
+tested-with:    GHC==8.10.1, GHC==8.8.3, GHC==8.6.5, GHC==8.4.4,
+                GHC==8.2.2, GHC==8.0.2, GHC==7.10.3
+
+extra-source-files:
+    include/*.h
 
 flag bytestring-builder
   description: Depend on the bytestring-builder package for backwards compatibility.
@@ -54,7 +59,7 @@ executable text-benchmarks
     build-depends: bytestring         >= 0.10.4
 
   -- modules for benchmark proper
-  c-sources:      cbits/time_iconv.c
+  c-sources:      cbits-bench/time_iconv.c
   hs-source-dirs: haskell
   main-is:        Benchmarks.hs
   other-modules:
@@ -81,9 +86,9 @@ executable text-benchmarks
 
   -- Source code for IUT (implementation under test)
   -- "borrowed" from parent folder
-  include-dirs:   ../include
-  c-sources:      ../cbits/cbits.c
-  hs-source-dirs: ..
+  include-dirs:   include
+  c-sources:      cbits/cbits.c
+  hs-source-dirs: src
   other-modules:
     Data.Text
     Data.Text.Array
@@ -132,6 +137,7 @@ executable text-benchmarks
 
   default-language: Haskell2010
   default-extensions: NondecreasingIndentation
+  other-extensions: DeriveAnyClass
 
 
 executable text-multilang

benchmarks/text-benchmarks.cabal

@@ -0,0 +1,5 @@
+benchmarks: >=7.4
+jobs-selection: any
+
+installed: +all -text -parsec
+install-dependencies: False

cabal.haskell-ci

@@ -1,3 +1,6 @@
 -- See http://cabal.readthedocs.io/en/latest/nix-local-build-overview.html
-packages: ., benchmarks, th-tests
+packages: .
+packages: tests
+packages: th-tests
+packages: benchmarks
 tests: True