--- a/test.py	Fri May 21 14:19:15 2010 -0700
+++ b/test.py	Sat May 22 09:33:38 2010 -0700
@@ -1008,6 +1008,9 @@
 
         proc = subprocess.Popen(waf_cmd, shell = True)
         proc.communicate()
+        if proc.returncode:
+            print >> sys.stderr, "Waf died. Not running tests"
+            return proc.returncode
 
     #
     # Pull some interesting configuration information out of waf, primarily