diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-04-24 20:12:43 -0400 |
|---|---|---|
| committer | John Ericson <Ericson2314@Yahoo.com> | 2017-05-17 11:14:59 -0400 |
| commit | 296753f0947427d5753be68ae10363ac1b8b4cdc (patch) | |
| tree | 599ad9bb98506efbb21982310bee9d062a7b26a1 /pkgs/top-level/make-tarball.nix | |
| parent | 9c90ff7e7df9ceadc7335bb43cc67ba92e171d53 (diff) | |
lib: Consolidate tests into one meta job
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 a69e7019c8741..c7e5f21910bbd 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 |