1390827b9e
This reverts parts of the CLs splitting the backing implementation for Bindings and moves back to only the BTreeMap-backed implementation. Our evaluation has indicated that the Vector-backed implementation does not match the performance of the plain array used upstream, and in my view the complexity introduced by it is not worth the relatively small (single-digit percentage) performance increase with a pivot-point close to the number of attributes yielded by stdenv.mkDerivation. Going forward we will trial implementations of attribute sets backed by HAMTs, and investigate other mechanisms of speeding up the language. Some changes from the previous CLs are retained, for example the removal of insert_or_assign and the passing of capacity. Change-Id: I6eb4b075b453949583360755055c21a29d7ff642 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1172 Reviewed-by: glittershark <grfn@gws.fyi> Tested-by: BuildkiteCI
68 lines
2 KiB
Bash
68 lines
2 KiB
Bash
export TEST_VAR=foo # for eval-okay-getenv.nix
|
|
|
|
nix-instantiate --eval -E 'builtins.trace "Hello" 123' 2>&1 | grep -q Hello
|
|
(! nix-instantiate --show-trace --eval -E 'builtins.addErrorContext "Hello" 123' 2>&1 | grep -q Hello)
|
|
nix-instantiate --show-trace --eval -E 'builtins.addErrorContext "Hello" (throw "Foo")' 2>&1 | grep -q Hello
|
|
|
|
set +x
|
|
|
|
fail=0
|
|
|
|
for i in lang/parse-fail-*.nix; do
|
|
echo "parsing $i (should fail)";
|
|
i=$(basename $i .nix)
|
|
if nix-instantiate --parse - < lang/$i.nix; then
|
|
echo "FAIL: $i shouldn't parse"
|
|
fail=1
|
|
fi
|
|
done
|
|
|
|
for i in lang/parse-okay-*.nix; do
|
|
echo "parsing $i (should succeed)";
|
|
i=$(basename $i .nix)
|
|
if ! nix-instantiate --parse - < lang/$i.nix > lang/$i.out; then
|
|
echo "FAIL: $i should parse"
|
|
fail=1
|
|
fi
|
|
done
|
|
|
|
for i in lang/eval-fail-*.nix; do
|
|
echo "evaluating $i (should fail)";
|
|
i=$(basename $i .nix)
|
|
if nix-instantiate --eval lang/$i.nix; then
|
|
echo "FAIL: $i shouldn't evaluate"
|
|
fail=1
|
|
fi
|
|
done
|
|
|
|
for i in lang/eval-okay-*.nix; do
|
|
echo "evaluating $i (should succeed)";
|
|
i=$(basename $i .nix)
|
|
|
|
if test -e lang/$i.exp; then
|
|
flags=
|
|
if test -e lang/$i.flags; then
|
|
flags=$(cat lang/$i.flags)
|
|
fi
|
|
if ! NIX_PATH=lang/dir3:lang/dir4 nix-instantiate $flags --eval --strict lang/$i.nix > lang/$i.out; then
|
|
echo "FAIL: $i should evaluate"
|
|
fail=1
|
|
elif ! diff lang/$i.out lang/$i.exp; then
|
|
echo "FAIL: evaluation result of $i not as expected"
|
|
fail=1
|
|
fi
|
|
fi
|
|
|
|
if test -e lang/$i.exp.xml; then
|
|
if ! nix-instantiate --eval --xml --no-location --strict \
|
|
lang/$i.nix > lang/$i.out.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"
|
|
fail=1
|
|
fi
|
|
fi
|
|
done
|
|
|
|
exit $fail
|