diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-05-12T22·13+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-05-12T22·13+0000 |
| commit | aa45027818af8976dc73e6a299d5d918e5c51df1 (patch) | |
| tree | 6086eb0642bc90477397169d0ee3993c1789200e /tests/lang.sh | |
| parent | a0e3b84fac56cad6377ecd1462058a6b29bb1ea8 (diff) | |
| parent | 8032f26ca0bd2233de066ce5786ff976bbd641ae (diff) | |
* Sync with the trunk.
Diffstat (limited to 'tests/lang.sh')
| -rw-r--r-- | tests/lang.sh | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/tests/lang.sh b/tests/lang.sh index 54f01076371e..fab8c6e0d7f9 100644 --- a/tests/lang.sh +++ b/tests/lang.sh @@ -16,14 +16,10 @@ done for i in lang/parse-okay-*.nix; do echo "parsing $i (should succeed)"; i=$(basename $i .nix) - if ! $nixinstantiate --parse-only - < lang/$i.nix > lang/$i.ast; then + if ! $nixinstantiate --parse-only - < lang/$i.nix > lang/$i.out; then echo "FAIL: $i should parse" fail=1 fi - if ! $aterm_bin/atdiff lang/$i.ast lang/$i.exp; then - echo "FAIL: parse tree of $i not as expected" - fail=1 - fi done for i in lang/eval-fail-*.nix; do @@ -44,10 +40,10 @@ for i in lang/eval-okay-*.nix; do if test -e lang/$i.flags; then flags=$(cat lang/$i.flags) fi - if ! $nixinstantiate $flags --eval-only lang/$i.nix > lang/$i.out; then + if ! $nixinstantiate $flags --eval-only --strict lang/$i.nix > lang/$i.out; then echo "FAIL: $i should evaluate" fail=1 - elif ! $aterm_bin/atdiff lang/$i.out lang/$i.exp; then + elif ! diff lang/$i.out lang/$i.exp; then echo "FAIL: evaluation result of $i not as expected" fail=1 fi |