diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-05-18 11:24:18 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-05-18 11:24:18 +0200 |
| commit | e9aeb55f3bc5206606ca22db8ad01bcabb8118a4 (patch) | |
| tree | 48b3c280de3eb20282b583276eaf49b6fd511f23 /pkgs/top-level/make-tarball.nix | |
| parent | 71a7e221d8f0def852f3a692daa3904a50523b30 (diff) | |
| parent | 0eff1d9f2af05353a827a3896ebcc2bce20d2fdd (diff) | |
| download | nixlib-e9aeb55f3bc5206606ca22db8ad01bcabb8118a4.tar nixlib-e9aeb55f3bc5206606ca22db8ad01bcabb8118a4.tar.gz nixlib-e9aeb55f3bc5206606ca22db8ad01bcabb8118a4.tar.bz2 nixlib-e9aeb55f3bc5206606ca22db8ad01bcabb8118a4.tar.lz nixlib-e9aeb55f3bc5206606ca22db8ad01bcabb8118a4.tar.xz nixlib-e9aeb55f3bc5206606ca22db8ad01bcabb8118a4.tar.zst nixlib-e9aeb55f3bc5206606ca22db8ad01bcabb8118a4.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/top-level/make-tarball.nix')
| -rw-r--r-- | pkgs/top-level/make-tarball.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index a69e7019c874..c7e5f21910bb 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -57,8 +57,15 @@ releaseTools.sourceTarball rec { fi # Run the regression tests in `lib'. - res="$(nix-instantiate --eval --strict --show-trace lib/tests.nix)" - if test "$res" != "[ ]"; then + if + # `set -e` doesn't work inside here, so need to && instead :( + res="$(nix-instantiate --eval --strict lib/tests/misc.nix)" \ + && [[ "$res" == "[ ]" ]] \ + && res="$(nix-instantiate --eval --strict lib/tests/systems.nix)" \ + && [[ "$res" == "[ ]" ]] + then + true + else echo "regression tests for lib failed, got: $res" exit 1 fi |