Bug 597811 - [SeaMonkey] mochitests-1/5: "WARNING: NS_ENSURE_SUCCESS(rv, rv) ... nsHTMLInputElement.cpp, line 436" + "test_bug592802.html | Test timed out.", caused by "test_bug548193.html / nsContentPrefService.js"; (Cv1) Add 1 missing 'JSVersion version' in patch Bv1.
authorSerge Gautherie <sgautherie.bz@free.fr>
Sat, 20 Nov 2010 07:55:24 +0100
changeset 57941 5fc1f9723b56dc409ecfa45fd9da7197d4f71ae6
parent 57940 312bbc3ed89462e6bcd00be43e0950e6f3a6920e
child 57942 9892fb9d7141c3bbd215673fba3b793eb963f9ca
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
bugs597811, 592802, 548193
milestone2.0b8pre
Bug 597811 - [SeaMonkey] mochitests-1/5: "WARNING: NS_ENSURE_SUCCESS(rv, rv) ... nsHTMLInputElement.cpp, line 436" + "test_bug592802.html | Test timed out.", caused by "test_bug548193.html / nsContentPrefService.js"; (Cv1) Add 1 missing 'JSVersion version' in patch Bv1. a=(bustage fix). DONTBUILD
js/src/jsapi.h
testing/xpcshell/runxpcshelltests.py
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -2463,17 +2463,18 @@ JS_CompileFileHandle(JSContext *cx, JSOb
 extern JS_PUBLIC_API(JSScript *)
 JS_CompileFileHandleForPrincipals(JSContext *cx, JSObject *obj,
                                   const char *filename, FILE *fh,
                                   JSPrincipals *principals);
 
 extern JS_PUBLIC_API(JSScript *)
 JS_CompileFileHandleForPrincipalsVersion(JSContext *cx, JSObject *obj,
                                          const char *filename, FILE *fh,
-                                         JSPrincipals *principals);
+                                         JSPrincipals *principals,
+                                         JSVersion version);
 
 /*
  * NB: you must use JS_NewScriptObject and root a pointer to its return value
  * in order to keep a JSScript and its atoms safe from garbage collection after
  * creating the script via JS_Compile* and before a JS_ExecuteScript* call.
  * E.g., and without error checks:
  *
  *    JSScript *script = JS_CompileFile(cx, global, filename);
--- a/testing/xpcshell/runxpcshelltests.py
+++ b/testing/xpcshell/runxpcshelltests.py
@@ -512,17 +512,17 @@ class XPCShellTests(object):
           # xpcom/base/nsTraceRefcntImpl.cpp for logfile naming logic
           leakLogs = [self.leakLogFile]
           for childLog in glob(os.path.join(self.profileDir, "runxpcshelltests_leaks_*_pid*.log")):
             if os.path.isfile(childLog):
               leakLogs += [childLog]
           for log in leakLogs:
             dumpLeakLog(log, True)
 
-          if self.logfiles and stdout:
+          if True and stdout:
             self.createLogFile(test, stdout, leakLogs)
         finally:
           # We don't want to delete the profile when running check-interactive
           # or check-one.
           if self.profileDir and not self.interactive and not self.singleFile:
             self.removeDir(self.profileDir)
         if gotSIGINT:
           print "TEST-UNEXPECTED-FAIL | Received SIGINT (control-C) during test execution"