wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 419615 - "use JSVERSION_LATEST in xpcshell" (use a context callback to set error-reporter and jsversion default) [p=crowder@fiverocks.com (Brian Crowder) r+a1.9=shaver]

Browse Source
This commit is contained in:
reed@reedloden.com 2008-04-09 00:27:16 -07:00
parent a0a4af1741
commit 85aa35af10
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/src/xpconnect/shell/xpcshell.cpp
View File

@ -1289,6 +1289,16 @@ nsXPCFunctionThisTranslator::TranslateThis(nsISupports *aInitialThis,
#endif #endif
JS_STATIC_DLL_CALLBACK(JSBool)
ContextCallback(JSContext *cx, uintN contextOp)
{
if (contextOp == JSCONTEXT_NEW) {
JS_SetErrorReporter(cx, my_ErrorReporter);
JS_SetVersion(cx, JSVERSION_LATEST);
}
return JS_TRUE;
}
int int
main(int argc, char **argv, char **envp) main(int argc, char **argv, char **envp)
{ {
@ -1330,14 +1340,14 @@ main(int argc, char **argv, char **envp)
return 1; return 1;
} }
JS_SetContextCallback(rt, ContextCallback);
cx = JS_NewContext(rt, 8192); cx = JS_NewContext(rt, 8192);
if (!cx) { if (!cx) {
printf("JS_NewContext failed!\n"); printf("JS_NewContext failed!\n");
return 1; return 1;
} }
JS_SetErrorReporter(cx, my_ErrorReporter);
nsCOMPtr<nsIXPConnect> xpc = do_GetService(nsIXPConnect::GetCID()); nsCOMPtr<nsIXPConnect> xpc = do_GetService(nsIXPConnect::GetCID());
if (!xpc) { if (!xpc) {
printf("failed to get nsXPConnect service!\n"); printf("failed to get nsXPConnect service!\n");

2
tools/test-harness/xpcshell-simple/test_all.sh
View File

@ -111,7 +111,7 @@ done
for t in $testdir/test_*.js for t in $testdir/test_*.js
do do
echo -n "$t: " echo -n "$t: "
NATIVE_TOPSRCDIR="$native_topsrcdir" TOPSRCDIR="$topsrcdir" $xpcshell -v 180 -s $headfiles -f $t $tailfiles 2> $t.log 1>&2 NATIVE_TOPSRCDIR="$native_topsrcdir" TOPSRCDIR="$topsrcdir" $xpcshell -s $headfiles -f $t $tailfiles 2> $t.log 1>&2
rv="$?" rv="$?"
if [ ! "$rv" = "0" -o \ if [ ! "$rv" = "0" -o \
`grep -c '\*\*\* PASS' $t.log` = 0 ] `grep -c '\*\*\* PASS' $t.log` = 0 ]