From 73a57a2f22668394740e1f642573b67a1316dee7 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 12 Jul 2017 20:43:57 -0400 Subject: [PATCH] Cleanup and more specificity around set -e --- tests/install-darwin.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/install-darwin.sh b/tests/install-darwin.sh index b553f7105..d2a7ab456 100755 --- a/tests/install-darwin.sh +++ b/tests/install-darwin.sh @@ -26,14 +26,11 @@ cleanup() { fi done - - for i in $(seq 1 $(sysctl -n hw.ncpu)); do sudo /usr/bin/dscl . -delete "/Users/nixbld$i" || true done sudo /usr/bin/dscl . -delete "/Groups/nixbld" || true - sudo rm -rf /etc/nix \ /nix \ /var/root/.nix-profile /var/root/.nix-defexpr /var/root/.nix-channels \ @@ -41,7 +38,10 @@ cleanup() { } verify() { + set +e output=$(echo "nix-shell -p bash --run 'echo toow | rev'" | bash -l) + set -e + test "$output" = "woot" } @@ -58,10 +58,12 @@ verify ( + set +e ( echo "cd $(pwd)" echo nix-build ./release.nix -A binaryTarball.x86_64-darwin ) | bash -l + set -e cp ./result/nix-*.tar.bz2 $scratch/nix.tar.bz2 )