Fix paths.

Author: 23Skidoo

Cabal/doc/nix-local-build.rst

@@ -188,11 +188,13 @@ version of cabal-install:
    defining a library built with GHC 8.0.1 on 64-bit Linux is
    ``dist-newstyle/build/x86_64-linux/ghc-8.0.1/p-0.1``. When
    per-component builds are enabled (any non-Custom package), a
-   subcomponent like an executable or test suite named ``pexe`` will be
+   subcomponent like an executable or named ``pexe`` will be
    stored at
-   ``dist-newstyle/build/x86_64-linux/ghc-8.0.1/p-0.1/c/pexe``; thus,
+   ``dist-newstyle/build/x86_64-linux/ghc-8.0.1/p-0.1/x/pexe``; thus,
    the full path of the executable is
-   ``dist-newstyle/build/x86_64-linux/ghc-8.0.1/p-0.1/c/pexe/build/pexe/pexe``
+   ``dist-newstyle/build/x86_64-linux/ghc-8.0.1/p-0.1/x/pexe/build/pexe/pexe``.
+   If a component is a test suite, `x` is replaced with `t`, and for benchmarks
+   with `b` - so you get paths like `.../t/ptest/...` and `.../b/pbench/...`
    (you can see why we want this to be an implementation detail!)
 
 The paths are a bit longer in HEAD but the benefit is that you can

travis-common.sh

@@ -16,7 +16,7 @@ CABAL_TESTSUITE_BDIR="${TRAVIS_BUILD_DIR}/dist-newstyle/build/$ARCH/ghc-$GHCVER/
 CABAL_INSTALL_BDIR="${TRAVIS_BUILD_DIR}/dist-newstyle/build/$ARCH/ghc-$GHCVER/cabal-install-${CABAL_VERSION}"
 CABAL_INSTALL_SETUP="${CABAL_INSTALL_BDIR}/setup/setup"
 SOLVER_BENCHMARKS_BDIR="${TRAVIS_BUILD_DIR}/dist-newstyle/build/$ARCH/ghc-$GHCVER/solver-benchmarks-${CABAL_VERSION}"
-HACKAGE_REPO_TOOL_BDIR="${TRAVIS_BUILD_DIR}/dist-newstyle/build/$ARCH/ghc-$GHCVER/hackage-repo-tool-${HACKAGE_REPO_TOOL_VERSION}/c/hackage-repo-tool"
+HACKAGE_REPO_TOOL_BDIR="${TRAVIS_BUILD_DIR}/dist-newstyle/build/$ARCH/ghc-$GHCVER/hackage-repo-tool-${HACKAGE_REPO_TOOL_VERSION}/x/hackage-repo-tool"
 
 # ---------------------------------------------------------------------
 # Timing / diagnostic output

travis-script.sh

@@ -179,7 +179,7 @@ timed ${CABAL_INSTALL_BDIR}/build/cabal/cabal update
 
 if [ "x$TEST_SOLVER_BENCHMARKS" = "xYES" ]; then
     timed cabal new-build $jobs solver-benchmarks:hackage-benchmark solver-benchmarks:unit-tests
-    timed ${SOLVER_BENCHMARKS_BDIR}/c/unit-tests/build/unit-tests/unit-tests $TEST_OPTIONS
+    timed ${SOLVER_BENCHMARKS_BDIR}/t/unit-tests/build/unit-tests/unit-tests $TEST_OPTIONS
 fi
 
 unset CABAL_BUILDDIR

travis/upload.sh

@@ -70,10 +70,10 @@ cp $TRAVIS_BUILD_DIR/travis/id_rsa .
 cp $TRAVIS_BUILD_DIR/travis-install.sh .
 cp $TRAVIS_BUILD_DIR/travis-common.sh .
 # The binaries to test (statically linked, of course!)
-cp ${CABAL_BDIR}/c/unit-tests/build/unit-tests/unit-tests          Cabal
-cp ${CABAL_BDIR}/c/check-tests/build/check-tests/check-tests       Cabal
-cp ${CABAL_BDIR}/c/parser-tests/build/parser-tests/parser-tests    Cabal
-cp ${CABAL_BDIR}/c/hackage-tests/build/hackage-tests/hackage-tests Cabal
+cp ${CABAL_BDIR}/t/unit-tests/build/unit-tests/unit-tests          Cabal
+cp ${CABAL_BDIR}/t/check-tests/build/check-tests/check-tests       Cabal
+cp ${CABAL_BDIR}/t/parser-tests/build/parser-tests/parser-tests    Cabal
+cp ${CABAL_BDIR}/t/hackage-tests/build/hackage-tests/hackage-tests Cabal
 if [ "x$CABAL_LIB_ONLY" != "xYES" ]; then
     cp ${CABAL_INSTALL_BDIR}/build/cabal/cabal                       cabal-install
 fi