[commit: packages/directory] Mistuke-bump-win32-version-bounds, bgamari-patch-1, cbits, master: Make test script more idempotent (8a550bb)

[git at git.haskell.org]

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

On branches: Mistuke-bump-win32-version-bounds,bgamari-patch-1,cbits,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8a550bb4a758bd1846eaca96d2b7139c43f8654c/directory

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

commit 8a550bb4a758bd1846eaca96d2b7139c43f8654c
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sun May 1 02:24:14 2016 -0400

    Make test script more idempotent


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

8a550bb4a758bd1846eaca96d2b7139c43f8654c
 tools/testscript | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testscript b/tools/testscript
index a09f300..93e30d7 100755
--- a/tools/testscript
+++ b/tools/testscript
@@ -38,7 +38,7 @@ prepare() {
                 MSYS*)
                     url=https://www.stackage.org/stack/windows-x86_64
                     curl --retry 3 -fsLSo stack.zip "$url"
-                    7z x stack.zip stack.exe;;
+                    7z x -aoa stack.zip stack.exe;;
                 *)
                     printf >&2 "unknown uname: %s\n" "`uname`"
                     return 1;;
@@ -52,7 +52,7 @@ prepare() {
             url=https://hackage.haskell.org/package/${dep}/${dep}.tar.gz
             curl --retry 3 -fsLS "$url" | tar xzf -
         done
-        $stack init
+        $stack init && :
         $stack test --install-ghc --only-dependencies
         $stack list-dependencies