nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-26 08:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "tests: Distinguish crashes from expected failures"

Browse Source 
This reverts commit 143b73f52d.
This commit is contained in:
Guillaume Maudoux 2022-05-02 14:22:00 +02:00
parent 143b73f52d
commit 4845886bed
1 changed files with 22 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
tests/lang.sh
View File

@ -10,49 +10,32 @@ nix-instantiate --show-trace --eval -E 'builtins.addErrorContext "Hello" (throw
set +x set +x
fail=0 fail=0
just_failed=0
safe_expect () {
expected=$1 name=$2 msg=$3 cmd=$4
just_failed=0
res=0
eval "$cmd" || res=$?
if [ $res -ge 2 ]; then
[ $res -le 128 ] || { echo "FAIL: $name returned unexpected code '$res' (should be 0 or 1)"; just_failed=1; }
[ $res -gt 128 ] || { echo "FAIL: $name crashed with $res ($(kill -l $(($res - 128))))"; just_failed=1; }
elif [ $expected = "fail" ]; then
[ $res -ne 0 ] || { echo "FAIL: $name $msg"; just_failed=1; }
elif [ $expected = "pass" ]; then
[ $res -eq 0 ] || { echo "FAIL: $name $msg"; just_failed=1; }
else
echo "usage: safe_expect [pass|fail] name msg command"
exit 1
fi
[ $just_failed -eq 0 ] || fail=1
}
for i in lang/parse-fail-*.nix; do for i in lang/parse-fail-*.nix; do
echo "parsing $i (should fail)"; echo "parsing $i (should fail)";
i=$(basename $i .nix) i=$(basename $i .nix)
safe_expect fail "$i" "shouldn't parse" \ if nix-instantiate --parse - < lang/$i.nix; then
"nix-instantiate --parse - < lang/$i.nix" echo "FAIL: $i shouldn't parse"
fail=1
fi
done done
for i in lang/parse-okay-*.nix; do for i in lang/parse-okay-*.nix; do
echo "parsing $i (should succeed)"; echo "parsing $i (should succeed)";
i=$(basename $i .nix) i=$(basename $i .nix)
safe_expect pass "$i" "should parse" \ if ! nix-instantiate --parse - < lang/$i.nix > lang/$i.out; then
"nix-instantiate --parse - < lang/$i.nix > lang/$i.out" echo "FAIL: $i should parse"
fail=1
fi
done done
for i in lang/eval-fail-*.nix; do for i in lang/eval-fail-*.nix; do
echo "evaluating $i (should fail)"; echo "evaluating $i (should fail)";
i=$(basename $i .nix) i=$(basename $i .nix)
safe_expect fail "$i" "shouldn't evaluate" \ if nix-instantiate --eval lang/$i.nix; then
"nix-instantiate --eval lang/$i.nix" echo "FAIL: $i shouldn't evaluate"
fail=1
fi
done done
for i in lang/eval-okay-*.nix; do for i in lang/eval-okay-*.nix; do
@ -62,20 +45,23 @@ for i in lang/eval-okay-*.nix; do
if test -e lang/$i.exp; then if test -e lang/$i.exp; then
flags= flags=
if test -e lang/$i.flags; then if test -e lang/$i.flags; then
flags='$'"(cat lang/$i.flags)" # because vi does not highlight "\$(...)" properly ;-). flags=$(cat lang/$i.flags)
fi fi
safe_expect pass "$i" "should evaluate" \ if ! NIX_PATH=lang/dir3:lang/dir4 nix-instantiate $flags --eval --strict lang/$i.nix > lang/$i.out; then
"NIX_PATH=lang/dir3:lang/dir4 nix-instantiate $flags --eval --strict lang/$i.nix > lang/$i.out" echo "FAIL: $i should evaluate"
if [ $just_failed -eq 0 ] && ! diff lang/$i.out lang/$i.exp; then fail=1
elif ! diff lang/$i.out lang/$i.exp; then
echo "FAIL: evaluation result of $i not as expected" echo "FAIL: evaluation result of $i not as expected"
fail=1 fail=1
fi fi
fi fi
if test -e lang/$i.exp.xml; then if test -e lang/$i.exp.xml; then
safe_expect pass "$i" "should evaluate" \ if ! nix-instantiate --eval --xml --no-location --strict \
"nix-instantiate --eval --xml --no-location --strict lang/$i.nix > lang/$i.out.xml" lang/$i.nix > lang/$i.out.xml; then
if [ $just_failed -eq 0 ] && ! cmp -s lang/$i.out.xml lang/$i.exp.xml; then echo "FAIL: $i should evaluate"
fail=1
elif ! cmp -s lang/$i.out.xml lang/$i.exp.xml; then
echo "FAIL: XML evaluation result of $i not as expected" echo "FAIL: XML evaluation result of $i not as expected"
fail=1 fail=1
fi fi