Bug 353010 - Test for both the presence of a PASS string and a zero exit code when running xpcshell tests; otherwise, assertions at shutdown won't cause tests to fail. r=robcee, a=test-only change

tools/test-harness/xpcshell-simple/test_all.sh

@@ -44,7 +44,7 @@
 ulimit -c 20480 2> /dev/null
 
 # Make assertions fatal
-export XPCOM_DEBUG_BREAK=abort
+export XPCOM_DEBUG_BREAK=stack-and-abort
 
 exit_status=0
 
@@ -112,7 +112,9 @@ for t in $testdir/test_*.js
 do
     echo -n "$t: "
     NATIVE_TOPSRCDIR="$native_topsrcdir" TOPSRCDIR="$topsrcdir" $xpcshell -s $headfiles -f $t $tailfiles 2> $t.log 1>&2
-    if [ `grep -c '\*\*\* PASS' $t.log` = 0 ]
+    rv="$?"
+    if [ ! "$rv" = "0"  -o \
+         `grep -c '\*\*\* PASS' $t.log` = 0 ]
     then
         echo "FAIL"
         echo "$t.log:"

tools/test-harness/xpcshell-simple/test_one.sh

@@ -45,7 +45,7 @@
 ulimit -c 20480 2> /dev/null
 
 # Make assertions fatal
-export XPCOM_DEBUG_BREAK=abort
+export XPCOM_DEBUG_BREAK=stack-and-abort
 
 exit_status=0
 
@@ -118,7 +118,9 @@ done
 echo "NATIVE_TOPSRCDIR='$native_topsrcdir' TOPSRCDIR='$topsrcdir' $xpcshell -s $headfiles -f $testdir/unit/$target_js $tailfiles 2>&1"
 echo -n "$target_js: "
 NATIVE_TOPSRCDIR="$native_topsrcdir" TOPSRCDIR="$topsrcdir" $xpcshell -s $headfiles -f $testdir/unit/$target_js $tailfiles -i 2>&1
-if [ `grep -c '\*\*\* PASS' $testdir/unit/$target_js.log` = 0 ]
+rv="$?"
+if [ ! "$rv" = "0"  -o \
+     `grep -c '\*\*\* PASS' $testdir/unit/$target_js.log` = 0 ]
 then
     echo "FAIL"
     echo "$target_js.log:"