diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-06-17 10:26:52 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-06-17 10:26:52 +0200 |
| commit | 1524752c17ee8753467f068c23fbe1d994aa8f75 (patch) | |
| tree | c802ca482e2461765dcbdcef5cc6fa38c9d1c42b /tests | |
| parent | 7db879e65e83b1c65206b490d36a69e97c5a877a (diff) | |
| parent | 29542865cee37ab22efe1bd142900b69f6c59f0d (diff) | |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fetchGitRefs.sh | 2 | ||||
| -rw-r--r-- | tests/misc.sh | 4 | ||||
| -rw-r--r-- | tests/remote-store.sh | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/tests/fetchGitRefs.sh b/tests/fetchGitRefs.sh index 26b62facf..52926040b 100644 --- a/tests/fetchGitRefs.sh +++ b/tests/fetchGitRefs.sh @@ -56,7 +56,7 @@ invalid_ref() { else (! git check-ref-format --branch "$1" >/dev/null 2>&1) fi - nix --debug eval --raw --impure --expr "(builtins.fetchGit { url = $repo; ref = ''$1''; }).outPath" 2>&1 | grep 'error: invalid Git branch/tag name' >/dev/null + nix --debug eval --raw --impure --expr "(builtins.fetchGit { url = $repo; ref = ''$1''; }).outPath" 2>&1 | grep 'invalid Git branch/tag name' >/dev/null } diff --git a/tests/misc.sh b/tests/misc.sh index eda016416..fd4908e25 100644 --- a/tests/misc.sh +++ b/tests/misc.sh @@ -16,4 +16,6 @@ nix-env --foo 2>&1 | grep "no operation" nix-env -q --foo 2>&1 | grep "unknown flag" # Eval Errors. -nix-instantiate --eval -E 'let a = {} // a; in a.foo' 2>&1 | grep "infinite recursion encountered, at .*(string).*:1:15$" +eval_res=$(nix-instantiate --eval -E 'let a = {} // a; in a.foo' 2>&1 || true) +echo $eval_res | grep "(string) (1:15)" +echo $eval_res | grep "infinite recursion encountered" diff --git a/tests/remote-store.sh b/tests/remote-store.sh index 77437658e..4cc73465a 100644 --- a/tests/remote-store.sh +++ b/tests/remote-store.sh @@ -4,7 +4,7 @@ clearStore startDaemon -storeCleared=1 $SHELL ./user-envs.sh +storeCleared=1 NIX_REMOTE_=$NIX_REMOTE $SHELL ./user-envs.sh nix-store --dump-db > $TEST_ROOT/d1 NIX_REMOTE= nix-store --dump-db > $TEST_ROOT/d2 |