Bug 546756 and bug 528145: fix error detection regression from runxpcshell "merge". a=jduell

testing/xpcshell/runxpcshelltests.py

@@ -409,7 +409,9 @@ class XPCShellTests(object):
             # Not sure what else to do here...
             return True
 
-          if (self.getReturnCode(proc) != 0) or (stdout and re.search("^TEST-UNEXPECTED-FAIL", stdout, re.MULTILINE)):
+          if (self.getReturnCode(proc) != 0) or \
+              (stdout and re.search("^((parent|child): )?TEST-UNEXPECTED-FAIL", stdout, re.MULTILINE)) or \
+              (stdout and re.search(": SyntaxError:", stdout, re.MULTILINE)):
             print """TEST-UNEXPECTED-FAIL | %s | test failed (with xpcshell return code: %d), see following log:
   >>>>>>>
   %s