* Doh! Exceptions outside of subtests were silently ignored.

svn path=/nixos/trunk/; revision=25981
2011-02-15 15:04:17 +00:00 · 2011-02-15 15:04:17 +00:00 · 49213aa80a
parent 433679537b
commit 49213aa80a
1 changed files with 1 additions and 1 deletions
--- 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