summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2011-02-15 15:04:17 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2011-02-15 15:04:17 +0000
commit49213aa80a47cfad0bddfc57c2b00e7e655e91fc (patch)
treec36d407e3e225f2abd9be2e42b4e645513acd1ce /lib
parent433679537b6100734f61d62781c9c4e5b32a719b (diff)
downloadnixlib-49213aa80a47cfad0bddfc57c2b00e7e655e91fc.tar
nixlib-49213aa80a47cfad0bddfc57c2b00e7e655e91fc.tar.gz
nixlib-49213aa80a47cfad0bddfc57c2b00e7e655e91fc.tar.bz2
nixlib-49213aa80a47cfad0bddfc57c2b00e7e655e91fc.tar.lz
nixlib-49213aa80a47cfad0bddfc57c2b00e7e655e91fc.tar.xz
nixlib-49213aa80a47cfad0bddfc57c2b00e7e655e91fc.tar.zst
nixlib-49213aa80a47cfad0bddfc57c2b00e7e655e91fc.zip
* Doh! Exceptions outside of subtests were silently ignored.
svn path=/nixos/trunk/; revision=25981
Diffstat (limited to 'lib')
-rw-r--r--lib/testing.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/testing.nix b/lib/testing.nix
index c0d3b4cd1354..670a1dd6ac29 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -47,7 +47,7 @@ rec {
         ''
           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