@@ -1,6 +1,6 @@
11# This Travis job script has been generated by a script via
22#
3−# runghc make_travis_yml_2.hs '--doctest' '--doctest-options=-i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen' '--hlint' '-o' '.travis.yml' 'cabal2nix.cabal'
3+# runghc make_travis_yml_2.hs '--no-installed' '--doctest' '--doctest-options=-i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen' '--hlint' '-o' '.travis.yml' 'cabal2nix.cabal'
44#
55# For more information, see https://github.com/hvr/multi-ghc-travis
66#
@@ -64,7 +64,7 @@ install:
6464 - rm -f cabal.project.freeze
6565 - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
6666 - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
67− - rm -rf "."/.ghc.environment.* "."/dist
67+ - rm -rf .ghc.environment.* "."/dist
6868 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
6969
7070# Here starts the actual work to be performed for the package under test;
@@ -80,11 +80,10 @@ script:
8080 # this builds all libraries and executables (without tests/benchmarks)
8181 - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
8282
83− # Build with installed constraints for packages in global-db
84− - if $INSTALLED; then echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/\([a-zA-Z0-9-]\{1,\}\) */--constraint="\1 installed" /g') all | sh; else echo "Not building with installed constraints"; fi
8583
8684 # build & run tests, build benchmarks
8785 - cabal new-build -w ${HC} ${TEST} ${BENCH} all
86+ - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi
8887
8988 # doctest
9089 - if [ $HCNUMVER -ge 80000 ]; then (cd cabal2nix-* && doctest -i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen src); fi
@@ -99,5 +98,5 @@ script:
9998 - rm -rf ./dist-newstyle
10099 - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
101100
102−# REGENDATA ["--doctest","--doctest-options=-i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen","--hlint","-o",".travis.yml","cabal2nix.cabal"]
101+# REGENDATA ["--no-installed","--doctest","--doctest-options=-i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen","--hlint","-o",".travis.yml","cabal2nix.cabal"]
103102# EOF