Author: eelco
Date: Tue Feb 15 15:04:17 2011
New Revision: 25981
URL: https://svn.nixos.org/websvn/nix/?rev=25981&sc=1
Log:
* Doh! Exceptions outside of subtests were silently ignored.
Modified:
nixos/trunk/lib/testing.nix
Modified: nixos/trunk/lib/testing.nix
==============================================================================
--- nixos/trunk/lib/testing.nix Tue Feb 15 14:34:26 2011 (r25980)
+++ nixos/trunk/lib/testing.nix Tue Feb 15 15:04:17 2011 (r25981)
@@ -47,7 +47,7 @@
''
mkdir -p $out/nix-support
- LOGFILE=$out/log.xml tests="testScript"
${driver}/bin/nixos-test-driver || failed=1
+ LOGFILE=$out/log.xml tests='eval $ENV{testScript}; die $@ if $@;'
${driver}/bin/nixos-test-driver || failed=1
# Generate a pretty-printed log.
xsltproc --output $out/log.html ${./test-driver/log2html.xsl}
$out/log.xml
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
