[commit: packages/directory] master: Fix broken cabal_install_run_tests (525cc27)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/525cc271522d9e8c274c7b16100aa11963b6008b/directory

>---------------------------------------------------------------

commit 525cc271522d9e8c274c7b16100aa11963b6008b
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Thu Mar 31 12:48:21 2016 -0400

    Fix broken cabal_install_run_tests
    
    Turns out the fallback version never worked properly to begin with.


>---------------------------------------------------------------

525cc271522d9e8c274c7b16100aa11963b6008b
 .travis.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9a98189..5ffbc7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,19 +46,19 @@ before_script:
      if cabal 2>&1 install --run-tests __dummy |
         grep >/dev/null 2>&1 "cabal: unrecognized option"
      then def_cabal_install_run_tests='cabal_install_run_tests() {
-          tgz=$1
-          shift
-          tmp=cabal-install-run-tests.tmp
-          mkdir -p "$tmp"
-          ( cd "$tmp" && tar xzf - ) <"$tgz"
+          tgz=$1 &&
+          shift &&
+          tmp=cabal-install-run-tests.tmp &&
+          mkdir -p "$tmp" &&
+          ( cd "$tmp" && tar xzf - ) <"$tgz" &&
           ( cd "$tmp"/* &&
             cabal configure --enable-tests &&
             cabal build &&
-            cabal test )
+            cabal test ) &&
           cabal install "$@" "$tgz"
      }'
      else def_cabal_install_run_tests='cabal_install_run_tests() {
-          cabal install --run-tests "$@" "$1"
+          cabal install --run-tests "$@"
      }'
      fi
      export def_cabal_install_run_tests
@@ -73,4 +73,4 @@ script:
      --test-option=CreateDirectoryIfMissing001.num-repeats=100000
      --test-option=+RTS --test-option=-N2
  - eval "$def_cabal_install_run_tests" &&
-   cabal_install_run_tests --force-reinstalls dist/*-*.tar.gz
+   cabal_install_run_tests dist/*-*.tar.gz --force-reinstalls