From 49213aa80a47cfad0bddfc57c2b00e7e655e91fc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Feb 2011 15:04:17 +0000
Subject: [PATCH] * Doh! Exceptions outside of subtests were silently ignored.

svn path=/nixos/trunk/; revision=25981
---
 lib/testing.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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