зеркало из https://github.com/mozilla/gecko-dev.git
Bug 717417: Add 'terminate' shell primitive. r=jorendorff
This commit is contained in:
Родитель
fd333c1476
Коммит
0424de52a7
|
@ -0,0 +1,9 @@
|
||||||
|
try {
|
||||||
|
terminate();
|
||||||
|
assertEq("execution continued", "execution should not continue");
|
||||||
|
} catch (x) {
|
||||||
|
assertEq("caught exception", "uncatchable");
|
||||||
|
} finally {
|
||||||
|
assertEq("'finally' clause ran", "'finally' clause should not run");
|
||||||
|
}
|
||||||
|
assertEq("top-level execution continued", "top-level execution should not continue");
|
|
@ -3958,6 +3958,13 @@ GetMaxArgs(JSContext *cx, uintN arg, jsval *vp)
|
||||||
return JS_TRUE;
|
return JS_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static JSBool
|
||||||
|
Terminate(JSContext *cx, uintN arg, jsval *vp)
|
||||||
|
{
|
||||||
|
JS_ClearPendingException(cx);
|
||||||
|
return JS_FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
static JSFunctionSpec shell_functions[] = {
|
static JSFunctionSpec shell_functions[] = {
|
||||||
JS_FN("version", Version, 0,0),
|
JS_FN("version", Version, 0,0),
|
||||||
JS_FN("revertVersion", RevertVersion, 0,0),
|
JS_FN("revertVersion", RevertVersion, 0,0),
|
||||||
|
@ -4046,6 +4053,7 @@ static JSFunctionSpec shell_functions[] = {
|
||||||
JS_FN("parseLegacyJSON",ParseLegacyJSON,1,0),
|
JS_FN("parseLegacyJSON",ParseLegacyJSON,1,0),
|
||||||
JS_FN("enableStackWalkingAssertion",EnableStackWalkingAssertion,1,0),
|
JS_FN("enableStackWalkingAssertion",EnableStackWalkingAssertion,1,0),
|
||||||
JS_FN("getMaxArgs", GetMaxArgs, 0,0),
|
JS_FN("getMaxArgs", GetMaxArgs, 0,0),
|
||||||
|
JS_FN("terminate", Terminate, 0,0),
|
||||||
JS_FS_END
|
JS_FS_END
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -4200,6 +4208,8 @@ static const char *const shell_help_messages[] = {
|
||||||
" assertion increases test duration by an order of magnitude, you shouldn't\n"
|
" assertion increases test duration by an order of magnitude, you shouldn't\n"
|
||||||
" use this.",
|
" use this.",
|
||||||
"getMaxArgs() Return the maximum number of supported args for a call.",
|
"getMaxArgs() Return the maximum number of supported args for a call.",
|
||||||
|
"terminate() Terminate JavaScript execution, as if we had run out of\n"
|
||||||
|
" memory or been terminated by the slow script dialog.",
|
||||||
|
|
||||||
/* Keep these last: see the static assertion below. */
|
/* Keep these last: see the static assertion below. */
|
||||||
#ifdef MOZ_PROFILING
|
#ifdef MOZ_PROFILING
|
||||||
|
|
Загрузка…
Ссылка в новой задаче