diff --git a/accessible/src/base/nsARIAMap.cpp b/accessible/src/base/nsARIAMap.cpp index d71a9d418d30..a91b9438f12a 100644 --- a/accessible/src/base/nsARIAMap.cpp +++ b/accessible/src/base/nsARIAMap.cpp @@ -713,6 +713,7 @@ nsAttributeCharacteristics nsARIAMap::gWAIUnivAttrMap[] = { {&nsAccessibilityAtoms::aria_grabbed, ATTR_VALTOKEN }, {&nsAccessibilityAtoms::aria_haspopup, ATTR_BYPASSOBJ | ATTR_VALTOKEN }, {&nsAccessibilityAtoms::aria_invalid, ATTR_BYPASSOBJ | ATTR_VALTOKEN }, + {&nsAccessibilityAtoms::aria_label, ATTR_BYPASSOBJ }, {&nsAccessibilityAtoms::aria_labelledby, ATTR_BYPASSOBJ }, {&nsAccessibilityAtoms::aria_level, ATTR_BYPASSOBJ }, /* handled via groupPosition */ {&nsAccessibilityAtoms::aria_live, ATTR_VALTOKEN }, diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp index a26e9dec297f..83f4ca44485d 100644 --- a/accessible/src/base/nsAccessible.cpp +++ b/accessible/src/base/nsAccessible.cpp @@ -2694,16 +2694,9 @@ nsAccessible::Shutdown() nsresult nsAccessible::GetARIAName(nsAString& aName) { - // First check for label override via aria-label property nsAutoString label; - if (mContent->GetAttr(kNameSpaceID_None, nsAccessibilityAtoms::aria_label, - label)) { - label.CompressWhitespace(); - aName = label; - return NS_OK; - } - - // Second check for label override via aria-labelledby relationship + + // aria-labelledby now takes precedence over aria-label nsresult rv = nsTextEquivUtils:: GetTextEquivFromIDRefs(this, nsAccessibilityAtoms::aria_labelledby, label); if (NS_SUCCEEDED(rv)) { @@ -2711,7 +2704,14 @@ nsAccessible::GetARIAName(nsAString& aName) aName = label; } - return rv; + if (label.IsEmpty() && + mContent->GetAttr(kNameSpaceID_None, nsAccessibilityAtoms::aria_label, + label)) { + label.CompressWhitespace(); + aName = label; + } + + return NS_OK; } nsresult diff --git a/accessible/tests/mochitest/attributes/test_obj.html b/accessible/tests/mochitest/attributes/test_obj.html index 7e541650b798..6ce6daa1c014 100644 --- a/accessible/tests/mochitest/attributes/test_obj.html +++ b/accessible/tests/mochitest/attributes/test_obj.html @@ -2,6 +2,7 @@ Group attributes tests @@ -69,6 +70,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=391829 testAttrs("statusChild", {"container-live-role" : "status"}, true); testAttrs("timerChild", {"container-live-role" : "timer"}, true); + // absent aria-label and aria-labelledby object attribute + testAbsentAttrs("label", {"label" : "foo"}); + testAbsentAttrs("labelledby", {"labelledby" : "label"}); + // container that has no default live attribute testAttrs("liveGroup", {"live" : "polite"}, true); testAttrs("liveGroupChild", {"container-live" : "polite"}, true); @@ -93,11 +98,16 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=391829 title="Extend nsARIAMap to capture ARIA attribute characteristics"> Mozilla Bug 475006 - - Mozilla Bug 391829 - + + Mozilla Bug 391829 + + + Mozilla Bug 475006 +

@@ -129,6 +139,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=391829
excuse
me
excuse
me
+ + + +
excuse
me
diff --git a/accessible/tests/mochitest/namerules.xml b/accessible/tests/mochitest/namerules.xml index a0a11a821e26..b095604ee020 100644 --- a/accessible/tests/mochitest/namerules.xml +++ b/accessible/tests/mochitest/namerules.xml @@ -69,8 +69,8 @@ - + diff --git a/accessible/tests/mochitest/test_name.html b/accessible/tests/mochitest/test_name.html index 2c2a81e7100b..222bac65837c 100644 --- a/accessible/tests/mochitest/test_name.html +++ b/accessible/tests/mochitest/test_name.html @@ -23,8 +23,8 @@ // Simple label provided via ARIA testName("btn_simple_aria_label", "I am a button"); - // aria-label and aria-labelledby, expect aria-label - testName("btn_both_aria_labels", "I am a button, two"); + // aria-label and aria-labelledby, expect aria-labelledby + testName("btn_both_aria_labels", "text I am a button, two"); ////////////////////////////////////////////////////////////////////////// // aria-labelledby @@ -207,7 +207,7 @@
+ aria-labelledby="labelledby_text btn_both_aria_labels"/>
diff --git a/accessible/tests/mochitest/test_name.xul b/accessible/tests/mochitest/test_name.xul index a66b9990f44c..6da2d1b4b934 100644 --- a/accessible/tests/mochitest/test_name.xul +++ b/accessible/tests/mochitest/test_name.xul @@ -30,8 +30,8 @@ // Simple label provided via ARIA testName("btn_simple_aria_label", "I am a button"); - // aria-label and aria-labelledby, expect aria-label - testName("btn_both_aria_labels", "I am a button, two"); + // aria-label and aria-labelledby, expect aria-labelledby + testName("btn_both_aria_labels", "text I am a button, two"); ////////////////////////////////////////////////////////////////////////// // aria-labelledby @@ -205,9 +205,10 @@ + aria-label="button label">1
@@ -109,10 +108,9 @@ - +
diff --git a/accessible/tests/mochitest/test_name_link.html b/accessible/tests/mochitest/test_name_link.html index 3aa21a808b7d..32fec0c6c3eb 100644 --- a/accessible/tests/mochitest/test_name_link.html +++ b/accessible/tests/mochitest/test_name_link.html @@ -61,10 +61,9 @@
- + 1 + aria-label="anchor label">1
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index be5b581abd55..63b06bcd312b 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -343,6 +343,7 @@ pref("browser.tabs.opentabfor.middleclick", true); pref("browser.tabs.loadDivertedInBackground", false); pref("browser.tabs.loadBookmarksInBackground", false); pref("browser.tabs.tabClipWidth", 140); +pref("browser.tabs.animate", true); // Where to show tab close buttons: // 0 on active tab only diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css index 267e1aaab6f5..98304186bf0a 100644 --- a/browser/base/content/browser.css +++ b/browser/base/content/browser.css @@ -29,6 +29,7 @@ tabbrowser { max-width: 250px; min-width: 100px; width: 0; + -moz-transition: min-width .2s ease-out, max-width .25s ease-out; } .tabbrowser-tab:not([pinned]):not([fadein]) { @@ -36,19 +37,15 @@ tabbrowser { min-width: 1px; } -.tabbrowser-tab[fadein]:not([pinned]) { - -moz-transition: min-width .2s ease-out, max-width .25s ease-out; -} - .tabbrowser-tab:not([fadein]):not([pinned]) > .tab-text, .tabbrowser-tab:not([fadein]):not([pinned]) > .tab-icon-image, .tabbrowser-tab:not([fadein]):not([pinned]) > .tab-close-button { opacity: 0 !important; } -.tabbrowser-tab[fadein] > .tab-text, -.tabbrowser-tab[fadein] > .tab-icon-image, -.tabbrowser-tab[fadein] > .tab-close-button { +.tabbrowser-tab > .tab-text, +.tabbrowser-tab > .tab-icon-image, +.tabbrowser-tab > .tab-close-button { -moz-transition: opacity .25s; } diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index c1dc69935b8b..18394b6973b8 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -2051,7 +2051,7 @@ function BrowserCloseTabOrWindow() { #endif // If the current tab is the last one, this will close the window. - gBrowser.removeCurrentTab(); + gBrowser.removeCurrentTab({animate: true}); } function BrowserTryToCloseWindow() diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index 4c969ad5a46c..4c5f57b5aa72 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -457,9 +457,23 @@ label="&brandShortName;" style="-moz-user-focus: ignore;"> - + + + + + + + + + + @@ -1315,9 +1331,36 @@ + 3 || + aTab.getAttribute("fadein") != "true" || + !Services.prefs.getBoolPref("browser.tabs.animate")) { + this._endRemoveTab(aTab); + return; + } + + this._blurTab(aTab); + aTab.removeAttribute("fadein"); ]]> @@ -1328,7 +1371,6 @@ false - @@ -1337,14 +1379,14 @@ -1 || this._windowIsClosing) - return null; + return false; var browser = this.getBrowserForTab(aTab); if (!aTabWillBeMoved) { let ds = browser.docShell; if (ds && ds.contentViewer && !ds.contentViewer.permitUnload()) - return null; + return false; } var closeWindow = false; @@ -1400,18 +1442,26 @@ tab.owner = null; }); - return [aTab, closeWindow, newTab]; + aTab._endRemoveArgs = [closeWindow, newTab]; + return true; ]]> - + -1) + this.tabbrowser._endRemoveTab(tab); ]]> 1 || !this._closeWindowWithLastTab) - this.tabbrowser.removeTab(event.target); + this.tabbrowser.removeTab(event.target, {animate: true}); } else if (event.originalTarget.localName == "box") { BrowserOpenTab(); } else { @@ -3102,7 +3163,7 @@ // Reset the "ignored click" flag this._ignoredClick = false; - tabContainer.tabbrowser.removeTab(bindingParent); + tabContainer.tabbrowser.removeTab(bindingParent, {animate: true}); tabContainer._blockDblClick = true; /* XXXmano hack (see bug 343628): diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in index b93c11512a0f..8c1dcf6ac5b7 100644 --- a/browser/base/content/test/Makefile.in +++ b/browser/base/content/test/Makefile.in @@ -99,6 +99,7 @@ _BROWSER_FILES = \ title_test.svg \ browser_bug329212.js \ browser_bug356571.js \ + browser_bug380960.js \ browser_bug386835.js \ browser_bug405137.js \ browser_bug406216.js \ diff --git a/browser/base/content/test/browser_bug380960.js b/browser/base/content/test/browser_bug380960.js new file mode 100644 index 000000000000..0f9703be2790 --- /dev/null +++ b/browser/base/content/test/browser_bug380960.js @@ -0,0 +1,78 @@ +function test() { + gBrowser.tabContainer.addEventListener("TabOpen", tabAdded, false); + + var tab = gBrowser.addTab("about:blank", { skipAnimation: true }); + gBrowser.removeTab(tab); + is(tab.parentNode, null, "tab removed immediately"); + + waitForExplicitFinish(); + + Services.prefs.setBoolPref("browser.tabs.animate", true); + nextAsyncText(); +} + +function tabAdded() { + info("tab added"); +} + +function cleanup() { + if (Services.prefs.prefHasUserValue("browser.tabs.animate")) + Services.prefs.clearUserPref("browser.tabs.animate"); + gBrowser.tabContainer.removeEventListener("TabOpen", tabAdded, false); + finish(); +} + +var asyncTests = [ + function (tab) { + info("closing tab with middle click"); + EventUtils.synthesizeMouse(tab, 2, 2, { button: 1 }); + }, + function (tab) { + info("closing tab with accel+w"); + gBrowser.selectedTab = tab; + content.focus(); + EventUtils.synthesizeKey("w", { accelKey: true }); + }, + function (tab) { + info("closing tab by clicking the tab close button"); + gBrowser.selectedTab = tab; + var button = document.getAnonymousElementByAttribute(tab, "anonid", "close-button"); + EventUtils.synthesizeMouse(button, 2, 2, {}); + } +]; + +function nextAsyncText() { + info("tests left: " + asyncTests.length + "; starting next"); + var tab = gBrowser.addTab("about:blank", { skipAnimation: true }); + + var gotCloseEvent = false; + + tab.addEventListener("TabClose", function () { + info("got TabClose event"); + gotCloseEvent = true; + + const DEFAULT_ANIMATION_LENGTH = 250; + const MAX_WAIT_TIME = DEFAULT_ANIMATION_LENGTH * 3; + const INTERVAL_LENGTH = 100; + var polls = Math.ceil(MAX_WAIT_TIME / INTERVAL_LENGTH); + var pollTabRemoved = setInterval(function () { + --polls; + if (tab.parentNode && polls > 0) + return; + clearInterval(pollTabRemoved); + + is(tab.parentNode, null, "tab removed after at most " + MAX_WAIT_TIME + " ms"); + + if (asyncTests.length) + nextAsyncText(); + else + cleanup(); + }, INTERVAL_LENGTH); + }, false); + + asyncTests.shift()(tab); + + ok(gotCloseEvent, "got the close event syncronously"); + + is(tab.parentNode, gBrowser.tabContainer, "tab still exists when it's about to be removed asynchronously"); +} diff --git a/browser/base/content/test/browser_bug521216.js b/browser/base/content/test/browser_bug521216.js index 2669723b2233..1de604fac1ab 100644 --- a/browser/base/content/test/browser_bug521216.js +++ b/browser/base/content/test/browser_bug521216.js @@ -1,4 +1,4 @@ -var expected = ["TabOpen", "onLocationChange", "onStateChange", "onLinkIconAvailable"]; +var expected = ["TabOpen", "onStateChange", "onLocationChange", "onLinkIconAvailable"]; var actual = []; var tabIndex = -1; __defineGetter__("tab", function () gBrowser.tabs[tabIndex]); diff --git a/config/config.mk b/config/config.mk index c48f43522e50..33f15cd4589b 100644 --- a/config/config.mk +++ b/config/config.mk @@ -45,6 +45,9 @@ # # Define an include-at-most-once flag +#ifdef INCLUDED_CONFIG_MK +#$(error Don't include config.mk twice!) +#endif INCLUDED_CONFIG_MK = 1 EXIT_ON_ERROR = set -e; # Shell loops continue past errors without this. @@ -182,7 +185,7 @@ else endif endif -MOZALLOC_LIB = -L$(DIST)/bin $(call EXPAND_MOZLIBNAME,mozalloc) +MOZALLOC_LIB = $(call EXPAND_LIBNAME_PATH,mozalloc,$(DIST)/lib) OS_CFLAGS += $(_DEBUG_CFLAGS) OS_CXXFLAGS += $(_DEBUG_CFLAGS) diff --git a/configure.in b/configure.in index 49ef726861bd..794fae42135e 100644 --- a/configure.in +++ b/configure.in @@ -5696,12 +5696,6 @@ MOZ_ARG_DISABLE_BOOL(jsd, dnl ======================================================== dnl = Disable IPC support for tabs and plugins dnl ======================================================== -case "${target}" in -*-wince*) - MOZ_IPC= - ;; -esac - MOZ_ARG_DISABLE_BOOL(ipc, [ --disable-ipc Disable IPC supports for tabs and plugins], MOZ_IPC=, diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp index f7a18d465ce7..5892f477a04f 100644 --- a/content/base/src/nsContentUtils.cpp +++ b/content/base/src/nsContentUtils.cpp @@ -1014,7 +1014,7 @@ nsContentUtils::ParseIntMarginValue(const nsAString& aString, nsIntMargin& resul PRInt32 start = 0, end = 0; for (int count = 0; count < 4; count++) { - if (end >= marginStr.Length()) + if ((PRUint32)end >= marginStr.Length()) return PR_FALSE; // top, right, bottom, left @@ -6318,7 +6318,7 @@ nsIContentUtils::FindInternalContentViewer(const char* aType, #ifdef MOZ_MEDIA #ifdef MOZ_OGG if (nsHTMLMediaElement::IsOggEnabled()) { - for (int i = 0; i < NS_ARRAY_LENGTH(nsHTMLMediaElement::gOggTypes); ++i) { + for (unsigned int i = 0; i < NS_ARRAY_LENGTH(nsHTMLMediaElement::gOggTypes); ++i) { const char* type = nsHTMLMediaElement::gOggTypes[i]; if (!strcmp(aType, type)) { docFactory = do_GetService("@mozilla.org/content/document-loader-factory;1"); @@ -6333,7 +6333,7 @@ nsIContentUtils::FindInternalContentViewer(const char* aType, #ifdef MOZ_WEBM if (nsHTMLMediaElement::IsWebMEnabled()) { - for (int i = 0; i < NS_ARRAY_LENGTH(nsHTMLMediaElement::gWebMTypes); ++i) { + for (unsigned int i = 0; i < NS_ARRAY_LENGTH(nsHTMLMediaElement::gWebMTypes); ++i) { const char* type = nsHTMLMediaElement::gWebMTypes[i]; if (!strcmp(aType, type)) { docFactory = do_GetService("@mozilla.org/content/document-loader-factory;1"); diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index b57e62df8608..c2869c5860d2 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -1719,6 +1719,13 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDocument) NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMARRAY(mPreloadingImages) + + if (tmp->mBoxObjectTable) { + tmp->mBoxObjectTable->EnumerateRead(ClearAllBoxObjects, nsnull); + delete tmp->mBoxObjectTable; + tmp->mBoxObjectTable = nsnull; + } + // nsDocument has a pretty complex destructor, so we're going to // assume that *most* cycles you actually want to break somewhere // else, and not unlink an awful lot here. diff --git a/content/canvas/src/CustomQS_WebGL.h b/content/canvas/src/CustomQS_WebGL.h index 7d738a824f3a..64eb1481ee93 100644 --- a/content/canvas/src/CustomQS_WebGL.h +++ b/content/canvas/src/CustomQS_WebGL.h @@ -212,7 +212,7 @@ nsICanvasRenderingContextWebGL_BufferSubData(JSContext *cx, uintN argc, jsval *v /* * ReadPixels takes: - * TexImage2D(int, int, int, int, uint, uint, ArrayBufferView) + * ReadPixels(int, int, int, int, uint, uint, ArrayBufferView) */ static JSBool nsICanvasRenderingContextWebGL_ReadPixels(JSContext *cx, uintN argc, jsval *vp) @@ -230,8 +230,7 @@ nsICanvasRenderingContextWebGL_ReadPixels(JSContext *cx, uintN argc, jsval *vp) if (!xpc_qsUnwrapThis(cx, obj, nsnull, &self, &selfref.ptr, tvr.jsval_addr(), nsnull)) return JS_FALSE; - // XXX we currently allow passing only 6 args to support the API. Eventually drop that. - if (argc < 6) + if (argc < 7) return xpc_qsThrow(cx, NS_ERROR_XPC_NOT_ENOUGH_ARGS); jsval *argv = JS_ARGV(cx, vp); @@ -244,40 +243,8 @@ nsICanvasRenderingContextWebGL_ReadPixels(JSContext *cx, uintN argc, jsval *vp) GET_UINT32_ARG(argv4, 4); GET_UINT32_ARG(argv5, 5); - if (argc == 6) { - /*** BEGIN old API deprecated code. Eventually drop that. ***/ - // the code here is ugly, but temporary. It comes from the old ReadPixels implementation. - // Remove it as soon as it's OK to drop the old API. - - PRInt32 byteLength; - rv = self->ReadPixels_byteLength_old_API_deprecated(argv2, argv3, argv4, argv5, &byteLength); - if (NS_FAILED(rv)) { - xpc_qsThrow(cx, NS_ERROR_FAILURE); - return JS_FALSE; - } - JSObject *abufObject = js_CreateArrayBuffer(cx, byteLength); - if (!abufObject) { - xpc_qsThrow(cx, NS_ERROR_FAILURE); - return JS_FALSE; - } - - js::ArrayBuffer *abuf = js::ArrayBuffer::fromJSObject(abufObject); - - rv = self->ReadPixels_buf( - argv0, argv1, argv2, argv3, argv4, argv5, abuf); - if (NS_FAILED(rv)) { - xpc_qsThrow(cx, NS_ERROR_FAILURE); - return JS_FALSE; - } - JSObject *retval = js_CreateTypedArrayWithBuffer(cx, js::TypedArray::TYPE_UINT8, - abufObject, 0, byteLength); - - *vp = OBJECT_TO_JSVAL(retval); - return JS_TRUE; // return here to be unaffected by the *vp = JSVAL_VOID; below - - /*** END old API deprecated code ***/ - } else if (argc == 7 && - !JSVAL_IS_PRIMITIVE(argv[6])) + if (argc == 7 && + !JSVAL_IS_PRIMITIVE(argv[6])) { JSObject *argv6 = JSVAL_TO_OBJECT(argv[6]); if (js_IsArrayBuffer(argv6)) { @@ -306,7 +273,7 @@ nsICanvasRenderingContextWebGL_ReadPixels(JSContext *cx, uintN argc, jsval *vp) /* * TexImage2D takes: - * TexImage2D(uint, int, uint, int, int, int, uint, uint, ArrayBufferView)\ + * TexImage2D(uint, int, uint, int, int, int, uint, uint, ArrayBufferView) * TexImage2D(uint, int, uint, uint, uint, nsIDOMElement) * TexImage2D(uint, int, uint, uint, uint, ImageData) */ @@ -326,9 +293,7 @@ nsICanvasRenderingContextWebGL_TexImage2D(JSContext *cx, uintN argc, jsval *vp) if (!xpc_qsUnwrapThis(cx, obj, nsnull, &self, &selfref.ptr, tvr.jsval_addr(), nsnull)) return JS_FALSE; - // XXX we currently allow passing only 3 args to support the API. Eventually drop that. - // if (argc < 6 || argc == 7 || argc == 8) - if (argc < 3) + if (argc < 6 || argc == 7 || argc == 8) return xpc_qsThrow(cx, NS_ERROR_XPC_NOT_ENOUGH_ARGS); jsval *argv = JS_ARGV(cx, vp); @@ -337,22 +302,9 @@ nsICanvasRenderingContextWebGL_TexImage2D(JSContext *cx, uintN argc, jsval *vp) GET_UINT32_ARG(argv0, 0); GET_INT32_ARG(argv1, 1); - if (argc > 2 && JSVAL_IS_OBJECT(argv[2])) { - // the old API. Eventually drop that. - - nsIDOMElement *elt; - xpc_qsSelfRef eltRef; - rv = xpc_qsUnwrapArg(cx, argv[2], &elt, &eltRef.ptr, &argv[2]); - if (NS_FAILED(rv)) return JS_FALSE; - - GET_OPTIONAL_UINT32_ARG(argv3, 3); - GET_OPTIONAL_UINT32_ARG(argv4, 4); - - rv = self->TexImage2D_dom_old_API_deprecated(argv0, argv1, elt, argv3, argv4); - } else if (argc > 5 && - !JSVAL_IS_PRIMITIVE(argv[5])) + if (argc > 5 && + !JSVAL_IS_PRIMITIVE(argv[5])) { - // implement the variants taking a DOMElement as argv[5] GET_UINT32_ARG(argv2, 2); GET_UINT32_ARG(argv3, 3); diff --git a/content/canvas/src/WebGLContext.cpp b/content/canvas/src/WebGLContext.cpp index d9071bf9efc6..93133e92da4b 100644 --- a/content/canvas/src/WebGLContext.cpp +++ b/content/canvas/src/WebGLContext.cpp @@ -56,6 +56,8 @@ #include "GLContextProvider.h" +#include "prenv.h" + using namespace mozilla; using namespace mozilla::gl; @@ -275,29 +277,77 @@ WebGLContext::SetDimensions(PRInt32 width, PRInt32 height) format.depth = 16; format.minDepth = 1; - gl = gl::GLContextProvider::CreateOffscreen(gfxIntSize(width, height), format); + +#ifdef XP_WIN + // On Windows, we may have a choice of backends, including straight + // OpenGL, D3D through ANGLE via EGL, or straight EGL/GLES2. + // We don't differentiate the latter two yet, but we allow for + // a env var to try EGL first, instead of last. + bool preferEGL = PR_GetEnv("MOZ_WEBGL_PREFER_EGL") != nsnull; + + // if we want EGL, try it first + if (!gl && preferEGL) { + gl = gl::GLContextProviderEGL::CreateOffscreen(gfxIntSize(width, height), format); + if (gl && !InitAndValidateGL()) { + gl = nsnull; + } + } + + // if it failed, then try the default provider, whatever that is + if (!gl) { + gl = gl::GLContextProvider::CreateOffscreen(gfxIntSize(width, height), format); + if (gl && !InitAndValidateGL()) { + gl = nsnull; + } + } + + // if that failed, and we weren't already preferring EGL, try it now. + if (!gl && !preferEGL) { + gl = gl::GLContextProviderEGL::CreateOffscreen(gfxIntSize(width, height), format); + if (gl && !InitAndValidateGL()) { + gl = nsnull; + } + } +#else + // other platforms just use whatever the default is + if (!gl) { + gl = gl::GLContextProvider::CreateOffscreen(gfxIntSize(width, height), format); + if (gl && !InitAndValidateGL()) { + gl = nsnull; + } + } +#endif + + // last chance, try OSMesa + if (!gl) { + gl = gl::GLContextProviderOSMesa::CreateOffscreen(gfxIntSize(width, height), format); + if (gl) { + if (!InitAndValidateGL()) { + gl = nsnull; + } else { + // make sure we notify always in this case, because it's likely going to be + // painfully slow + LogMessage("WebGL: Using software rendering via OSMesa"); + } + } + } + + if (!gl) { + LogMessage("WebGL: Can't get a usable OpenGL context."); + return NS_ERROR_FAILURE; + } printf_stderr ("--- WebGL context created: %p\n", gl.get()); -#ifdef USE_GLES2 - // On native GLES2, no need to validate, the compiler will do it - mShaderValidation = PR_FALSE; -#else - // Check the shader validator pref - nsCOMPtr prefService = do_GetService(NS_PREFSERVICE_CONTRACTID); - NS_ENSURE_TRUE(prefService != nsnull, NS_ERROR_FAILURE); + if (gl->IsGLES2()) { + // On native GLES2, no need to validate, the compiler will do it + mShaderValidation = PR_FALSE; + } else { + // Otherwise, check the shader validator pref + nsCOMPtr prefService = do_GetService(NS_PREFSERVICE_CONTRACTID); + NS_ENSURE_TRUE(prefService != nsnull, NS_ERROR_FAILURE); - prefService->GetBoolPref("webgl.shader_validator", &mShaderValidation); -#endif - - if (!InitAndValidateGL()) { - gl = gl::GLContextProviderOSMesa::CreateOffscreen(gfxIntSize(width, height), format); - if (!InitAndValidateGL()) { - LogMessage("WebGL: Can't get a usable OpenGL context."); - return NS_ERROR_FAILURE; - } - - LogMessage("WebGL: Using software rendering via OSMesa"); + prefService->GetBoolPref("webgl.shader_validator", &mShaderValidation); } mWidth = width; diff --git a/content/canvas/src/WebGLContextGL.cpp b/content/canvas/src/WebGLContextGL.cpp index 6cca56ad5cd5..5d22937e6407 100644 --- a/content/canvas/src/WebGLContextGL.cpp +++ b/content/canvas/src/WebGLContextGL.cpp @@ -2409,58 +2409,6 @@ WebGLContext::ReadPixels_buf(WebGLint x, WebGLint y, WebGLsizei width, WebGLsize pixels ? pixels->byteLength : 0); } -NS_IMETHODIMP -WebGLContext::ReadPixels_byteLength_old_API_deprecated(WebGLsizei width, WebGLsizei height, - WebGLenum format, WebGLenum type, WebGLsizei *retval) -{ - *retval = 0; - if (width < 0 || height < 0) - return ErrorInvalidValue("ReadPixels: negative size passed"); - - PRUint32 size = 0; - switch (format) { - case LOCAL_GL_ALPHA: - size = 1; - break; - case LOCAL_GL_RGB: - size = 3; - break; - case LOCAL_GL_RGBA: - size = 4; - break; - default: - return ErrorInvalidEnumInfo("ReadPixels: format", format); - } - - switch (type) { -// case LOCAL_GL_UNSIGNED_SHORT_4_4_4_4: -// case LOCAL_GL_UNSIGNED_SHORT_5_5_5_1: -// case LOCAL_GL_UNSIGNED_SHORT_5_6_5: - case LOCAL_GL_UNSIGNED_BYTE: - break; - default: - return ErrorInvalidEnumInfo("ReadPixels: type", type); - } - PRUint32 packAlignment; - gl->fGetIntegerv(LOCAL_GL_PACK_ALIGNMENT, (GLint*) &packAlignment); - - CheckedUint32 checked_plainRowSize = CheckedUint32(width) * size; - - // alignedRowSize = row size rounded up to next multiple of - // packAlignment which is a power of 2 - CheckedUint32 checked_alignedRowSize - = ((checked_plainRowSize + packAlignment-1) / packAlignment) * packAlignment; - - CheckedUint32 checked_neededByteLength = (height-1)*checked_alignedRowSize + checked_plainRowSize; - - if (!checked_neededByteLength.valid()) - return ErrorInvalidOperation("ReadPixels: integer overflow computing the needed buffer size"); - - *retval = checked_neededByteLength.value(); - - return NS_OK; -} - NS_IMETHODIMP WebGLContext::RenderbufferStorage(WebGLenum target, WebGLenum internalformat, WebGLsizei width, WebGLsizei height) { @@ -3229,27 +3177,6 @@ WebGLContext::TexImage2D_dom(WebGLenum target, WebGLint level, WebGLenum interna isurf->Data(), byteLength); } -NS_IMETHODIMP -WebGLContext::TexImage2D_dom_old_API_deprecated(WebGLenum target, WebGLint level, nsIDOMElement *elt, - PRBool flipY, PRBool premultiplyAlpha) -{ - nsRefPtr isurf; - - nsresult rv = DOMElementToImageSurface(elt, getter_AddRefs(isurf), - flipY, premultiplyAlpha); - if (NS_FAILED(rv)) - return rv; - - NS_ASSERTION(isurf->Stride() == isurf->Width() * 4, "Bad stride!"); - - PRUint32 byteLength = isurf->Stride() * isurf->Height(); - - return TexImage2D_base(target, level, LOCAL_GL_RGBA, - isurf->Width(), isurf->Height(), 0, - LOCAL_GL_RGBA, LOCAL_GL_UNSIGNED_BYTE, - isurf->Data(), byteLength); -} - NS_IMETHODIMP WebGLContext::TexSubImage2D(PRInt32 dummy) { diff --git a/content/html/content/crashtests/580507-1.xhtml b/content/html/content/crashtests/580507-1.xhtml new file mode 100644 index 000000000000..eff3fb255d6d --- /dev/null +++ b/content/html/content/crashtests/580507-1.xhtml @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/content/html/content/crashtests/crashtests.list b/content/html/content/crashtests/crashtests.list index 41a3cd9d61ca..89e35e898d62 100644 --- a/content/html/content/crashtests/crashtests.list +++ b/content/html/content/crashtests/crashtests.list @@ -16,3 +16,4 @@ load 515829-1.html load 515829-2.html load 570566-1.html load 571428-1.html +load 580507-1.xhtml diff --git a/content/html/content/public/nsITextAreaElement.idl b/content/html/content/public/nsITextAreaElement.idl deleted file mode 100644 index d59bb576bd2f..000000000000 --- a/content/html/content/public/nsITextAreaElement.idl +++ /dev/null @@ -1,53 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either of the GNU General Public License Version 2 or later (the "GPL"), - * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "nsISupports.idl" - -/** - * This interface is used so that the parser can notify the textarea when - * it has finished loading content. - */ - -[scriptable, uuid(36878df2-1dd2-11b2-99a0-ea9fab347485)] -interface nsITextAreaElement : nsISupports -{ - /** - * Called when the parser is done adding child content - * to the select during document loading. - */ - void doneAddingChildren(); -}; diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in index 2439b265a682..82887c91f10f 100644 --- a/content/html/content/src/Makefile.in +++ b/content/html/content/src/Makefile.in @@ -128,7 +128,6 @@ endif FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk INCLUDES += \ diff --git a/content/html/content/src/nsHTMLMapElement.cpp b/content/html/content/src/nsHTMLMapElement.cpp index 3af535689cd1..7d9deb7f936b 100644 --- a/content/html/content/src/nsHTMLMapElement.cpp +++ b/content/html/content/src/nsHTMLMapElement.cpp @@ -66,11 +66,6 @@ public: // nsIDOMHTMLMapElement NS_DECL_NSIDOMHTMLMAPELEMENT - virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent, - nsIContent* aBindingParent, - PRBool aCompileEventHandlers); - virtual void UnbindFromTree(PRBool aDeep = PR_TRUE, - PRBool aNullParent = PR_TRUE); virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const; NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_NO_UNLINK(nsHTMLMapElement, @@ -110,38 +105,6 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLMapElement) nsGenericHTMLElement) NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLMapElement) - -nsresult -nsHTMLMapElement::BindToTree(nsIDocument* aDocument, nsIContent* aParent, - nsIContent* aBindingParent, - PRBool aCompileEventHandlers) -{ - nsresult rv = nsGenericHTMLElement::BindToTree(aDocument, aParent, - aBindingParent, - aCompileEventHandlers); - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr htmlDoc = do_QueryInterface(aDocument); - - if (htmlDoc) { - htmlDoc->AddImageMap(this); - } - - return rv; -} - -void -nsHTMLMapElement::UnbindFromTree(PRBool aDeep, PRBool aNullParent) -{ - nsCOMPtr htmlDoc = do_QueryInterface(GetCurrentDoc()); - - if (htmlDoc) { - htmlDoc->RemoveImageMap(this); - } - - nsGenericHTMLElement::UnbindFromTree(aDeep, aNullParent); -} - NS_IMPL_ELEMENT_CLONE(nsHTMLMapElement) diff --git a/content/html/content/src/nsTextEditorState.cpp b/content/html/content/src/nsTextEditorState.cpp index c161fde3d849..9b6968c4a02c 100644 --- a/content/html/content/src/nsTextEditorState.cpp +++ b/content/html/content/src/nsTextEditorState.cpp @@ -1835,6 +1835,10 @@ nsTextEditorState::ValueWasChanged(PRBool aNotify) void nsTextEditorState::UpdatePlaceholderText(PRBool aNotify) { + // If we don't have a placeholder div, there's nothing to do. + if (!mPlaceholderDiv) + return; + nsAutoString placeholderValue; nsCOMPtr content = do_QueryInterface(mTextCtrlElement); diff --git a/content/html/content/test/Makefile.in b/content/html/content/test/Makefile.in index ca76a2409e7b..0cd86429a6b5 100644 --- a/content/html/content/test/Makefile.in +++ b/content/html/content/test/Makefile.in @@ -179,8 +179,9 @@ _TEST_FILES = \ test_bug546995-5.html \ file_bug546995.html \ test_bug377624.html \ - test_bug562932.html \ test_bug551846.html \ + test_bug562932.html \ + test_bug564001.html \ test_bug566046.html \ test_bug567938-1.html \ test_bug567938-2.html \ diff --git a/content/html/content/test/test_bug430351.html b/content/html/content/test/test_bug430351.html index 70830a5d9703..ac7fdc9dd4e1 100644 --- a/content/html/content/test/test_bug430351.html +++ b/content/html/content/test/test_bug430351.html @@ -80,6 +80,13 @@ var focusableElements = [ "", "", + "", + "", + "", + "", + "", + "", + "", "", "", @@ -179,13 +186,6 @@ var nonFocusableElements = [ "
", "
", - "", - "", - "", - "", - "", - "", - "", "", "", @@ -280,12 +280,19 @@ var focusableInContentEditable = [ "", "", + "", "", + "", "", + "", "", + "", "", + "", "", + "", "", + "", "", "", diff --git a/content/html/content/test/test_bug564001.html b/content/html/content/test/test_bug564001.html new file mode 100644 index 000000000000..e1df0e3a3558 --- /dev/null +++ b/content/html/content/test/test_bug564001.html @@ -0,0 +1,49 @@ + + + + + Test for Bug 564001 + + + + + + +Mozilla Bug 564001 +

+ +
+
+
+ + diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp index 0d7f2b3c177d..f90daa7e071e 100644 --- a/content/html/document/src/nsHTMLDocument.cpp +++ b/content/html/document/src/nsHTMLDocument.cpp @@ -243,7 +243,6 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(nsHTMLDocument) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsHTMLDocument, nsDocument) NS_ASSERTION(!nsCCUncollectableMarker::InGeneration(cb, tmp->GetMarkedCCGeneration()), "Shouldn't traverse nsHTMLDocument!"); - NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMARRAY(mImageMaps) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mImages) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mApplets) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mEmbeds) @@ -252,13 +251,14 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsHTMLDocument, nsDocument) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR_AMBIGUOUS(mForms, nsIDOMNodeList) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR_AMBIGUOUS(mFormControls, nsIDOMNodeList) + NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR_AMBIGUOUS(mImageMaps, + nsIDOMNodeList) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mWyciwygChannel) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mMidasCommandManager) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mFragmentParser) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsHTMLDocument, nsDocument) - NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMARRAY(mImageMaps) NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mImages) NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mApplets) NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mEmbeds) @@ -266,6 +266,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsHTMLDocument, nsDocument) NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mAnchors) NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mForms) NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mFormControls) + NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mImageMaps) NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mWyciwygChannel) NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mMidasCommandManager) NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mFragmentParser) @@ -330,7 +331,6 @@ nsHTMLDocument::ResetToURI(nsIURI *aURI, nsILoadGroup *aLoadGroup, mLinks = nsnull; mAnchors = nsnull; - mImageMaps.Clear(); mForms = nsnull; NS_ASSERTION(!mWyciwygChannel, @@ -1157,39 +1157,20 @@ nsHTMLDocument::SetTitle(const nsAString& aTitle) return nsDocument::SetTitle(aTitle); } -nsresult -nsHTMLDocument::AddImageMap(nsIDOMHTMLMapElement* aMap) -{ - // XXX We should order the maps based on their order in the document. - // XXX Otherwise scripts that add/remove maps with duplicate names - // XXX will cause problems - NS_PRECONDITION(nsnull != aMap, "null ptr"); - if (nsnull == aMap) { - return NS_ERROR_NULL_POINTER; - } - if (mImageMaps.AppendObject(aMap)) { - return NS_OK; - } - return NS_ERROR_OUT_OF_MEMORY; -} - -void -nsHTMLDocument::RemoveImageMap(nsIDOMHTMLMapElement* aMap) -{ - NS_PRECONDITION(nsnull != aMap, "null ptr"); - mImageMaps.RemoveObject(aMap); -} - nsIDOMHTMLMapElement * nsHTMLDocument::GetImageMap(const nsAString& aMapName) { - nsAutoString name; - PRUint32 i, n = mImageMaps.Count(); - nsIDOMHTMLMapElement *firstMatch = nsnull; + if (!mImageMaps) { + mImageMaps = new nsContentList(this, nsGkAtoms::map, kNameSpaceID_XHTML); + } + NS_ASSERTION(mImageMaps, "Infallible malloc failed."); + nsIDOMHTMLMapElement* firstMatch = nsnull; + nsAutoString name; + PRUint32 i, n = mImageMaps->Length(PR_TRUE); for (i = 0; i < n; ++i) { - nsIDOMHTMLMapElement *map = mImageMaps[i]; - NS_ASSERTION(map, "Null map in map list!"); + nsCOMPtr map( + do_QueryInterface(mImageMaps->GetNodeAt(i))); PRBool match; nsresult rv; diff --git a/content/html/document/src/nsHTMLDocument.h b/content/html/document/src/nsHTMLDocument.h index 555b8f7723bf..0d5e5375d2e6 100644 --- a/content/html/document/src/nsHTMLDocument.h +++ b/content/html/document/src/nsHTMLDocument.h @@ -105,10 +105,6 @@ public: virtual void EndLoad(); - virtual nsresult AddImageMap(nsIDOMHTMLMapElement* aMap); - - virtual void RemoveImageMap(nsIDOMHTMLMapElement* aMap); - virtual nsIDOMHTMLMapElement *GetImageMap(const nsAString& aMapName); virtual void SetCompatibilityMode(nsCompatibility aMode); @@ -289,8 +285,6 @@ protected: return kNameSpaceID_XHTML; } - nsCOMArray mImageMaps; - nsCOMPtr mImages; nsCOMPtr mApplets; nsCOMPtr mEmbeds; @@ -298,6 +292,7 @@ protected: nsCOMPtr mAnchors; nsRefPtr mForms; nsRefPtr mFormControls; + nsRefPtr mImageMaps; /** # of forms in the document, synchronously set */ PRInt32 mNumForms; diff --git a/content/html/document/src/nsIHTMLDocument.h b/content/html/document/src/nsIHTMLDocument.h index defe3de6b06e..156d84ff00a7 100644 --- a/content/html/document/src/nsIHTMLDocument.h +++ b/content/html/document/src/nsIHTMLDocument.h @@ -54,8 +54,8 @@ class nsIScriptElement; class nsIEditor; #define NS_IHTMLDOCUMENT_IID \ -{ 0x1e1dc0fa, 0xf13e, 0x4abd, \ - { 0xa0, 0x95, 0x92, 0xa6, 0x7a, 0x31, 0x3c, 0x50 } } +{ 0x840cacc9, 0x1956, 0x4987, \ + { 0x80, 0x6e, 0xc6, 0xab, 0x19, 0x1b, 0x92, 0xd2 } } /** @@ -66,12 +66,8 @@ class nsIHTMLDocument : public nsISupports public: NS_DECLARE_STATIC_IID_ACCESSOR(NS_IHTMLDOCUMENT_IID) - virtual nsresult AddImageMap(nsIDOMHTMLMapElement* aMap) = 0; - virtual nsIDOMHTMLMapElement *GetImageMap(const nsAString& aMapName) = 0; - virtual void RemoveImageMap(nsIDOMHTMLMapElement* aMap) = 0; - /** * Set compatibility mode for this document */ diff --git a/content/xul/templates/src/nsXMLBinding.cpp b/content/xul/templates/src/nsXMLBinding.cpp index 15b884151d80..cbb8ee24777a 100644 --- a/content/xul/templates/src/nsXMLBinding.cpp +++ b/content/xul/templates/src/nsXMLBinding.cpp @@ -41,6 +41,28 @@ NS_IMPL_ADDREF(nsXMLBindingSet) NS_IMPL_RELEASE(nsXMLBindingSet) +NS_IMPL_CYCLE_COLLECTION_CLASS(nsXMLBindingSet) + +NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_NATIVE(nsXMLBindingSet) + nsXMLBinding* binding = tmp->mFirst; + while (binding) { + binding->mExpr = nsnull; + binding = binding->mNext; + } +NS_IMPL_CYCLE_COLLECTION_UNLINK_END + +NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NATIVE_BEGIN(nsXMLBindingSet) + nsXMLBinding* binding = tmp->mFirst; + while (binding) { + NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "nsXMLBinding::mExpr"); + cb.NoteXPCOMChild(binding->mExpr); + binding = binding->mNext; + } +NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END + +NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(nsXMLBindingSet, AddRef) +NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(nsXMLBindingSet, Release) + nsresult nsXMLBindingSet::AddBinding(nsIAtom* aVar, nsIDOMXPathExpression* aExpr) { diff --git a/content/xul/templates/src/nsXMLBinding.h b/content/xul/templates/src/nsXMLBinding.h index a304e1172c06..16599032dccf 100644 --- a/content/xul/templates/src/nsXMLBinding.h +++ b/content/xul/templates/src/nsXMLBinding.h @@ -39,6 +39,7 @@ #include "nsAutoPtr.h" #include "nsIAtom.h" +#include "nsCycleCollectionParticipant.h" class nsXULTemplateResultXML; class nsXMLBindingValues; @@ -88,6 +89,7 @@ public: NS_IMETHOD_(nsrefcnt) AddRef(); NS_IMETHOD_(nsrefcnt) Release(); NS_DECL_OWNINGTHREAD + NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(nsXMLBindingSet) /** * Add a binding to the set diff --git a/content/xul/templates/src/nsXULTemplateBuilder.cpp b/content/xul/templates/src/nsXULTemplateBuilder.cpp index e4870be1a8b8..c7d721688602 100644 --- a/content/xul/templates/src/nsXULTemplateBuilder.cpp +++ b/content/xul/templates/src/nsXULTemplateBuilder.cpp @@ -145,7 +145,7 @@ nsXULTemplateBuilder::nsXULTemplateBuilder(void) } static PLDHashOperator -DestroyMatchList(nsISupports* aKey, nsTemplateMatch* aMatch, void* aContext) +DestroyMatchList(nsISupports* aKey, nsTemplateMatch*& aMatch, void* aContext) { nsFixedSizeAllocator* pool = static_cast(aContext); @@ -156,7 +156,7 @@ DestroyMatchList(nsISupports* aKey, nsTemplateMatch* aMatch, void* aContext) aMatch = next; } - return PL_DHASH_NEXT; + return PL_DHASH_REMOVE; } nsXULTemplateBuilder::~nsXULTemplateBuilder(void) @@ -235,8 +235,7 @@ nsXULTemplateBuilder::Uninit(PRBool aIsFinal) mQuerySets.Clear(); - mMatchMap.EnumerateRead(DestroyMatchList, &mPool); - mMatchMap.Clear(); + mMatchMap.Enumerate(DestroyMatchList, &mPool); mRootResult = nsnull; mRefVariable = nsnull; @@ -267,6 +266,13 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsXULTemplateBuilder) NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mDataSource) NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mDB) NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mCompDB) + NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mRoot) + NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mRootResult) + NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMARRAY(mListeners) + NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mQueryProcessor) + if (tmp->mMatchMap.IsInitialized()) { + tmp->mMatchMap.Enumerate(DestroyMatchList, &(tmp->mPool)); + } NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXULTemplateBuilder) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mDataSource) diff --git a/content/xul/templates/src/nsXULTemplateQueryProcessorXML.cpp b/content/xul/templates/src/nsXULTemplateQueryProcessorXML.cpp index 0b7bcf1d17ed..9217091c5ef4 100644 --- a/content/xul/templates/src/nsXULTemplateQueryProcessorXML.cpp +++ b/content/xul/templates/src/nsXULTemplateQueryProcessorXML.cpp @@ -109,12 +109,34 @@ nsXULTemplateResultSetXML::GetNext(nsISupports **aResult) // nsXULTemplateQueryProcessorXML // +static PLDHashOperator +TraverseRuleToBindingsMap(nsISupports* aKey, nsXMLBindingSet* aMatch, void* aContext) +{ + nsCycleCollectionTraversalCallback *cb = + static_cast(aContext); + NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(*cb, "mRuleToBindingsMap key"); + cb->NoteXPCOMChild(aKey); + NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(*cb, "mRuleToBindingsMap value"); + cb->NoteNativeChild(aMatch, &NS_CYCLE_COLLECTION_NAME(nsXMLBindingSet)); + return PL_DHASH_NEXT; +} + NS_IMPL_CYCLE_COLLECTION_CLASS(nsXULTemplateQueryProcessorXML) NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsXULTemplateQueryProcessorXML) + if (tmp->mRuleToBindingsMap.IsInitialized()) { + tmp->mRuleToBindingsMap.Clear(); + } + NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mRoot) + NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mEvaluator) NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mTemplateBuilder) NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mRequest) NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXULTemplateQueryProcessorXML) + if (tmp->mRuleToBindingsMap.IsInitialized()) { + tmp->mRuleToBindingsMap.EnumerateRead(TraverseRuleToBindingsMap, &cb); + } + NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mRoot) + NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mEvaluator) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mTemplateBuilder) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mRequest) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END diff --git a/content/xul/templates/tests/test_bug441785.xul b/content/xul/templates/tests/test_bug441785.xul index a67448cb1df0..b34d9dc9ea55 100644 --- a/content/xul/templates/tests/test_bug441785.xul +++ b/content/xul/templates/tests/test_bug441785.xul @@ -107,7 +107,6 @@ var oldtreefirstrow, oldtreecfirstrow; function nextDataSource() { - document.documentElement.getBoundingClientRect(); var tree = document.getElementById('t'); var treec = document.getElementById('tc'); tree.treeBoxObject.scrollToRow(10); diff --git a/docshell/test/chrome/bug364461_window.xul b/docshell/test/chrome/bug364461_window.xul index 98e848b8efac..0976d48bcb52 100644 --- a/docshell/test/chrome/bug364461_window.xul +++ b/docshell/test/chrome/bug364461_window.xul @@ -120,6 +120,7 @@ "test1"; gExpected = [{type: "pagehide", persisted: true}, + {type: "load", title: "test1"}, {type: "pageshow", title: "test1", persisted: false}]; gBrowser.loadURI(test1Doc); diff --git a/docshell/test/chrome/docshell_helpers.js b/docshell/test/chrome/docshell_helpers.js index 3c44497ebb3e..94e511e0362a 100755 --- a/docshell/test/chrome/docshell_helpers.js +++ b/docshell/test/chrome/docshell_helpers.js @@ -240,7 +240,7 @@ function pageEventListener(event) { try { dump("TEST: eventListener received a " + event.type + " event for page " + event.originalTarget.title + ", persisted=" + event.persisted + "\n"); - }catch(e) { + } catch(e) { // Ignore any exception. } @@ -293,8 +293,8 @@ function pageEventListener(event) { if (typeof(expected.persisted) != "undefined") { is(event.persisted, expected.persisted, - "The persisted property of the " + event.type + "event on page " + - event.originalTarget.title + " had an unexpected value"); + "The persisted property of the " + event.type + " event on page " + + event.originalTarget.location + " had an unexpected value"); } // If we're out of expected events, let doPageNavigation() return. diff --git a/docshell/test/test_bug511449.html b/docshell/test/test_bug511449.html index bbed8fbd7495..1e2aa1524c76 100644 --- a/docshell/test/test_bug511449.html +++ b/docshell/test/test_bug511449.html @@ -43,11 +43,13 @@ function runNextTest() { getInterface(Components.interfaces.nsIDOMWindowUtils); utils.sendNativeKeyEvent(0, 13 /* w */, 0x4000 /* cmd */, "w", "w"); - ok(didClose, "Cmd+W should have closed the tab"); - if (!didClose) { - win.close(); - } - SimpleTest.finish(); + setTimeout(function () { + ok(didClose, "Cmd+W should have closed the tab"); + if (!didClose) { + win.close(); + } + SimpleTest.finish(); + }, 1000); } diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index 54b2eafd87c9..e6c5be0293fc 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -631,12 +631,11 @@ static nsDOMClassInfoData sClassInfoData[] = { // to JS. - NS_DEFINE_CLASSINFO_DATA(Window, nsWindowSH, + NS_DEFINE_CLASSINFO_DATA(Window, nsOuterWindowSH, DEFAULT_SCRIPTABLE_FLAGS | WINDOW_SCRIPTABLE_FLAGS) - // XXX Wrong helper! - NS_DEFINE_CLASSINFO_DATA(InnerWindow, nsWindowSH, + NS_DEFINE_CLASSINFO_DATA(InnerWindow, nsInnerWindowSH, DEFAULT_SCRIPTABLE_FLAGS | WINDOW_SCRIPTABLE_FLAGS) @@ -927,12 +926,11 @@ static nsDOMClassInfoData sClassInfoData[] = { DOM_DEFAULT_SCRIPTABLE_FLAGS) // DOM Chrome Window class. - NS_DEFINE_CLASSINFO_DATA(ChromeWindow, nsWindowSH, + NS_DEFINE_CLASSINFO_DATA(ChromeWindow, nsOuterWindowSH, DEFAULT_SCRIPTABLE_FLAGS | WINDOW_SCRIPTABLE_FLAGS) - // XXX Wrong helper! - NS_DEFINE_CLASSINFO_DATA(InnerChromeWindow, nsWindowSH, + NS_DEFINE_CLASSINFO_DATA(InnerChromeWindow, nsInnerWindowSH, DEFAULT_SCRIPTABLE_FLAGS | WINDOW_SCRIPTABLE_FLAGS) @@ -1315,12 +1313,11 @@ static nsDOMClassInfoData sClassInfoData[] = { NS_DEFINE_CLASSINFO_DATA(FileReader, nsEventTargetSH, EVENTTARGET_SCRIPTABLE_FLAGS) - NS_DEFINE_CLASSINFO_DATA(ModalContentWindow, nsWindowSH, + NS_DEFINE_CLASSINFO_DATA(ModalContentWindow, nsOuterWindowSH, DEFAULT_SCRIPTABLE_FLAGS | WINDOW_SCRIPTABLE_FLAGS) - // XXX Wrong helper! - NS_DEFINE_CLASSINFO_DATA(InnerModalContentWindow, nsWindowSH, + NS_DEFINE_CLASSINFO_DATA(InnerModalContentWindow, nsInnerWindowSH, DEFAULT_SCRIPTABLE_FLAGS | WINDOW_SCRIPTABLE_FLAGS) @@ -4827,8 +4824,8 @@ nsDOMClassInfo::ShutDown() // Window helper NS_IMETHODIMP -nsWindowSH::PreCreate(nsISupports *nativeObj, JSContext *cx, - JSObject *globalObj, JSObject **parentObj) +nsCommonWindowSH::PreCreate(nsISupports *nativeObj, JSContext *cx, + JSObject *globalObj, JSObject **parentObj) { // Normally ::PreCreate() is used to give XPConnect the parent // object for the object that's being wrapped, this parent object is @@ -4847,6 +4844,10 @@ nsWindowSH::PreCreate(nsISupports *nativeObj, JSContext *cx, nsGlobalWindow *win = nsGlobalWindow::FromSupports(nativeObj); + if (win->IsOuterWindow()) { + win->EnsureInnerWindow(); + } + if (sgo) { *parentObj = sgo->GetGlobalJSObject(); @@ -4870,18 +4871,21 @@ nsWindowSH::PreCreate(nsISupports *nativeObj, JSContext *cx, static JSClass sGlobalScopePolluterClass = { "Global Scope Polluter", JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS | JSCLASS_NEW_RESOLVE, - nsWindowSH::SecurityCheckOnSetProp, nsWindowSH::SecurityCheckOnSetProp, - nsWindowSH::GlobalScopePolluterGetProperty, - nsWindowSH::SecurityCheckOnSetProp, JS_EnumerateStub, - (JSResolveOp)nsWindowSH::GlobalScopePolluterNewResolve, JS_ConvertStub, + nsCommonWindowSH::SecurityCheckOnSetProp, + nsCommonWindowSH::SecurityCheckOnSetProp, + nsCommonWindowSH::GlobalScopePolluterGetProperty, + nsCommonWindowSH::SecurityCheckOnSetProp, + JS_EnumerateStub, + (JSResolveOp)nsCommonWindowSH::GlobalScopePolluterNewResolve, + JS_ConvertStub, nsHTMLDocumentSH::ReleaseDocument }; // static JSBool -nsWindowSH::GlobalScopePolluterGetProperty(JSContext *cx, JSObject *obj, - jsid id, jsval *vp) +nsCommonWindowSH::GlobalScopePolluterGetProperty(JSContext *cx, JSObject *obj, + jsid id, jsval *vp) { // Someone is accessing a element by referencing its name/id in the // global scope, do a security check to make sure that's ok. @@ -4907,8 +4911,8 @@ nsWindowSH::GlobalScopePolluterGetProperty(JSContext *cx, JSObject *obj, // static JSBool -nsWindowSH::SecurityCheckOnSetProp(JSContext *cx, JSObject *obj, jsid id, - jsval *vp) +nsCommonWindowSH::SecurityCheckOnSetProp(JSContext *cx, JSObject *obj, jsid id, + jsval *vp) { // Someone is accessing a element by referencing its name/id in the // global scope, do a security check to make sure that's ok. @@ -4932,8 +4936,8 @@ GetDocument(JSContext *cx, JSObject *obj) // static JSBool -nsWindowSH::GlobalScopePolluterNewResolve(JSContext *cx, JSObject *obj, - jsid id, uintN flags, +nsCommonWindowSH::GlobalScopePolluterNewResolve(JSContext *cx, JSObject *obj, + jsid id, uintN flags, JSObject **objp) { if (flags & (JSRESOLVE_ASSIGNING | JSRESOLVE_DECLARING | @@ -5002,7 +5006,7 @@ nsWindowSH::GlobalScopePolluterNewResolve(JSContext *cx, JSObject *obj, // static void -nsWindowSH::InvalidateGlobalScopePolluter(JSContext *cx, JSObject *obj) +nsCommonWindowSH::InvalidateGlobalScopePolluter(JSContext *cx, JSObject *obj) { JSObject *proto; @@ -5029,8 +5033,8 @@ nsWindowSH::InvalidateGlobalScopePolluter(JSContext *cx, JSObject *obj) // static nsresult -nsWindowSH::InstallGlobalScopePolluter(JSContext *cx, JSObject *obj, - nsIHTMLDocument *doc) +nsCommonWindowSH::InstallGlobalScopePolluter(JSContext *cx, JSObject *obj, + nsIHTMLDocument *doc) { // If global scope pollution is disabled, or if our document is not // a HTML document, do nothing @@ -5097,8 +5101,8 @@ GetChildFrame(nsGlobalWindow *win, jsid id) } NS_IMETHODIMP -nsWindowSH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx, - JSObject *obj, jsid id, jsval *vp, PRBool *_retval) +nsCommonWindowSH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx, + JSObject *obj, jsid id, jsval *vp, PRBool *_retval) { nsGlobalWindow *win = nsGlobalWindow::FromWrapper(wrapper); @@ -5171,6 +5175,9 @@ nsWindowSH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx, // check and return. nsGlobalWindow *frameWin = (nsGlobalWindow *)frame.get(); + NS_ASSERTION(frameWin->IsOuterWindow(), "GetChildFrame gave us an inner?"); + + frameWin->EnsureInnerWindow(); nsCOMPtr holder; rv = WrapNative(cx, frameWin->GetGlobalJSObject(), frame, @@ -5195,7 +5202,7 @@ nsWindowSH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx, if (JSID_IS_STRING(id) && !JSVAL_IS_PRIMITIVE(*vp) && ::JS_TypeOfValue(cx, *vp) != JSTYPE_FUNCTION) { // A named property accessed which could have been resolved to a - // child frame in nsWindowSH::NewResolve() (*vp will tell us if + // child frame in nsCommonWindowSH::NewResolve() (*vp will tell us if // that's the case). If *vp is a window object (i.e. a child // frame), return without doing a security check. // @@ -5233,8 +5240,8 @@ nsWindowSH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx, } NS_IMETHODIMP -nsWindowSH::SetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx, - JSObject *obj, jsid id, jsval *vp, PRBool *_retval) +nsCommonWindowSH::SetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx, + JSObject *obj, jsid id, jsval *vp, PRBool *_retval) { nsGlobalWindow *win = nsGlobalWindow::FromWrapper(wrapper); @@ -5310,9 +5317,9 @@ nsWindowSH::SetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx, } NS_IMETHODIMP -nsWindowSH::AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx, - JSObject *obj, jsid id, jsval *vp, - PRBool *_retval) +nsCommonWindowSH::AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx, + JSObject *obj, jsid id, jsval *vp, + PRBool *_retval) { nsGlobalWindow *win = nsGlobalWindow::FromWrapper(wrapper); @@ -5369,9 +5376,9 @@ nsWindowSH::AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx, } NS_IMETHODIMP -nsWindowSH::DelProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx, - JSObject *obj, jsid id, jsval *vp, - PRBool *_retval) +nsCommonWindowSH::DelProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx, + JSObject *obj, jsid id, jsval *vp, + PRBool *_retval) { nsGlobalWindow *win = nsGlobalWindow::FromWrapper(wrapper); @@ -6213,8 +6220,8 @@ ResolvePrototype(nsIXPConnect *aXPConnect, nsGlobalWindow *aWin, JSContext *cx, // static nsresult -nsWindowSH::GlobalResolve(nsGlobalWindow *aWin, JSContext *cx, - JSObject *obj, JSString *str, PRBool *did_resolve) +nsCommonWindowSH::GlobalResolve(nsGlobalWindow *aWin, JSContext *cx, + JSObject *obj, JSString *str, PRBool *did_resolve) { *did_resolve = PR_FALSE; @@ -6454,12 +6461,12 @@ ContentWindowGetter(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, } PRBool -nsWindowSH::sResolving = PR_FALSE; +nsCommonWindowSH::sResolving = PR_FALSE; NS_IMETHODIMP -nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx, - JSObject *obj, jsid id, PRUint32 flags, - JSObject **objp, PRBool *_retval) +nsCommonWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx, + JSObject *obj, jsid id, PRUint32 flags, + JSObject **objp, PRBool *_retval) { nsGlobalWindow *win = nsGlobalWindow::FromWrapper(wrapper); @@ -7003,9 +7010,7 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx, return NS_OK; } } - } else if (id == sDialogArguments_id && - (mData == &sClassInfoData[eDOMClassInfo_InnerModalContentWindow_id] || - mData == &sClassInfoData[eDOMClassInfo_ModalContentWindow_id])) { + } else if (id == sDialogArguments_id && win->IsModalContentWindow()) { nsCOMPtr args; ((nsGlobalModalWindow *)win)->GetDialogArguments(getter_AddRefs(args)); @@ -7092,9 +7097,9 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx, } NS_IMETHODIMP -nsWindowSH::NewEnumerate(nsIXPConnectWrappedNative *wrapper, JSContext *cx, - JSObject *obj, PRUint32 enum_op, jsval *statep, - jsid *idp, PRBool *_retval) +nsCommonWindowSH::NewEnumerate(nsIXPConnectWrappedNative *wrapper, JSContext *cx, + JSObject *obj, PRUint32 enum_op, jsval *statep, + jsid *idp, PRBool *_retval) { switch ((JSIterateOp)enum_op) { /* FIXME bug 576449: non-enumerable property support */ @@ -7156,8 +7161,8 @@ nsWindowSH::NewEnumerate(nsIXPConnectWrappedNative *wrapper, JSContext *cx, } NS_IMETHODIMP -nsWindowSH::Finalize(nsIXPConnectWrappedNative *wrapper, JSContext *cx, - JSObject *obj) +nsCommonWindowSH::Finalize(nsIXPConnectWrappedNative *wrapper, JSContext *cx, + JSObject *obj) { nsCOMPtr sgo(do_QueryWrappedNative(wrapper)); NS_ENSURE_TRUE(sgo, NS_ERROR_UNEXPECTED); @@ -7168,8 +7173,8 @@ nsWindowSH::Finalize(nsIXPConnectWrappedNative *wrapper, JSContext *cx, } NS_IMETHODIMP -nsWindowSH::Equality(nsIXPConnectWrappedNative *wrapper, JSContext * cx, - JSObject * obj, const jsval &val, PRBool *bp) +nsCommonWindowSH::Equality(nsIXPConnectWrappedNative *wrapper, JSContext * cx, + JSObject * obj, const jsval &val, PRBool *bp) { *bp = PR_FALSE; @@ -7205,8 +7210,8 @@ nsWindowSH::Equality(nsIXPConnectWrappedNative *wrapper, JSContext * cx, } NS_IMETHODIMP -nsWindowSH::OuterObject(nsIXPConnectWrappedNative *wrapper, JSContext * cx, - JSObject * obj, JSObject * *_retval) +nsCommonWindowSH::OuterObject(nsIXPConnectWrappedNative *wrapper, JSContext * cx, + JSObject * obj, JSObject * *_retval) { nsGlobalWindow *origWin = nsGlobalWindow::FromWrapper(wrapper); nsGlobalWindow *win = origWin->GetOuterWindowInternal(); @@ -7233,8 +7238,8 @@ nsWindowSH::OuterObject(nsIXPConnectWrappedNative *wrapper, JSContext * cx, } NS_IMETHODIMP -nsWindowSH::InnerObject(nsIXPConnectWrappedNative *wrapper, JSContext * cx, - JSObject * obj, JSObject * *_retval) +nsCommonWindowSH::InnerObject(nsIXPConnectWrappedNative *wrapper, JSContext * cx, + JSObject * obj, JSObject * *_retval) { nsGlobalWindow *win = nsGlobalWindow::FromWrapper(wrapper); diff --git a/dom/base/nsDOMClassInfo.h b/dom/base/nsDOMClassInfo.h index 7de8aa32681b..af6c930a9d4a 100644 --- a/dom/base/nsDOMClassInfo.h +++ b/dom/base/nsDOMClassInfo.h @@ -478,14 +478,14 @@ public: // Window scriptable helper -class nsWindowSH : public nsEventReceiverSH +class nsCommonWindowSH : public nsEventReceiverSH { protected: - nsWindowSH(nsDOMClassInfoData* aData) : nsEventReceiverSH(aData) + nsCommonWindowSH(nsDOMClassInfoData *aData) : nsEventReceiverSH(aData) { } - virtual ~nsWindowSH() + virtual ~nsCommonWindowSH() { } @@ -553,10 +553,41 @@ public: static void InvalidateGlobalScopePolluter(JSContext *cx, JSObject *obj); static nsresult InstallGlobalScopePolluter(JSContext *cx, JSObject *obj, nsIHTMLDocument *doc); +}; +class nsOuterWindowSH : public nsCommonWindowSH +{ +protected: + nsOuterWindowSH(nsDOMClassInfoData* aData) : nsCommonWindowSH(aData) + { + } + + virtual ~nsOuterWindowSH() + { + } + +public: static nsIClassInfo *doCreate(nsDOMClassInfoData* aData) { - return new nsWindowSH(aData); + return new nsOuterWindowSH(aData); + } +}; + +class nsInnerWindowSH : public nsCommonWindowSH +{ +protected: + nsInnerWindowSH(nsDOMClassInfoData* aData) : nsCommonWindowSH(aData) + { + } + + virtual ~nsInnerWindowSH() + { + } + +public: + static nsIClassInfo *doCreate(nsDOMClassInfoData* aData) + { + return new nsInnerWindowSH(aData); } }; diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index d853cc9b0cc7..28a5f340e8fc 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -1304,13 +1304,6 @@ nsGlobalWindow::SetScriptContext(PRUint32 lang_id, nsIScriptContext *aScriptCont aScriptContext->SetGCOnDestruction(PR_FALSE); } - - nsCOMPtr principal = - do_CreateInstance("@mozilla.org/nullprincipal;1", &rv); - - aScriptContext->CreateOuterObject(this, principal); - aScriptContext->DidInitializeContext(); - mJSObject = (JSObject *)aScriptContext->GetNativeGlobal(); } mContext = aScriptContext; @@ -1620,6 +1613,10 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument, if (IsFrozen()) { // This outer is now getting its first inner, thaw the outer now // that it's ready and is getting an inner window. + mContext->CreateOuterObject(this, aDocument->NodePrincipal()); + mContext->DidInitializeContext(); + mJSObject = (JSObject *)mContext->GetNativeGlobal(); + Thaw(); } @@ -1745,7 +1742,7 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument, newInnerWindow = currentInner; if (aDocument != oldDoc) { - nsWindowSH::InvalidateGlobalScopePolluter(cx, currentInner->mJSObject); + nsCommonWindowSH::InvalidateGlobalScopePolluter(cx, currentInner->mJSObject); } } else { if (aState) { @@ -1930,8 +1927,8 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument, if ((!reUseInnerWindow || aDocument != oldDoc) && !aState) { nsCOMPtr html_doc(do_QueryInterface(mDocument)); - nsWindowSH::InstallGlobalScopePolluter(cx, newInnerWindow->mJSObject, - html_doc); + nsCommonWindowSH::InstallGlobalScopePolluter(cx, newInnerWindow->mJSObject, + html_doc); } // This code should not be called during shutdown any more (now that @@ -2471,7 +2468,7 @@ nsGlobalWindow::DefineArgumentsProperty(nsIArray *aArguments) if (mIsModalContentWindow) { // Modal content windows don't have an "arguments" property, they // have a "dialogArguments" property which is handled - // separately. See nsWindowSH::NewResolve(). + // separately. See nsCommonWindowSH::NewResolve(). return NS_OK; } diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp index 947df30dd8b2..55f039f4224b 100644 --- a/dom/base/nsJSEnvironment.cpp +++ b/dom/base/nsJSEnvironment.cpp @@ -3464,7 +3464,7 @@ nsJSContext::ClearScope(void *aGlobalObj, PRBool aClearFromProtoChain) // chain when we're clearing an outer window whose current inner we // still want. if (aClearFromProtoChain) { - nsWindowSH::InvalidateGlobalScopePolluter(mContext, obj); + nsCommonWindowSH::InvalidateGlobalScopePolluter(mContext, obj); // Clear up obj's prototype chain, but not Object.prototype. for (JSObject *o = ::JS_GetPrototype(mContext, obj), *next; @@ -3980,11 +3980,13 @@ SetMemoryHighWaterMarkPrefChangedCallback(const char* aPrefName, void* aClosure) PRInt32 highwatermark = nsContentUtils::GetIntPref(aPrefName, 32); if (highwatermark >= 32) { - // There are two options of memory usage in tracemonkey. One is - // to use malloc() and the other is to use memory for GC. (E.g. - // js_NewGCThing()/RefillDoubleFreeList()). - // Let's limit the high water mark for the first one to 32MB, - // and second one to 0xffffffff. + /* + * There are two ways to allocate memory in SpiderMonkey. One is + * to use jsmalloc() and the other is to use GC-owned memory + * (e.g. js_NewGCThing()). + * + * In the browser, we don't cap the amount of GC-owned memory. + */ JS_SetGCParameter(nsJSRuntime::sRuntime, JSGC_MAX_MALLOC_BYTES, 64L * 1024L * 1024L); JS_SetGCParameter(nsJSRuntime::sRuntime, JSGC_MAX_BYTES, diff --git a/dom/base/nsLocation.cpp b/dom/base/nsLocation.cpp index fb2ecdb760ad..4a6822300d1c 100644 --- a/dom/base/nsLocation.cpp +++ b/dom/base/nsLocation.cpp @@ -404,7 +404,7 @@ nsLocation::GetHost(nsAString& aHost) } } - return result; + return NS_OK; } NS_IMETHODIMP @@ -443,7 +443,7 @@ nsLocation::GetHostname(nsAString& aHostname) } } - return result; + return NS_OK; } NS_IMETHODIMP diff --git a/dom/base/nsPIDOMWindow.h b/dom/base/nsPIDOMWindow.h index 37cbb4fd152e..110d7264c7a8 100644 --- a/dom/base/nsPIDOMWindow.h +++ b/dom/base/nsPIDOMWindow.h @@ -397,11 +397,6 @@ public: virtual PRBool CanClose() = 0; virtual nsresult ForceClose() = 0; - void SetModalContentWindow(PRBool aIsModalContentWindow) - { - mIsModalContentWindow = aIsModalContentWindow; - } - PRBool IsModalContentWindow() const { return mIsModalContentWindow; diff --git a/dom/base/nsScriptNameSpaceManager.cpp b/dom/base/nsScriptNameSpaceManager.cpp index fe2927337c9d..eca0f85869c1 100644 --- a/dom/base/nsScriptNameSpaceManager.cpp +++ b/dom/base/nsScriptNameSpaceManager.cpp @@ -288,7 +288,7 @@ nsScriptNameSpaceManager::FillHash(nsICategoryManager *aCategoryManager, // count), once such an interface is found the "nsIDOM" prefix is cut // off the name and the rest of the name is added into the hash for // global names. This makes things like 'Node.ELEMENT_NODE' work in -// JS. See nsWindowSH::GlobalResolve() for detais on how this is used. +// JS. See nsCommonWindowSH::GlobalResolve() for detais on how this is used. nsresult nsScriptNameSpaceManager::FillHashWithDOMInterfaces() diff --git a/dom/interfaces/canvas/nsICanvasRenderingContextWebGL.idl b/dom/interfaces/canvas/nsICanvasRenderingContextWebGL.idl index dac0a2e91196..f5f118c46878 100644 --- a/dom/interfaces/canvas/nsICanvasRenderingContextWebGL.idl +++ b/dom/interfaces/canvas/nsICanvasRenderingContextWebGL.idl @@ -128,7 +128,7 @@ interface nsIWebGLUniformLocation : nsISupports }; -[scriptable, uuid(f02c85e0-8305-11de-abe2-000c29206271)] +[scriptable, uuid(2f21ca21-9720-4eee-ad94-27eefe4f72dc)] interface nsICanvasRenderingContextWebGL : nsISupports { // @@ -725,8 +725,6 @@ interface nsICanvasRenderingContextWebGL : nsISupports in WebGLenum format, in WebGLenum type, in WebGLArrayPtr pixels); [noscript] void readPixels_buf(in WebGLint x, in WebGLint y, in WebGLsizei width, in WebGLsizei height, in WebGLenum format, in WebGLenum type, in WebGLArrayBufferPtr pixels); - [noscript] WebGLsizei readPixels_byteLength_old_API_deprecated( - in WebGLsizei width, in WebGLsizei height, in WebGLenum format, in WebGLenum type); //void glReleaseShaderCompiler(); @@ -754,9 +752,6 @@ interface nsICanvasRenderingContextWebGL : nsISupports // HTMLImageElement, HTMLCanvasElement, HTMLVideoElement [noscript] void texImage2D_dom(in WebGLenum target, in WebGLint level, in WebGLenum internalformat, in WebGLenum format, in WebGLenum type, in nsIDOMElement element); - // XXX the old API. Eventually drop that. - [noscript] void TexImage2D_dom_old_API_deprecated(in WebGLenum target, in WebGLint level, - in nsIDOMElement element, in PRBool flipY, in PRBool premultiplyAlpha); void texSubImage2D([optional] in long dummy); [noscript] void texSubImage2D_buf(in WebGLenum target, in WebGLint level, diff --git a/dom/tests/mochitest/bugs/Makefile.in b/dom/tests/mochitest/bugs/Makefile.in index 318dbafe297a..0fb16697a975 100644 --- a/dom/tests/mochitest/bugs/Makefile.in +++ b/dom/tests/mochitest/bugs/Makefile.in @@ -116,6 +116,7 @@ _TEST_FILES = \ test_bug563487.html \ test_bug545314.html \ test_bug548828.html \ + test_bug562433.html \ test_DOMWindowCreated_chromeonly.html \ test_bug581072.html \ test_bug583225.html \ diff --git a/dom/tests/mochitest/bugs/test_bug562433.html b/dom/tests/mochitest/bugs/test_bug562433.html new file mode 100644 index 000000000000..571e73cac20e --- /dev/null +++ b/dom/tests/mochitest/bugs/test_bug562433.html @@ -0,0 +1,36 @@ + + + + + Test for Bug 562433 + + + + + +Mozilla Bug 562433 +

+ +
+
+
+ + diff --git a/editor/libeditor/base/nsEditorCommands.cpp b/editor/libeditor/base/nsEditorCommands.cpp index e3f2039818f8..79e99ec88fad 100644 --- a/editor/libeditor/base/nsEditorCommands.cpp +++ b/editor/libeditor/base/nsEditorCommands.cpp @@ -47,6 +47,7 @@ #include "nsIClipboard.h" #include "nsEditorCommands.h" +#include "nsIDocument.h" #define STATE_ENABLED "state_enabled" @@ -669,7 +670,6 @@ nsSelectionMoveCommands::IsCommandEnabled(const char * aCommandName, return NS_OK; } - NS_IMETHODIMP nsSelectionMoveCommands::DoCommand(const char *aCommandName, nsISupports *aCommandRefCon) @@ -677,6 +677,15 @@ nsSelectionMoveCommands::DoCommand(const char *aCommandName, nsCOMPtr editor = do_QueryInterface(aCommandRefCon); NS_ENSURE_TRUE(editor, NS_ERROR_FAILURE); + nsCOMPtr domDoc; + editor->GetDocument(getter_AddRefs(domDoc)); + nsCOMPtr doc = do_QueryInterface(domDoc); + if (doc) { + // Most of the commands below (possibly all of them) need layout to + // be up to date. + doc->FlushPendingNotifications(Flush_Layout); + } + nsCOMPtr selCont; nsresult rv = editor->GetSelectionController(getter_AddRefs(selCont)); NS_ENSURE_SUCCESS(rv, rv); diff --git a/editor/txmgr/src/nsTransactionItem.cpp b/editor/txmgr/src/nsTransactionItem.cpp index 6fd24d2de96e..0bec96fbea3d 100644 --- a/editor/txmgr/src/nsTransactionItem.cpp +++ b/editor/txmgr/src/nsTransactionItem.cpp @@ -223,8 +223,6 @@ nsTransactionItem::UndoTransaction(nsTransactionManager *aTxMgr) return result; } - // FIXME: bug 583493 - // NS_ENSURE_TRUE(mTransaction, NS_OK); if (!mTransaction) return NS_OK; @@ -451,7 +449,8 @@ nsTransactionItem::RecoverFromRedoError(nsTransactionManager *aTxMgr) return result; } - NS_ENSURE_TRUE(mTransaction, NS_OK); + if (!mTransaction) + return NS_OK; return mTransaction->UndoTransaction(); } diff --git a/gfx/layers/ImageLayers.h b/gfx/layers/ImageLayers.h index cc14cdc52412..1e391c5dde25 100644 --- a/gfx/layers/ImageLayers.h +++ b/gfx/layers/ImageLayers.h @@ -172,6 +172,13 @@ public: */ virtual gfxIntSize GetCurrentSize() = 0; + /** + * Set a new layer manager for this image container. It must be + * either of the same type as the container's current layer manager, + * or null. TRUE is returned on success. + */ + virtual PRBool SetLayerManager(LayerManager *aManager) = 0; + protected: LayerManager* mManager; diff --git a/gfx/layers/Layers.h b/gfx/layers/Layers.h index 6b3b73cb505e..47a9baab9b75 100644 --- a/gfx/layers/Layers.h +++ b/gfx/layers/Layers.h @@ -142,12 +142,21 @@ public: LAYERS_D3D9 }; - LayerManager() : mUserData(nsnull) + LayerManager() : mUserData(nsnull), mDestroyed(PR_FALSE) { InitLog(); } virtual ~LayerManager() {} + /** + * Release layers and resources held by this layer manager, and mark + * it as destroyed. Should do any cleanup necessary in preparation + * for its widget going away. After this call, only user data calls + * are valid on the layer manager. + */ + virtual void Destroy() { mDestroyed = PR_TRUE; } + PRBool IsDestroyed() { return mDestroyed; } + /** * Start a new transaction. Nested transactions are not allowed so * there must be no transaction currently in progress. @@ -297,6 +306,7 @@ public: protected: nsRefPtr mRoot; void* mUserData; + PRPackedBool mDestroyed; // Print interesting information about this into aTo. Internally // used to implement Dump*() and Log*(). @@ -328,7 +338,9 @@ public: virtual ~Layer() {} /** - * Returns the LayoutManager this Layer belongs to. Cannot be null. + * Returns the LayerManager this Layer belongs to. Note that the layer + * manager might be in a destroyed state, at which point it's only + * valid to set/get user data from it. */ LayerManager* Manager() { return mManager; } @@ -387,6 +399,7 @@ public: } Mutated(); } + /** * CONSTRUCTION PHASE ONLY * Set a clip rect which will be applied to this layer as it is diff --git a/gfx/layers/basic/BasicImages.cpp b/gfx/layers/basic/BasicImages.cpp index bbc62e3fd798..b1f2f0e145c0 100644 --- a/gfx/layers/basic/BasicImages.cpp +++ b/gfx/layers/basic/BasicImages.cpp @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*- * ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * @@ -226,6 +226,7 @@ public: virtual already_AddRefed GetCurrentImage(); virtual already_AddRefed GetCurrentAsSurface(gfxIntSize* aSize); virtual gfxIntSize GetCurrentSize(); + virtual PRBool SetLayerManager(LayerManager *aManager); protected: Monitor mMonitor; @@ -302,6 +303,20 @@ BasicImageContainer::GetCurrentSize() return !mImage ? gfxIntSize(0,0) : ToImageData(mImage)->GetSize(); } +PRBool +BasicImageContainer::SetLayerManager(LayerManager *aManager) +{ + if (aManager && + aManager->GetBackendType() != LayerManager::LAYERS_BASIC) + { + return PR_FALSE; + } + + // for basic layers, we can just swap; no magic needed. + mManager = aManager; + return PR_TRUE; +} + already_AddRefed BasicLayerManager::CreateImageContainer() { diff --git a/gfx/layers/basic/BasicLayers.cpp b/gfx/layers/basic/BasicLayers.cpp index b93810345ce5..3be710bd31db 100644 --- a/gfx/layers/basic/BasicLayers.cpp +++ b/gfx/layers/basic/BasicLayers.cpp @@ -701,15 +701,9 @@ BasicCanvasLayer::Updated(const nsIntRect& aRect) // For simplicity, we read the entire framebuffer for now -- in // the future we should use mUpdatedRect, though with WebGL we don't // have an easy way to generate one. - if (mGLContext->IsGLES2()) { - mGLContext->fReadPixels(0, 0, mBounds.width, mBounds.height, - LOCAL_GL_RGBA, LOCAL_GL_UNSIGNED_BYTE, - isurf->Data()); - } else { - mGLContext->fReadPixels(0, 0, mBounds.width, mBounds.height, - LOCAL_GL_BGRA, LOCAL_GL_UNSIGNED_INT_8_8_8_8_REV, - isurf->Data()); - } + mGLContext->ReadPixelsIntoImageSurface(0, 0, + mBounds.width, mBounds.height, + isurf); // Put back the previous framebuffer binding. if (currentFramebuffer != mCanvasFramebuffer) diff --git a/gfx/layers/d3d9/CanvasLayerD3D9.cpp b/gfx/layers/d3d9/CanvasLayerD3D9.cpp index 56a5860d6719..976d3a82eb69 100644 --- a/gfx/layers/d3d9/CanvasLayerD3D9.cpp +++ b/gfx/layers/d3d9/CanvasLayerD3D9.cpp @@ -111,9 +111,15 @@ CanvasLayerD3D9::Updated(const nsIntRect& aRect) // For simplicity, we read the entire framebuffer for now -- in // the future we should use aRect, though with WebGL we don't // have an easy way to generate one. - mGLContext->fReadPixels(0, 0, mBounds.width, mBounds.height, - LOCAL_GL_BGRA, LOCAL_GL_UNSIGNED_INT_8_8_8_8_REV, - destination); + nsRefPtr tmpSurface = + new gfxImageSurface(destination, + gfxIntSize(mBounds.width, mBounds.height), + mBounds.width * 4, + gfxASurface::ImageFormatARGB32); + mGLContext->ReadPixelsIntoImageSurface(0, 0, + mBounds.width, mBounds.height, + tmpSurface); + tmpSurface = nsnull; // Put back the previous framebuffer binding. if (currentFramebuffer != mCanvasFramebuffer) diff --git a/gfx/layers/d3d9/ImageLayerD3D9.cpp b/gfx/layers/d3d9/ImageLayerD3D9.cpp index 5a1848bb7ee9..d4fba66d40ed 100644 --- a/gfx/layers/d3d9/ImageLayerD3D9.cpp +++ b/gfx/layers/d3d9/ImageLayerD3D9.cpp @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*- * ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * @@ -130,6 +130,13 @@ ImageContainerD3D9::GetCurrentSize() return gfxIntSize(0,0); } +PRBool +ImageContainerD3D9::SetLayerManager(LayerManager *aManager) +{ + // we can't do anything here for now + return PR_FALSE; +} + Layer* ImageLayerD3D9::GetLayer() { diff --git a/gfx/layers/d3d9/ImageLayerD3D9.h b/gfx/layers/d3d9/ImageLayerD3D9.h index 59d2b439b357..a21776519607 100644 --- a/gfx/layers/d3d9/ImageLayerD3D9.h +++ b/gfx/layers/d3d9/ImageLayerD3D9.h @@ -62,6 +62,8 @@ public: virtual gfxIntSize GetCurrentSize(); + virtual PRBool SetLayerManager(LayerManager *aManager); + private: typedef mozilla::Mutex Mutex; diff --git a/gfx/layers/opengl/CanvasLayerOGL.cpp b/gfx/layers/opengl/CanvasLayerOGL.cpp index ed7f31e23edf..476605cb1712 100644 --- a/gfx/layers/opengl/CanvasLayerOGL.cpp +++ b/gfx/layers/opengl/CanvasLayerOGL.cpp @@ -54,12 +54,17 @@ using namespace mozilla; using namespace mozilla::layers; using namespace mozilla::gl; -CanvasLayerOGL::~CanvasLayerOGL() +void +CanvasLayerOGL::Destroy() { - mOGLManager->MakeCurrent(); + if (!mDestroyed) { + if (mTexture) { + GLContext *cx = mOGLManager->glForResources(); + cx->MakeCurrent(); + cx->fDeleteTextures(1, &mTexture); + } - if (mTexture) { - gl()->fDeleteTextures(1, &mTexture); + mDestroyed = PR_TRUE; } } @@ -116,6 +121,10 @@ CanvasLayerOGL::MakeTexture() void CanvasLayerOGL::Updated(const nsIntRect& aRect) { + if (mDestroyed) { + return; + } + NS_ASSERTION(mUpdatedRect.IsEmpty(), "CanvasLayer::Updated called more than once during a transaction!"); @@ -123,13 +132,15 @@ CanvasLayerOGL::Updated(const nsIntRect& aRect) mUpdatedRect.UnionRect(mUpdatedRect, aRect); - if (mCanvasGLContext) { + if (mCanvasGLContext && + mCanvasGLContext->GetContextType() == gl()->GetContextType()) + { if (gl()->BindOffscreenNeedsTexture(mCanvasGLContext) && mTexture == 0) { MakeTexture(); } - } else if (mCanvasSurface) { + } else { PRBool newTexture = mTexture == 0; if (newTexture) { MakeTexture(); @@ -140,40 +151,50 @@ CanvasLayerOGL::Updated(const nsIntRect& aRect) } nsRefPtr updatedAreaImageSurface; - nsRefPtr sourceSurface = mCanvasSurface; + if (mCanvasSurface) { + nsRefPtr sourceSurface = mCanvasSurface; #ifdef XP_WIN - if (sourceSurface->GetType() == gfxASurface::SurfaceTypeWin32) { - sourceSurface = static_cast(sourceSurface.get())->GetImageSurface(); - if (!sourceSurface) - sourceSurface = mCanvasSurface; - } + if (sourceSurface->GetType() == gfxASurface::SurfaceTypeWin32) { + sourceSurface = static_cast(sourceSurface.get())->GetImageSurface(); + if (!sourceSurface) + sourceSurface = mCanvasSurface; + } #endif #if 0 - // XXX don't copy, blah. - // but need to deal with stride on the gl side; do this later. - if (mCanvasSurface->GetType() == gfxASurface::SurfaceTypeImage) { - gfxImageSurface *s = static_cast(mCanvasSurface.get()); - if (s->Format() == gfxASurface::ImageFormatARGB32 || - s->Format() == gfxASurface::ImageFormatRGB24) - { - updatedAreaImageSurface = ...; - } else { - NS_WARNING("surface with format that we can't handle"); - return; - } - } else + // XXX don't copy, blah. + // but need to deal with stride on the gl side; do this later. + if (mCanvasSurface->GetType() == gfxASurface::SurfaceTypeImage) { + gfxImageSurface *s = static_cast(mCanvasSurface.get()); + if (s->Format() == gfxASurface::ImageFormatARGB32 || + s->Format() == gfxASurface::ImageFormatRGB24) + { + updatedAreaImageSurface = ...; + } else { + NS_WARNING("surface with format that we can't handle"); + return; + } + } else #endif - { + { + updatedAreaImageSurface = + new gfxImageSurface(gfxIntSize(mUpdatedRect.width, mUpdatedRect.height), + gfxASurface::ImageFormatARGB32); + nsRefPtr ctx = new gfxContext(updatedAreaImageSurface); + ctx->Translate(gfxPoint(-mUpdatedRect.x, -mUpdatedRect.y)); + ctx->SetOperator(gfxContext::OPERATOR_SOURCE); + ctx->SetSource(sourceSurface); + ctx->Paint(); + } + } else if (mCanvasGLContext) { updatedAreaImageSurface = new gfxImageSurface(gfxIntSize(mUpdatedRect.width, mUpdatedRect.height), gfxASurface::ImageFormatARGB32); - nsRefPtr ctx = new gfxContext(updatedAreaImageSurface); - ctx->Translate(gfxPoint(-mUpdatedRect.x, -mUpdatedRect.y)); - ctx->SetOperator(gfxContext::OPERATOR_SOURCE); - ctx->SetSource(sourceSurface); - ctx->Paint(); + mCanvasGLContext->ReadPixelsIntoImageSurface(mUpdatedRect.x, mUpdatedRect.y, + mUpdatedRect.width, + mUpdatedRect.height, + updatedAreaImageSurface); } if (newTexture) { @@ -222,12 +243,12 @@ CanvasLayerOGL::RenderLayer(int aPreviousDestination, gl()->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexture); } - if (mCanvasGLContext) { + bool useGLContext = mCanvasGLContext && + mCanvasGLContext->GetContextType() == gl()->GetContextType(); + + if (useGLContext) { gl()->BindTex2DOffscreen(mCanvasGLContext); DEBUG_GL_ERROR_CHECK(gl()); - } - - if (mCanvasGLContext) { program = mOGLManager->GetRGBALayerProgram(); } else { program = mOGLManager->GetBGRALayerProgram(); @@ -244,7 +265,7 @@ CanvasLayerOGL::RenderLayer(int aPreviousDestination, DEBUG_GL_ERROR_CHECK(gl()); - if (mCanvasGLContext) { + if (useGLContext) { gl()->UnbindTex2DOffscreen(mCanvasGLContext); } diff --git a/gfx/layers/opengl/CanvasLayerOGL.h b/gfx/layers/opengl/CanvasLayerOGL.h index 80f8832e831a..bf6c6306b960 100644 --- a/gfx/layers/opengl/CanvasLayerOGL.h +++ b/gfx/layers/opengl/CanvasLayerOGL.h @@ -56,14 +56,14 @@ public: { mImplData = static_cast(this); } - - ~CanvasLayerOGL(); + ~CanvasLayerOGL() { Destroy(); } // CanvasLayer implementation virtual void Initialize(const Data& aData); virtual void Updated(const nsIntRect& aRect); // LayerOGL implementation + virtual void Destroy(); virtual Layer* GetLayer() { return this; } virtual void RenderLayer(int aPreviousFrameBuffer, const nsIntPoint& aOffset); diff --git a/gfx/layers/opengl/ColorLayerOGL.h b/gfx/layers/opengl/ColorLayerOGL.h index 48a50d5f3476..71dcd55a9184 100644 --- a/gfx/layers/opengl/ColorLayerOGL.h +++ b/gfx/layers/opengl/ColorLayerOGL.h @@ -53,10 +53,13 @@ public: { mImplData = static_cast(this); } + ~ColorLayerOGL() { Destroy(); } // LayerOGL Implementation virtual Layer* GetLayer(); + virtual void Destroy() { mDestroyed = PR_TRUE; } + virtual void RenderLayer(int aPreviousFrameBuffer, const nsIntPoint& aOffset); }; diff --git a/gfx/layers/opengl/ContainerLayerOGL.cpp b/gfx/layers/opengl/ContainerLayerOGL.cpp index 23919784045d..ed72684ed34a 100644 --- a/gfx/layers/opengl/ContainerLayerOGL.cpp +++ b/gfx/layers/opengl/ContainerLayerOGL.cpp @@ -49,8 +49,18 @@ ContainerLayerOGL::ContainerLayerOGL(LayerManagerOGL *aManager) ContainerLayerOGL::~ContainerLayerOGL() { - while (mFirstChild) { - RemoveChild(mFirstChild); + Destroy(); +} + +void +ContainerLayerOGL::Destroy() +{ + if (!mDestroyed) { + while (mFirstChild) { + GetFirstChildOGL()->Destroy(); + RemoveChild(mFirstChild); + } + mDestroyed = PR_TRUE; } } diff --git a/gfx/layers/opengl/ContainerLayerOGL.h b/gfx/layers/opengl/ContainerLayerOGL.h index 40120a44e669..809cfec7dd07 100644 --- a/gfx/layers/opengl/ContainerLayerOGL.h +++ b/gfx/layers/opengl/ContainerLayerOGL.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*- * ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * @@ -60,6 +60,8 @@ public: /** LayerOGL implementation */ Layer* GetLayer(); + void Destroy(); + LayerOGL* GetFirstChildOGL(); PRBool IsEmpty(); diff --git a/gfx/layers/opengl/ImageLayerOGL.cpp b/gfx/layers/opengl/ImageLayerOGL.cpp index 0243d35f14cf..e9658b6427d8 100644 --- a/gfx/layers/opengl/ImageLayerOGL.cpp +++ b/gfx/layers/opengl/ImageLayerOGL.cpp @@ -57,11 +57,13 @@ public: GLuint aTexture) : mContext(aContext), mTexture(aTexture) { + NS_ASSERTION(aTexture, "TextureDeleter instantiated with nothing to do"); } + NS_IMETHOD Run() { - if (mTexture) { - mContext->DestroyTexture(mTexture); - } + mContext->MakeCurrent(); + mContext->fDeleteTextures(1, &mTexture); + // Ensure context is released on the main thread mContext = nsnull; return NS_OK; @@ -74,12 +76,15 @@ public: void GLTexture::Allocate(GLContext *aContext) { - NS_ASSERTION(NS_IsMainThread(), "Can only allocate texture on main thread"); + NS_ASSERTION(aContext->IsGlobalSharedContext() || + NS_IsMainThread(), "Can only allocate texture on main thread or with cx sharing"); Release(); mContext = aContext; - mTexture = mContext->CreateTexture(); + + mContext->MakeCurrent(); + mContext->fGenTextures(1, &mTexture); } void @@ -100,19 +105,20 @@ GLTexture::Release() return; } - if (NS_IsMainThread()) { - if (mTexture) { - mContext->DestroyTexture(mTexture); - mTexture = 0; + if (mTexture) { + if (NS_IsMainThread() || mContext->IsGlobalSharedContext()) { + mContext->MakeCurrent(); + mContext->fDeleteTextures(1, &mTexture); + } else { + nsCOMPtr runnable = + new TextureDeleter(mContext.forget(), mTexture); + NS_DispatchToMainThread(runnable); } - mContext = nsnull; - return; + + mTexture = 0; } - nsCOMPtr runnable = - new TextureDeleter(mContext.forget(), mTexture); - NS_DispatchToMainThread(runnable); - mTexture = 0; + mContext = nsnull; } RecycleBin::RecycleBin() @@ -133,7 +139,7 @@ RecycleBin::RecycleBuffer(PRUint8* aBuffer, PRUint32 aSize) } PRUint8* -RecycleBin::TakeBuffer(PRUint32 aSize) +RecycleBin::GetBuffer(PRUint32 aSize) { MutexAutoLock lock(mLock); @@ -163,8 +169,8 @@ RecycleBin::RecycleTexture(GLTexture *aTexture, TextureType aType, } void -RecycleBin::TakeTexture(TextureType aType, const gfxIntSize& aSize, - GLContext *aContext, GLTexture *aOutTexture) +RecycleBin::GetTexture(TextureType aType, const gfxIntSize& aSize, + GLContext *aContext, GLTexture *aOutTexture) { MutexAutoLock lock(mLock); @@ -184,6 +190,15 @@ ImageContainerOGL::ImageContainerOGL(LayerManagerOGL *aManager) { } +ImageContainerOGL::~ImageContainerOGL() +{ + if (mManager) { + NS_ASSERTION(mManager->GetBackendType() == LayerManager::LAYERS_OPENGL, "Wrong layer manager got assigned to ImageContainerOGL!"); + + static_cast(mManager)->ForgetImageContainer(this); + } +} + already_AddRefed ImageContainerOGL::CreateImage(const Image::Format *aFormats, PRUint32 aNumFormats) @@ -193,7 +208,8 @@ ImageContainerOGL::CreateImage(const Image::Format *aFormats, } nsRefPtr img; if (aFormats[0] == Image::PLANAR_YCBCR) { - img = new PlanarYCbCrImageOGL(mRecycleBin); + img = new PlanarYCbCrImageOGL(static_cast(mManager), + mRecycleBin); } else if (aFormats[0] == Image::CAIRO_SURFACE) { img = new CairoImageOGL(static_cast(mManager)); } @@ -228,7 +244,47 @@ ImageContainerOGL::GetCurrentImage() already_AddRefed ImageContainerOGL::GetCurrentAsSurface(gfxIntSize *aSize) { - return nsnull; + MutexAutoLock lock(mActiveImageLock); + + if (!mActiveImage) { + *aSize = gfxIntSize(0,0); + return nsnull; + } + + GLContext *gl = nsnull; + // tex1 will be RGBA or Y, tex2 will Cb, tex3 will be Cr + GLuint tex1 = 0, tex2 = 0, tex3 = 0; + gfxIntSize size; + + if (mActiveImage->GetFormat() == Image::PLANAR_YCBCR) { + PlanarYCbCrImageOGL *yuvImage = + static_cast(mActiveImage.get()); + if (!yuvImage->HasData() || !yuvImage->HasTextures()) { + *aSize = gfxIntSize(0, 0); + return nsnull; + } + + size = yuvImage->mSize; + gl = yuvImage->mTextures[0].GetGLContext(); + tex1 = yuvImage->mTextures[0].GetTextureID(); + tex2 = yuvImage->mTextures[1].GetTextureID(); + tex3 = yuvImage->mTextures[2].GetTextureID(); + } + + if (mActiveImage->GetFormat() == Image::CAIRO_SURFACE) { + CairoImageOGL *cairoImage = + static_cast(mActiveImage.get()); + size = cairoImage->mSize; + gl = cairoImage->mTexture.GetGLContext(); + tex1 = cairoImage->mTexture.GetTextureID(); + } + + // XXX TODO: read all textures in YCbCr case and convert to RGB + // XXX Or maybe add a ReadYCbCrTextureImage that will take 3 textures + // and return RGB, since we can render YCbCr to the temporary framebuffer. + nsRefPtr s = gl->ReadTextureImage(tex1, size, LOCAL_GL_RGBA); + *aSize = size; + return s.forget(); } gfxIntSize @@ -238,6 +294,7 @@ ImageContainerOGL::GetCurrentSize() if (!mActiveImage) { return gfxIntSize(0,0); } + if (mActiveImage->GetFormat() == Image::PLANAR_YCBCR) { PlanarYCbCrImageOGL *yuvImage = static_cast(mActiveImage.get()); @@ -246,7 +303,9 @@ ImageContainerOGL::GetCurrentSize() } return yuvImage->mSize; - } else if (mActiveImage->GetFormat() == Image::CAIRO_SURFACE) { + } + + if (mActiveImage->GetFormat() == Image::CAIRO_SURFACE) { CairoImageOGL *cairoImage = static_cast(mActiveImage.get()); return cairoImage->mSize; @@ -255,6 +314,38 @@ ImageContainerOGL::GetCurrentSize() return gfxIntSize(0,0); } +PRBool +ImageContainerOGL::SetLayerManager(LayerManager *aManager) +{ + if (!aManager) { + // the layer manager just entirely went away + + // XXX if we don't have context sharing, we should tell our images + // that their textures are no longer valid. + mManager = nsnull; + return PR_TRUE; + } + + if (aManager->GetBackendType() != LayerManager::LAYERS_OPENGL) { + return PR_FALSE; + } + + LayerManagerOGL* lmOld = static_cast(mManager); + LayerManagerOGL* lmNew = static_cast(aManager); + + if (lmOld) { + NS_ASSERTION(lmNew->glForResources() == lmOld->glForResources(), + "We require GL context sharing here!"); + lmOld->ForgetImageContainer(this); + } + + mManager = aManager; + + lmNew->RememberImageContainer(this); + + return PR_TRUE; +} + Layer* ImageLayerOGL::GetLayer() { @@ -276,11 +367,15 @@ ImageLayerOGL::RenderLayer(int, PlanarYCbCrImageOGL *yuvImage = static_cast(image.get()); - if (!yuvImage->HasData()) + if (!yuvImage->HasData()) { return; + } + + if (!yuvImage->HasTextures()) { + yuvImage->AllocateTextures(gl()); + } - if (!yuvImage->HasTextures()) - yuvImage->AllocateTextures(mOGLManager); + yuvImage->UpdateTextures(gl()); gl()->fActiveTexture(LOCAL_GL_TEXTURE0); gl()->fBindTexture(LOCAL_GL_TEXTURE_2D, yuvImage->mTextures[0].GetTextureID()); @@ -335,9 +430,39 @@ ImageLayerOGL::RenderLayer(int, DEBUG_GL_ERROR_CHECK(gl()); } -PlanarYCbCrImageOGL::PlanarYCbCrImageOGL(RecycleBin *aRecycleBin) +static void +InitTexture(GLContext* aGL, GLuint aTexture, GLenum aFormat, const gfxIntSize& aSize) +{ + aGL->fBindTexture(LOCAL_GL_TEXTURE_2D, aTexture); + aGL->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_MIN_FILTER, LOCAL_GL_LINEAR); + aGL->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_MAG_FILTER, LOCAL_GL_LINEAR); + aGL->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_WRAP_S, LOCAL_GL_CLAMP_TO_EDGE); + aGL->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_WRAP_T, LOCAL_GL_CLAMP_TO_EDGE); + + aGL->fTexImage2D(LOCAL_GL_TEXTURE_2D, + 0, + aFormat, + aSize.width, + aSize.height, + 0, + aFormat, + LOCAL_GL_UNSIGNED_BYTE, + NULL); +} + +PlanarYCbCrImageOGL::PlanarYCbCrImageOGL(LayerManagerOGL *aManager, + RecycleBin *aRecycleBin) : PlanarYCbCrImage(nsnull), mRecycleBin(aRecycleBin), mHasData(PR_FALSE) { +#if 0 + // We really want to allocate this on the decode thread -- but to do that, + // we need to create a per-thread shared GL context, and it will only work + // if we have context sharing. For now, create the textures on the main + // thread the first time we render. + if (aManager) { + AllocateTextures(aManager->glForResources()); + } +#endif } PlanarYCbCrImageOGL::~PlanarYCbCrImageOGL() @@ -346,9 +471,11 @@ PlanarYCbCrImageOGL::~PlanarYCbCrImageOGL() mRecycleBin->RecycleBuffer(mBuffer.forget(), mBufferSize); } - mRecycleBin->RecycleTexture(&mTextures[0], RecycleBin::TEXTURE_Y, mData.mYSize); - mRecycleBin->RecycleTexture(&mTextures[1], RecycleBin::TEXTURE_C, mData.mCbCrSize); - mRecycleBin->RecycleTexture(&mTextures[2], RecycleBin::TEXTURE_C, mData.mCbCrSize); + if (HasTextures()) { + mRecycleBin->RecycleTexture(&mTextures[0], RecycleBin::TEXTURE_Y, mData.mYSize); + mRecycleBin->RecycleTexture(&mTextures[1], RecycleBin::TEXTURE_C, mData.mCbCrSize); + mRecycleBin->RecycleTexture(&mTextures[2], RecycleBin::TEXTURE_C, mData.mCbCrSize); + } } void @@ -384,7 +511,7 @@ PlanarYCbCrImageOGL::SetData(const PlanarYCbCrImage::Data &aData) mBufferSize = mData.mCbCrStride * mData.mCbCrSize.height * 2 + mData.mYStride * mData.mYSize.height; - mBuffer = mRecycleBin->TakeBuffer(mBufferSize); + mBuffer = mRecycleBin->GetBuffer(mBufferSize); if (!mBuffer) return; @@ -417,54 +544,24 @@ PlanarYCbCrImageOGL::SetData(const PlanarYCbCrImage::Data &aData) mHasData = PR_TRUE; } -static void -SetupPlaneTexture(GLContext* aGL, const gfxIntSize& aSize, PRUint8* aData, PRBool aIsNew) +void +PlanarYCbCrImageOGL::AllocateTextures(mozilla::gl::GLContext *gl) { - aGL->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_MIN_FILTER, LOCAL_GL_LINEAR); - aGL->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_MAG_FILTER, LOCAL_GL_LINEAR); - aGL->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_WRAP_S, LOCAL_GL_CLAMP_TO_EDGE); - aGL->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_WRAP_T, LOCAL_GL_CLAMP_TO_EDGE); + gl->MakeCurrent(); - if (aIsNew) { - aGL->fTexImage2D(LOCAL_GL_TEXTURE_2D, - 0, - LOCAL_GL_LUMINANCE, - aSize.width, - aSize.height, - 0, - LOCAL_GL_LUMINANCE, - LOCAL_GL_UNSIGNED_BYTE, - aData); - } else { - aGL->fTexSubImage2D(LOCAL_GL_TEXTURE_2D, - 0, - 0, 0, - aSize.width, - aSize.height, - LOCAL_GL_LUMINANCE, - LOCAL_GL_UNSIGNED_BYTE, - aData); - } + mRecycleBin->GetTexture(RecycleBin::TEXTURE_Y, mData.mYSize, gl, &mTextures[0]); + InitTexture(gl, mTextures[0].GetTextureID(), LOCAL_GL_LUMINANCE, mData.mYSize); + + mRecycleBin->GetTexture(RecycleBin::TEXTURE_C, mData.mCbCrSize, gl, &mTextures[1]); + InitTexture(gl, mTextures[1].GetTextureID(), LOCAL_GL_LUMINANCE, mData.mCbCrSize); + + mRecycleBin->GetTexture(RecycleBin::TEXTURE_C, mData.mCbCrSize, gl, &mTextures[2]); + InitTexture(gl, mTextures[2].GetTextureID(), LOCAL_GL_LUMINANCE, mData.mCbCrSize); } void -PlanarYCbCrImageOGL::AllocateTextures(LayerManagerOGL *aManager) +PlanarYCbCrImageOGL::UpdateTextures(GLContext *gl) { - aManager->MakeCurrent(); - - mozilla::gl::GLContext *gl = aManager->gl(); - - PRPackedBool isNewTexture[3]; - for (PRUint32 i = 0; i < 3; ++i) { - isNewTexture[i] = !mTextures[i].IsAllocated(); - } - - mRecycleBin->TakeTexture(RecycleBin::TEXTURE_Y, mData.mYSize, gl, &mTextures[0]); - mRecycleBin->TakeTexture(RecycleBin::TEXTURE_C, mData.mCbCrSize, gl, &mTextures[1]); - mRecycleBin->TakeTexture(RecycleBin::TEXTURE_C, mData.mCbCrSize, gl, &mTextures[2]); - if (!HasTextures()) - return; - GLint alignment; if (!((ptrdiff_t)mData.mYStride & 0x7) && !((ptrdiff_t)mData.mYChannel & 0x7)) { @@ -481,12 +578,16 @@ PlanarYCbCrImageOGL::AllocateTextures(LayerManagerOGL *aManager) gl->fPixelStorei(LOCAL_GL_UNPACK_ALIGNMENT, alignment); gl->fBindTexture(LOCAL_GL_TEXTURE_2D, mTextures[0].GetTextureID()); - - SetupPlaneTexture(gl, mData.mYSize, mData.mYChannel, isNewTexture[0]); + gl->fTexSubImage2D(LOCAL_GL_TEXTURE_2D, 0, + 0, 0, mData.mYSize.width, mData.mYSize.height, + LOCAL_GL_LUMINANCE, + LOCAL_GL_UNSIGNED_BYTE, + mData.mYChannel); if (!((ptrdiff_t)mData.mCbCrStride & 0x7) && !((ptrdiff_t)mData.mCbChannel & 0x7) && - !((ptrdiff_t)mData.mCrChannel & 0x7)) { + !((ptrdiff_t)mData.mCrChannel & 0x7)) + { alignment = 8; } else if (!((ptrdiff_t)mData.mCbCrStride & 0x3)) { alignment = 4; @@ -500,12 +601,18 @@ PlanarYCbCrImageOGL::AllocateTextures(LayerManagerOGL *aManager) gl->fPixelStorei(LOCAL_GL_UNPACK_ALIGNMENT, alignment); gl->fBindTexture(LOCAL_GL_TEXTURE_2D, mTextures[1].GetTextureID()); - - SetupPlaneTexture(gl, mData.mCbCrSize, mData.mCbChannel, isNewTexture[1]); + gl->fTexSubImage2D(LOCAL_GL_TEXTURE_2D, 0, + 0, 0, mData.mCbCrSize.width, mData.mCbCrSize.height, + LOCAL_GL_LUMINANCE, + LOCAL_GL_UNSIGNED_BYTE, + mData.mCbChannel); gl->fBindTexture(LOCAL_GL_TEXTURE_2D, mTextures[2].GetTextureID()); - - SetupPlaneTexture(gl, mData.mCbCrSize, mData.mCrChannel, isNewTexture[2]); + gl->fTexSubImage2D(LOCAL_GL_TEXTURE_2D, 0, + 0, 0, mData.mCbCrSize.width, mData.mCbCrSize.height, + LOCAL_GL_LUMINANCE, + LOCAL_GL_UNSIGNED_BYTE, + mData.mCrChannel); // Reset alignment to default gl->fPixelStorei(LOCAL_GL_UNPACK_ALIGNMENT, 4); @@ -516,12 +623,15 @@ PlanarYCbCrImageOGL::AllocateTextures(LayerManagerOGL *aManager) } } -CairoImageOGL::CairoImageOGL(LayerManagerOGL *aManager) : CairoImage(nsnull) +CairoImageOGL::CairoImageOGL(LayerManagerOGL *aManager) + : CairoImage(nsnull) { NS_ASSERTION(NS_IsMainThread(), "Should be on main thread to create a cairo image"); - // Allocate texture now to grab a reference to the GLContext - mTexture.Allocate(aManager->gl()); + if (aManager) { + // Allocate texture now to grab a reference to the GLContext + mTexture.Allocate(aManager->glForResources()); + } } void @@ -533,20 +643,20 @@ CairoImageOGL::SetData(const CairoImage::Data &aData) mozilla::gl::GLContext *gl = mTexture.GetGLContext(); gl->MakeCurrent(); - mSize = aData.mSize; - - gl->fActiveTexture(LOCAL_GL_TEXTURE0); - gl->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexture.GetTextureID()); - gl->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_MIN_FILTER, LOCAL_GL_LINEAR); - gl->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_MAG_FILTER, LOCAL_GL_LINEAR); - gl->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_WRAP_S, LOCAL_GL_CLAMP_TO_EDGE); - gl->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_WRAP_T, LOCAL_GL_CLAMP_TO_EDGE); + if (mSize != aData.mSize) { + gl->fActiveTexture(LOCAL_GL_TEXTURE0); + InitTexture(gl, mTexture.GetTextureID(), LOCAL_GL_RGBA, aData.mSize); + mSize = aData.mSize; + } else { + gl->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexture.GetTextureID()); + } if (!mASurfaceAsGLContext) { mASurfaceAsGLContext = GLContextProvider::CreateForNativePixmapSurface(aData.mSurface); if (mASurfaceAsGLContext) mASurfaceAsGLContext->BindTexImage(); } + if (mASurfaceAsGLContext) return; @@ -561,15 +671,11 @@ CairoImageOGL::SetData(const CairoImage::Data &aData) context->SetSource(aData.mSurface); context->Paint(); - gl->fTexImage2D(LOCAL_GL_TEXTURE_2D, - 0, - LOCAL_GL_RGBA, - mSize.width, - mSize.height, - 0, - LOCAL_GL_RGBA, - LOCAL_GL_UNSIGNED_BYTE, - imageSurface->Data()); + gl->fTexSubImage2D(LOCAL_GL_TEXTURE_2D, 0, + 0, 0, mSize.width, mSize.height, + LOCAL_GL_RGBA, + LOCAL_GL_UNSIGNED_BYTE, + imageSurface->Data()); } } /* layers */ diff --git a/gfx/layers/opengl/ImageLayerOGL.h b/gfx/layers/opengl/ImageLayerOGL.h index 283c8e15d86b..e0d5b49d1226 100644 --- a/gfx/layers/opengl/ImageLayerOGL.h +++ b/gfx/layers/opengl/ImageLayerOGL.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*- * ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * @@ -102,7 +102,7 @@ public: void RecycleBuffer(PRUint8* aBuffer, PRUint32 aSize); // Returns a recycled buffer of the right size, or allocates a new buffer. - PRUint8* TakeBuffer(PRUint32 aSize); + PRUint8* GetBuffer(PRUint32 aSize); enum TextureType { TEXTURE_Y, @@ -111,8 +111,8 @@ public: void RecycleTexture(GLTexture *aTexture, TextureType aType, const gfxIntSize& aSize); - void TakeTexture(TextureType aType, const gfxIntSize& aSize, - GLContext *aContext, GLTexture *aOutTexture); + void GetTexture(TextureType aType, const gfxIntSize& aSize, + GLContext *aContext, GLTexture *aOutTexture); private: typedef mozilla::Mutex Mutex; @@ -135,7 +135,7 @@ class THEBES_API ImageContainerOGL : public ImageContainer { public: ImageContainerOGL(LayerManagerOGL *aManager); - virtual ~ImageContainerOGL() {} + virtual ~ImageContainerOGL(); virtual already_AddRefed CreateImage(const Image::Format* aFormats, PRUint32 aNumFormats); @@ -148,6 +148,8 @@ public: virtual gfxIntSize GetCurrentSize(); + virtual PRBool SetLayerManager(LayerManager *aManager); + private: typedef mozilla::Mutex Mutex; @@ -169,8 +171,10 @@ public: { mImplData = static_cast(this); } + ~ImageLayerOGL() { Destroy(); } // LayerOGL Implementation + virtual void Destroy() { mDestroyed = PR_TRUE; } virtual Layer* GetLayer(); virtual void RenderLayer(int aPreviousFrameBuffer, @@ -182,7 +186,8 @@ class THEBES_API PlanarYCbCrImageOGL : public PlanarYCbCrImage typedef mozilla::gl::GLContext GLContext; public: - PlanarYCbCrImageOGL(RecycleBin *aRecycleBin); + PlanarYCbCrImageOGL(LayerManagerOGL *aManager, + RecycleBin *aRecycleBin); ~PlanarYCbCrImageOGL(); virtual void SetData(const Data &aData); @@ -191,7 +196,9 @@ public: * Upload the data from out mData into our textures. For now we use this to * make sure the textures are created and filled on the main thread. */ - void AllocateTextures(LayerManagerOGL *aManager); + void AllocateTextures(GLContext *gl); + void UpdateTextures(GLContext *gl); + PRBool HasData() { return mHasData; } PRBool HasTextures() { diff --git a/gfx/layers/opengl/LayerManagerOGL.cpp b/gfx/layers/opengl/LayerManagerOGL.cpp index 762e2e253660..f4a6f90eab25 100644 --- a/gfx/layers/opengl/LayerManagerOGL.cpp +++ b/gfx/layers/opengl/LayerManagerOGL.cpp @@ -76,8 +76,30 @@ LayerManagerOGL::LayerManagerOGL(nsIWidget *aWidget) LayerManagerOGL::~LayerManagerOGL() { - mRoot = nsnull; - CleanupResources(); + Destroy(); +} + +void +LayerManagerOGL::Destroy() +{ + if (!mDestroyed) { + if (mRoot) { + RootLayer()->Destroy(); + } + mRoot = nsnull; + + // Make a copy, since SetLayerManager will cause mImageContainers + // to get mutated. + nsTArray imageContainers(mImageContainers); + for (PRUint32 i = 0; i < imageContainers.Length(); ++i) { + ImageContainer *c = imageContainers[i]; + c->SetLayerManager(nsnull); + } + + CleanupResources(); + + mDestroyed = PR_TRUE; + } } void @@ -90,7 +112,7 @@ LayerManagerOGL::CleanupResources() if (!ctx) { ctx = mGLContext; } - + ctx->MakeCurrent(); for (unsigned int i = 0; i < mPrograms.Length(); ++i) @@ -125,6 +147,7 @@ LayerManagerOGL::Initialize(GLContext *aExistingContext) } else { if (mGLContext) CleanupResources(); + mGLContext = gl::GLContextProvider::CreateForWindow(mWidget); if (!mGLContext) { @@ -137,10 +160,9 @@ LayerManagerOGL::Initialize(GLContext *aExistingContext) DEBUG_GL_ERROR_CHECK(mGLContext); - const char *extensionStr = - (const char*) mGLContext->fGetString(LOCAL_GL_EXTENSIONS); - - mHasBGRA = (strstr(extensionStr, "EXT_bgra") != nsnull); + mHasBGRA = + mGLContext->IsExtensionSupported(gl::GLContext::EXT_texture_format_BGRA8888) || + mGLContext->IsExtensionSupported(gl::GLContext::EXT_bgra); mGLContext->fBlendFuncSeparate(LOCAL_GL_ONE, LOCAL_GL_ONE_MINUS_SRC_ALPHA, LOCAL_GL_ONE, LOCAL_GL_ONE); @@ -259,7 +281,7 @@ LayerManagerOGL::Initialize(GLContext *aExistingContext) * texture rectangle access inside GLSL (sampler2DRect, * texture2DRect). */ - if (strstr(extensionStr, "ARB_texture_rectangle") == NULL) + if (!mGLContext->IsExtensionSupported(gl::GLContext::ARB_texture_rectangle)) return false; } @@ -327,6 +349,11 @@ LayerManagerOGL::BeginTransaction() void LayerManagerOGL::BeginTransactionWithTarget(gfxContext *aTarget) { + if (mDestroyed) { + NS_WARNING("Call on destroyed layer manager"); + return; + } + mTarget = aTarget; } @@ -334,6 +361,11 @@ void LayerManagerOGL::EndTransaction(DrawThebesLayerCallback aCallback, void* aCallbackData) { + if (mDestroyed) { + NS_WARNING("Call on destroyed layer manager"); + return; + } + mThebesLayerCallback = aCallback; mThebesLayerCallbackData = aCallbackData; @@ -348,6 +380,11 @@ LayerManagerOGL::EndTransaction(DrawThebesLayerCallback aCallback, already_AddRefed LayerManagerOGL::CreateThebesLayer() { + if (mDestroyed) { + NS_WARNING("Call on destroyed layer manager"); + return nsnull; + } + nsRefPtr layer = new ThebesLayerOGL(this); return layer.forget(); } @@ -355,6 +392,11 @@ LayerManagerOGL::CreateThebesLayer() already_AddRefed LayerManagerOGL::CreateContainerLayer() { + if (mDestroyed) { + NS_WARNING("Call on destroyed layer manager"); + return nsnull; + } + nsRefPtr layer = new ContainerLayerOGL(this); return layer.forget(); } @@ -362,13 +404,24 @@ LayerManagerOGL::CreateContainerLayer() already_AddRefed LayerManagerOGL::CreateImageContainer() { + if (mDestroyed) { + NS_WARNING("Call on destroyed layer manager"); + return nsnull; + } + nsRefPtr container = new ImageContainerOGL(this); + RememberImageContainer(container); return container.forget(); } already_AddRefed LayerManagerOGL::CreateImageLayer() { + if (mDestroyed) { + NS_WARNING("Call on destroyed layer manager"); + return nsnull; + } + nsRefPtr layer = new ImageLayerOGL(this); return layer.forget(); } @@ -376,6 +429,11 @@ LayerManagerOGL::CreateImageLayer() already_AddRefed LayerManagerOGL::CreateColorLayer() { + if (mDestroyed) { + NS_WARNING("Call on destroyed layer manager"); + return nsnull; + } + nsRefPtr layer = new ColorLayerOGL(this); return layer.forget(); } @@ -383,25 +441,65 @@ LayerManagerOGL::CreateColorLayer() already_AddRefed LayerManagerOGL::CreateCanvasLayer() { + if (mDestroyed) { + NS_WARNING("Call on destroyed layer manager"); + return nsnull; + } + nsRefPtr layer = new CanvasLayerOGL(this); return layer.forget(); } +void +LayerManagerOGL::ForgetImageContainer(ImageContainer *aContainer) +{ + NS_ASSERTION(aContainer->Manager() == this, + "ForgetImageContainer called on non-owned container!"); + + if (!mImageContainers.RemoveElement(aContainer)) { + NS_WARNING("ForgetImageContainer couldn't find container it was supposed to forget!"); + return; + } +} + +void +LayerManagerOGL::RememberImageContainer(ImageContainer *aContainer) +{ + NS_ASSERTION(aContainer->Manager() == this, + "RememberImageContainer called on non-owned container!"); + mImageContainers.AppendElement(aContainer); +} + void LayerManagerOGL::MakeCurrent() { + if (mDestroyed) { + NS_WARNING("Call on destroyed layer manager"); + return; + } + mGLContext->MakeCurrent(); } LayerOGL* LayerManagerOGL::RootLayer() const { + if (mDestroyed) { + NS_WARNING("Call on destroyed layer manager"); + return nsnull; + } + return static_cast(mRoot->ImplData()); } void LayerManagerOGL::Render() { + if (mDestroyed) { + NS_WARNING("Call on destroyed layer manager"); + return; + } + nsIntRect rect; mWidget->GetBounds(rect); GLint width = rect.width; @@ -645,12 +743,22 @@ LayerManagerOGL::CopyToTarget() NS_ASSERTION(imageSurface->Stride() == width * 4, "Image Surfaces being created with weird stride!"); + PRUint32 currentPackAlignment = 0; + mGLContext->fGetIntegerv(LOCAL_GL_PACK_ALIGNMENT, (GLint*)¤tPackAlignment); + if (currentPackAlignment != 4) { + mGLContext->fPixelStorei(LOCAL_GL_PACK_ALIGNMENT, 4); + } + mGLContext->fReadPixels(0, 0, width, height, format, LOCAL_GL_UNSIGNED_BYTE, imageSurface->Data()); + if (currentPackAlignment != 4) { + mGLContext->fPixelStorei(LOCAL_GL_PACK_ALIGNMENT, currentPackAlignment); + } + if (!mHasBGRA) { // need to swap B and R bytes for (int j = 0; j < height; ++j) { @@ -739,6 +847,5 @@ LayerManagerOGL::CreateFBOWithTexture(int aWidth, int aHeight, DEBUG_GL_ERROR_CHECK(gl()); } - } /* layers */ } /* mozilla */ diff --git a/gfx/layers/opengl/LayerManagerOGL.h b/gfx/layers/opengl/LayerManagerOGL.h index cd6ed5e4d9da..dd054edafa43 100644 --- a/gfx/layers/opengl/LayerManagerOGL.h +++ b/gfx/layers/opengl/LayerManagerOGL.h @@ -83,6 +83,8 @@ public: void CleanupResources(); + void Destroy(); + /** * Initializes the layer manager, this is when the layer manager will * actually access the device and attempt to create the swap chain used @@ -135,6 +137,16 @@ public: virtual LayersBackend GetBackendType() { return LAYERS_OPENGL; } + /** + * Image Container management. + */ + + /* Forget this image container. Should be called by ImageContainerOGL + * on its current layer manager before switching to a new one. + */ + void ForgetImageContainer(ImageContainer* aContainer); + void RememberImageContainer(ImageContainer* aContainer); + /** * Helper methods. */ @@ -182,6 +194,16 @@ public: void* GetThebesLayerCallbackData() const { return mThebesLayerCallbackData; } + // This is a GLContext that can be used for resource + // management (creation, destruction). It is guaranteed + // to be either the same as the gl() context, or a context + // that is in the same share pool. + GLContext *glForResources() const { + if (mGLContext->GetSharedContext()) + return mGLContext->GetSharedContext(); + return mGLContext; + } + /* * Helper functions for our layers */ @@ -281,6 +303,11 @@ private: nsRefPtr mGLContext; + // The image containers that this layer manager has created. + // The destructor will tell the layer manager to remove + // it from the list. + nsTArray mImageContainers; + enum ProgramType { RGBALayerProgramType, BGRALayerProgramType, @@ -364,13 +391,20 @@ class LayerOGL { public: LayerOGL(LayerManagerOGL *aManager) - : mOGLManager(aManager) + : mOGLManager(aManager), mDestroyed(PR_FALSE) { } + virtual ~LayerOGL() { } + virtual LayerOGL *GetFirstChildOGL() { return nsnull; } + /* Do NOT call this from the generic LayerOGL destructor. Only from the + * concrete class destructor + */ + virtual void Destroy() = 0; + virtual Layer* GetLayer() = 0; virtual void RenderLayer(int aPreviousFrameBuffer, @@ -381,6 +415,7 @@ public: GLContext *gl() const { return mOGLManager->gl(); } protected: LayerManagerOGL *mOGLManager; + PRPackedBool mDestroyed; }; } /* layers */ diff --git a/gfx/layers/opengl/LayerManagerOGLProgram.h b/gfx/layers/opengl/LayerManagerOGLProgram.h index 5e1a1780e12b..1c44678359f8 100644 --- a/gfx/layers/opengl/LayerManagerOGLProgram.h +++ b/gfx/layers/opengl/LayerManagerOGLProgram.h @@ -300,19 +300,17 @@ protected: } fprintf (stderr, "=== Log:\n%s\n", nsPromiseFlatCString(log).get()); fprintf (stderr, "============\n"); + } - // We can mark the shaders for deletion; they're attached to the program - // and will remain attached. - mGL->fDeleteShader(vertexShader); - mGL->fDeleteShader(fragmentShader); + // We can mark the shaders for deletion; they're attached to the program + // and will remain attached. + mGL->fDeleteShader(vertexShader); + mGL->fDeleteShader(fragmentShader); - if (!success) { - mGL->fDeleteProgram(mProgram); - - mProgram = 0; - - return false; - } + if (!success) { + mGL->fDeleteProgram(mProgram); + mProgram = 0; + return false; } // Now query uniforms, so that we can initialize mUniformValues diff --git a/gfx/layers/opengl/ThebesLayerOGL.cpp b/gfx/layers/opengl/ThebesLayerOGL.cpp index c7f13edd13b8..04de090abcc1 100644 --- a/gfx/layers/opengl/ThebesLayerOGL.cpp +++ b/gfx/layers/opengl/ThebesLayerOGL.cpp @@ -331,8 +331,18 @@ ThebesLayerOGL::ThebesLayerOGL(LayerManagerOGL *aManager) ThebesLayerOGL::~ThebesLayerOGL() { - mBuffer = nsnull; - DEBUG_GL_ERROR_CHECK(gl()); + Destroy(); +} + +void +ThebesLayerOGL::Destroy() +{ + if (!mDestroyed) { + mBuffer = nsnull; + DEBUG_GL_ERROR_CHECK(gl()); + + mDestroyed = PR_TRUE; + } } PRBool diff --git a/gfx/layers/opengl/ThebesLayerOGL.h b/gfx/layers/opengl/ThebesLayerOGL.h index 4f787fe549ac..16d7d9ecb7ec 100644 --- a/gfx/layers/opengl/ThebesLayerOGL.h +++ b/gfx/layers/opengl/ThebesLayerOGL.h @@ -50,7 +50,7 @@ namespace layers { class ThebesLayerBufferOGL; class ThebesLayerOGL : public ThebesLayer, - public LayerOGL + public LayerOGL { typedef ThebesLayerBufferOGL Buffer; @@ -65,6 +65,7 @@ public: void InvalidateRegion(const nsIntRegion& aRegion); /** LayerOGL implementation */ + void Destroy(); Layer* GetLayer(); virtual PRBool IsEmpty(); virtual void RenderLayer(int aPreviousFrameBuffer, diff --git a/gfx/thebes/GLContext.cpp b/gfx/thebes/GLContext.cpp index 4955a56d4791..d640ab857ad2 100644 --- a/gfx/thebes/GLContext.cpp +++ b/gfx/thebes/GLContext.cpp @@ -309,9 +309,64 @@ GLContext::InitWithPrefix(const char *prefix, PRBool trygl) }; mInitialized = LoadSymbols(&symbols[0], trygl, prefix); + + if (mInitialized) { + InitExtensions(); + } + return mInitialized; } +// should match the order of GLExtensions +static const char *sExtensionNames[] = { + "GL_EXT_framebuffer_object", + "GL_ARB_framebuffer_object", + "GL_ARB_texture_rectangle", + "GL_EXT_bgra", + "GL_EXT_texture_format_BGRA8888", + "GL_OES_depth24", + "GL_OES_depth32", + "GL_OES_stencil8", + "GL_OES_texture_npot", + "GL_OES_depth_texture", + "GL_OES_packed_depth_stencil", + "GL_IMG_read_format", + "GL_EXT_read_format_bgra", + NULL +}; + +void +GLContext::InitExtensions() +{ + MakeCurrent(); + const GLubyte *extensions = fGetString(LOCAL_GL_EXTENSIONS); + char *exts = strdup((char *)extensions); + + printf_stderr("GL extensions: %s\n", exts); + + char *s = exts; + bool done = false; + while (!done) { + char *space = strchr(s, ' '); + if (space) { + *space = '\0'; + } else { + done = true; + } + + for (int i = 0; sExtensionNames[i]; ++i) { + if (strcmp(s, sExtensionNames[i]) == 0) { + printf_stderr("Found extension %s\n", s); + mAvailableExtensions[i] = 1; + } + } + + s = space+1; + } + + free(exts); +} + PRBool GLContext::IsExtensionSupported(const char *extension) { @@ -479,6 +534,9 @@ GLContext::ResizeOffscreenFBO(const gfxIntSize& aSize) GLint viewport[4]; + bool useDepthStencil = + !mIsGLES2 || IsExtensionSupported(OES_packed_depth_stencil); + // save a few things for later restoring fGetIntegerv(LOCAL_GL_TEXTURE_BINDING_2D, (GLint*) &curBoundTexture); fGetIntegerv(LOCAL_GL_FRAMEBUFFER_BINDING, (GLint*) &curBoundFramebuffer); @@ -496,7 +554,7 @@ GLContext::ResizeOffscreenFBO(const gfxIntSize& aSize) fGenFramebuffers(1, &mOffscreenFBO); fBindFramebuffer(LOCAL_GL_FRAMEBUFFER, mOffscreenFBO); - if (depth && stencil && !mIsGLES2) { + if (depth && stencil && useDepthStencil) { fGenRenderbuffers(1, &mOffscreenDepthRB); } else { if (depth) { @@ -529,18 +587,35 @@ GLContext::ResizeOffscreenFBO(const gfxIntSize& aSize) aSize.width, aSize.height, 0, LOCAL_GL_RGB, +#ifdef XP_WIN + LOCAL_GL_UNSIGNED_BYTE, +#else mIsGLES2 ? LOCAL_GL_UNSIGNED_SHORT_5_6_5 : LOCAL_GL_UNSIGNED_BYTE, +#endif NULL); } - if (depth && stencil && !mIsGLES2) { + if (depth && stencil && useDepthStencil) { fBindRenderbuffer(LOCAL_GL_RENDERBUFFER, mOffscreenDepthRB); fRenderbufferStorage(LOCAL_GL_RENDERBUFFER, LOCAL_GL_DEPTH24_STENCIL8, aSize.width, aSize.height); } else { if (depth) { + GLenum depthType; + if (mIsGLES2) { + if (IsExtensionSupported(OES_depth32)) { + depthType = LOCAL_GL_DEPTH_COMPONENT32; + } else if (IsExtensionSupported(OES_depth24)) { + depthType = LOCAL_GL_DEPTH_COMPONENT24; + } else { + depthType = LOCAL_GL_DEPTH_COMPONENT16; + } + } else { + depthType = LOCAL_GL_DEPTH_COMPONENT24; + } + fBindRenderbuffer(LOCAL_GL_RENDERBUFFER, mOffscreenDepthRB); fRenderbufferStorage(LOCAL_GL_RENDERBUFFER, mIsGLES2 ? LOCAL_GL_DEPTH_COMPONENT16 @@ -565,7 +640,7 @@ GLContext::ResizeOffscreenFBO(const gfxIntSize& aSize) mOffscreenTexture, 0); - if (depth && stencil && !mIsGLES2) { + if (depth && stencil && useDepthStencil) { fFramebufferRenderbuffer(LOCAL_GL_FRAMEBUFFER, LOCAL_GL_DEPTH_ATTACHMENT, LOCAL_GL_RENDERBUFFER, @@ -603,6 +678,10 @@ GLContext::ResizeOffscreenFBO(const gfxIntSize& aSize) if (firstTime) { UpdateActualFormat(); + + printf_stderr("Created offscreen FBO: r: %d g: %d b: %d a: %d depth: %d stencil: %d\n", + mActualFormat.red, mActualFormat.green, mActualFormat.blue, mActualFormat.alpha, + mActualFormat.depth, mActualFormat.stencil); } // We're good, and the framebuffer is already attached, so let's @@ -665,7 +744,216 @@ GLContext::ClearSafely() void GLContext::UpdateActualFormat() { - // TODO + ContextFormat nf; + + fGetIntegerv(LOCAL_GL_RED_BITS, (GLint*) &nf.alpha); + fGetIntegerv(LOCAL_GL_GREEN_BITS, (GLint*) &nf.alpha); + fGetIntegerv(LOCAL_GL_BLUE_BITS, (GLint*) &nf.alpha); + fGetIntegerv(LOCAL_GL_ALPHA_BITS, (GLint*) &nf.alpha); + fGetIntegerv(LOCAL_GL_DEPTH_BITS, (GLint*) &nf.depth); + fGetIntegerv(LOCAL_GL_STENCIL_BITS, (GLint*) &nf.depth); + + mActualFormat = nf; +} + +void +GLContext::MarkDestroyed() +{ + MakeCurrent(); + DeleteOffscreenFBO(); + memset(&mFunctionListStartSentinel, 0, &mFunctionListEndSentinel - &mFunctionListStartSentinel); +} + +already_AddRefed +GLContext::ReadTextureImage(GLuint aTexture, + const gfxIntSize& aSize, + GLenum aTextureFormat) +{ + MakeCurrent(); + + nsRefPtr isurf; + + GLint oldrb, oldfb, oldprog, oldvp[4], oldPackAlignment; + GLint success; + + GLuint rb = 0, fb = 0; + GLuint vs = 0, fs = 0, prog = 0; + + const char *vShader = + "attribute vec4 aVertex;\n" + "attribute vec2 aTexCoord;\n" + "varying vec2 vTexCoord;\n" + "void main() { gl_Position = aVertex; vTexCoord = aTexCoord; }"; + const char *fShader = + "#ifdef GL_ES\n" + "precision mediump float;\n" + "#endif\n" + "varying vec2 vTexCoord;\n" + "uniform sampler2D uTexture;\n" + "void main() { gl_FragColor = texture2D(uTexture, vTexCoord); }"; + + float verts[4*4] = { + -1.0f, -1.0f, 0.0f, 1.0f, + 1.0f, -1.0f, 0.0f, 1.0f, + -1.0f, 1.0f, 0.0f, 1.0f, + 1.0f, 1.0f, 0.0f, 1.0f + }; + + float texcoords[2*4] = { + 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f + }; + + fGetIntegerv(LOCAL_GL_RENDERBUFFER_BINDING, &oldrb); + fGetIntegerv(LOCAL_GL_FRAMEBUFFER_BINDING, &oldfb); + fGetIntegerv(LOCAL_GL_CURRENT_PROGRAM, &oldprog); + fGetIntegerv(LOCAL_GL_VIEWPORT, oldvp); + fGetIntegerv(LOCAL_GL_PACK_ALIGNMENT, &oldPackAlignment); + + fGenRenderbuffers(1, &rb); + fBindRenderbuffer(LOCAL_GL_RENDERBUFFER, rb); + fRenderbufferStorage(LOCAL_GL_RENDERBUFFER, LOCAL_GL_RGBA, + aSize.width, aSize.height); + + fGenFramebuffers(1, &fb); + fBindFramebuffer(LOCAL_GL_FRAMEBUFFER, fb); + fFramebufferRenderbuffer(LOCAL_GL_FRAMEBUFFER, LOCAL_GL_COLOR_ATTACHMENT0, + LOCAL_GL_RENDERBUFFER, rb); + + if (fCheckFramebufferStatus(LOCAL_GL_FRAMEBUFFER) != + LOCAL_GL_FRAMEBUFFER_COMPLETE) + { + goto cleanup; + } + + vs = fCreateShader(LOCAL_GL_VERTEX_SHADER); + fs = fCreateShader(LOCAL_GL_FRAGMENT_SHADER); + fShaderSource(vs, 1, (const GLchar**) &vShader, NULL); + fShaderSource(fs, 1, (const GLchar**) &fShader, NULL); + prog = fCreateProgram(); + fAttachShader(prog, vs); + fAttachShader(prog, fs); + fBindAttribLocation(prog, 0, "aVertex"); + fBindAttribLocation(prog, 1, "aTexCoord"); + fLinkProgram(prog); + + fGetProgramiv(prog, LOCAL_GL_LINK_STATUS, &success); + if (!success) { + goto cleanup; + } + + fUseProgram(prog); + + fEnableVertexAttribArray(0); + fEnableVertexAttribArray(1); + + fVertexAttribPointer(0, 4, LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0, verts); + fVertexAttribPointer(1, 2, LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0, texcoords); + + fActiveTexture(LOCAL_GL_TEXTURE0); + fBindTexture(LOCAL_GL_TEXTURE_2D, aTexture); + + fUniform1i(fGetUniformLocation(prog, "uTexture"), 0); + + fViewport(0, 0, aSize.width, aSize.height); + + fDrawArrays(LOCAL_GL_TRIANGLE_STRIP, 0, 4); + + fDisableVertexAttribArray(1); + fDisableVertexAttribArray(0); + + isurf = new gfxImageSurface(aSize, gfxASurface::ImageFormatARGB32); + if (!isurf || isurf->CairoStatus()) { + isurf = nsnull; + goto cleanup; + } + + if (oldPackAlignment != 4) + fPixelStorei(LOCAL_GL_PACK_ALIGNMENT, 4); + + fReadPixels(0, 0, aSize.width, aSize.height, + LOCAL_GL_RGBA, LOCAL_GL_UNSIGNED_BYTE, + isurf->Data()); + + if (oldPackAlignment != 4) + fPixelStorei(LOCAL_GL_PACK_ALIGNMENT, oldPackAlignment); + + cleanup: + // note that deleting 0 has no effect in any of these calls + fDeleteRenderbuffers(1, &rb); + fDeleteFramebuffers(1, &fb); + fDeleteShader(vs); + fDeleteShader(fs); + fDeleteProgram(prog); + + fBindRenderbuffer(LOCAL_GL_RENDERBUFFER, oldrb); + fBindFramebuffer(LOCAL_GL_FRAMEBUFFER, oldfb); + fUseProgram(oldprog); + fViewport(oldvp[0], oldvp[1], oldvp[2], oldvp[3]); + + return isurf.forget(); +} + +void +GLContext::ReadPixelsIntoImageSurface(GLint aX, GLint aY, + GLsizei aWidth, GLsizei aHeight, + gfxImageSurface *aDest) +{ + MakeCurrent(); + + if (aDest->Format() != gfxASurface::ImageFormatARGB32 && + aDest->Format() != gfxASurface::ImageFormatRGB24) + { + NS_WARNING("ReadPixelsIntoImageSurface called with invalid image format"); + return; + } + + if (aDest->Width() != aWidth || + aDest->Height() != aHeight || + aDest->Stride() != aWidth * 4) + { + NS_WARNING("ReadPixelsIntoImageSurface called with wrong size or stride surface"); + return; + } + + GLint currentPackAlignment = 0; + fGetIntegerv(LOCAL_GL_PACK_ALIGNMENT, ¤tPackAlignment); + fPixelStorei(LOCAL_GL_PACK_ALIGNMENT, 4); + + // defaults for desktop + GLenum format = LOCAL_GL_BGRA; + GLenum datatype = LOCAL_GL_UNSIGNED_INT_8_8_8_8_REV; + bool swap = false; + + if (IsGLES2()) { + datatype = LOCAL_GL_UNSIGNED_BYTE; + + if (IsExtensionSupported(gl::GLContext::EXT_read_format_bgra) || + IsExtensionSupported(gl::GLContext::IMG_read_format) || + IsExtensionSupported(gl::GLContext::EXT_bgra)) + { + format = LOCAL_GL_BGRA; + } else { + format = LOCAL_GL_RGBA; + swap = true; + } + } + + fReadPixels(0, 0, aWidth, aHeight, + format, datatype, + aDest->Data()); + + if (swap) { + // swap B and R bytes + for (int j = 0; j < aHeight; ++j) { + PRUint32 *row = (PRUint32*) (aDest->Data() + aDest->Stride() * j); + for (int i = 0; i < aWidth; ++i) { + *row = (*row & 0xff00ff00) | ((*row & 0xff) << 16) | ((*row & 0xff0000) >> 16); + row++; + } + } + } + + fPixelStorei(LOCAL_GL_PACK_ALIGNMENT, currentPackAlignment); } #ifdef DEBUG diff --git a/gfx/thebes/GLContext.h b/gfx/thebes/GLContext.h index 6d6c40387330..522effbc80b6 100644 --- a/gfx/thebes/GLContext.h +++ b/gfx/thebes/GLContext.h @@ -385,6 +385,10 @@ public: mUserData.Put(aKey, aValue); } + // Mark this context as destroyed. This will NULL out all + // the GL function pointers! + void THEBES_API MarkDestroyed(); + enum NativeDataType { NativeGLContext, NativeImageSurface, @@ -395,6 +399,9 @@ public: virtual void *GetNativeData(NativeDataType aType) { return NULL; } GLContext *GetSharedContext() { return mSharedContext; } + PRBool IsGlobalSharedContext() { return mIsGlobalSharedContext; } + void SetIsGlobalSharedContext(PRBool aIsOne) { mIsGlobalSharedContext = aIsOne; } + const ContextFormat& CreationFormat() { return mCreationFormat; } const ContextFormat& ActualFormat() { return mActualFormat; } @@ -428,20 +435,6 @@ public: */ virtual PRBool ReleaseTexImage() { return PR_FALSE; } - virtual GLuint CreateTexture() - { - GLuint tex; - MakeCurrent(); - fGenTextures(1, &tex); - return tex; - } - - virtual void DestroyTexture(GLuint tex) - { - MakeCurrent(); - fDeleteTextures(1, &tex); - } - /* * Offscreen support API */ @@ -554,10 +547,61 @@ public: GLint aWrapMode, PRBool aUseNearestFilter=PR_FALSE); + /** + * Read the image data contained in aTexture, and return it as an ImageSurface. + * If GL_RGBA is given as the format, a ImageFormatARGB32 surface is returned. + * Not implemented yet: + * If GL_RGB is given as the format, a ImageFormatRGB24 surface is returned. + * If GL_LUMINANCE is given as the format, a ImageFormatA8 surface is returned. + * + * THIS IS EXPENSIVE. It is ridiculously expensive. Only do this + * if you absolutely positively must, and never in any performance + * critical path. + */ + already_AddRefed ReadTextureImage(GLuint aTexture, + const gfxIntSize& aSize, + GLenum aTextureFormat); + + /** + * Call ReadPixels into an existing gfxImageSurface for the given bounds. + * The image surface must be using image format RGBA32 or RGB24. + */ + void ReadPixelsIntoImageSurface(GLint aX, GLint aY, GLsizei aWidth, GLsizei aHeight, + gfxImageSurface *aDest); + + /** + * Known GL extensions that can be queried by + * IsExtensionSupported. The results of this are cached, and as + * such it's safe to use this even in performance critical code. + * If you add to this array, remember to add to the string names + * in GLContext.cpp. + */ + enum GLExtensions { + EXT_framebuffer_object, + ARB_framebuffer_object, + ARB_texture_rectangle, + EXT_bgra, + EXT_texture_format_BGRA8888, + OES_depth24, + OES_depth32, + OES_stencil8, + OES_texture_npot, + OES_depth_texture, + OES_packed_depth_stencil, + IMG_read_format, + EXT_read_format_bgra, + Extensions_Max + }; + + PRBool IsExtensionSupported(GLExtensions aKnownExtension) { + return mAvailableExtensions[aKnownExtension]; + } + protected: PRPackedBool mInitialized; PRPackedBool mIsOffscreen; PRPackedBool mIsGLES2; + PRPackedBool mIsGlobalSharedContext; ContextFormat mCreationFormat; nsRefPtr mSharedContext; @@ -576,6 +620,25 @@ protected: GLuint mOffscreenDepthRB; GLuint mOffscreenStencilRB; + // this should just be a std::bitset, but that ended up breaking + // MacOS X builds; see bug 584919. We can replace this with one + // later on. + template + struct ExtensionBitset { + ExtensionBitset() { + for (int i = 0; i < setlen; ++i) + values[i] = false; + } + + bool& operator[](const int index) { + NS_ASSERTION(index >= 0 && index < setlen, "out of range"); + return values[index]; + } + + bool values[setlen]; + }; + ExtensionBitset mAvailableExtensions; + // Clear to transparent black, with 0 depth and stencil, // while preserving current ClearColor etc. values. // Useful for resizing offscreen buffers. @@ -590,6 +653,7 @@ protected: PRBool InitWithPrefix(const char *prefix, PRBool trygl); + void InitExtensions(); PRBool IsExtensionSupported(const char *extension); virtual already_AddRefed @@ -607,6 +671,9 @@ public: * perl-or-python-or-js script somewhere and would be * autogenerated; one would be wrong. */ + // Keep this at the start of the function pointers + void *mFunctionListStartSentinel; + typedef void (GLAPIENTRY * PFNGLACTIVETEXTUREPROC) (GLenum texture); PFNGLACTIVETEXTUREPROC fActiveTexture; typedef void (GLAPIENTRY * PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader); @@ -851,6 +918,9 @@ public: typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGE) (GLenum target, GLenum internalFormat, GLsizei width, GLsizei height); PFNGLRENDERBUFFERSTORAGE fRenderbufferStorage; + // keep this at the end of the function pointers + void *mFunctionListEndSentinel; + void fDepthRange(GLclampf a, GLclampf b) { if (mIsGLES2) { priv_fDepthRangef(a, b); @@ -963,127 +1033,73 @@ public: priv_fDeleteRenderbuffers(n, names); } #else + GLContext *TrackingContext() { + GLContext *tip = this; + while (tip->mSharedContext) + tip = tip->mSharedContext; + return tip; + } + GLuint GLAPIENTRY fCreateProgram() { GLuint ret = priv_fCreateProgram(); - if (mSharedContext) { - GLContext *tip = mSharedContext; - while (tip->mSharedContext) - tip = tip->mSharedContext; - tip->CreatedProgram(this, ret); - } + TrackingContext()->CreatedProgram(this, ret); return ret; } GLuint GLAPIENTRY fCreateShader(GLenum t) { GLuint ret = priv_fCreateShader(t); - if (mSharedContext) { - GLContext *tip = mSharedContext; - while (tip->mSharedContext) - tip = tip->mSharedContext; - tip->CreatedShader(this, ret); - } + TrackingContext()->CreatedShader(this, ret); return ret; } void GLAPIENTRY fGenBuffers(GLsizei n, GLuint* names) { priv_fGenBuffers(n, names); - if (mSharedContext) { - GLContext *tip = mSharedContext; - while (tip->mSharedContext) - tip = tip->mSharedContext; - tip->CreatedBuffers(this, n, names); - } + TrackingContext()->CreatedBuffers(this, n, names); } void GLAPIENTRY fGenTextures(GLsizei n, GLuint* names) { priv_fGenTextures(n, names); - if (mSharedContext) { - GLContext *tip = mSharedContext; - while (tip->mSharedContext) - tip = tip->mSharedContext; - tip->CreatedTextures(this, n, names); - } + TrackingContext()->CreatedTextures(this, n, names); } void GLAPIENTRY fGenFramebuffers(GLsizei n, GLuint* names) { priv_fGenFramebuffers(n, names); - if (mSharedContext) { - GLContext *tip = mSharedContext; - while (tip->mSharedContext) - tip = tip->mSharedContext; - tip->CreatedFramebuffers(this, n, names); - } + TrackingContext()->CreatedFramebuffers(this, n, names); } void GLAPIENTRY fGenRenderbuffers(GLsizei n, GLuint* names) { priv_fGenRenderbuffers(n, names); - if (mSharedContext) { - GLContext *tip = mSharedContext; - while (tip->mSharedContext) - tip = tip->mSharedContext; - tip->CreatedRenderbuffers(this, n, names); - } + TrackingContext()->CreatedRenderbuffers(this, n, names); } void GLAPIENTRY fDeleteProgram(GLuint program) { priv_fDeleteProgram(program); - if (mSharedContext) { - GLContext *tip = mSharedContext; - while (tip->mSharedContext) - tip = tip->mSharedContext; - tip->DeletedProgram(this, program); - } + TrackingContext()->DeletedProgram(this, program); } void GLAPIENTRY fDeleteShader(GLuint shader) { priv_fDeleteShader(shader); - if (mSharedContext) { - GLContext *tip = mSharedContext; - while (tip->mSharedContext) - tip = tip->mSharedContext; - tip->DeletedShader(this, shader); - } + TrackingContext()->DeletedShader(this, shader); } void GLAPIENTRY fDeleteBuffers(GLsizei n, GLuint *names) { priv_fDeleteBuffers(n, names); - if (mSharedContext) { - GLContext *tip = mSharedContext; - while (tip->mSharedContext) - tip = tip->mSharedContext; - tip->DeletedBuffers(this, n, names); - } + TrackingContext()->DeletedBuffers(this, n, names); } void GLAPIENTRY fDeleteTextures(GLsizei n, GLuint *names) { priv_fDeleteTextures(n, names); - if (mSharedContext) { - GLContext *tip = mSharedContext; - while (tip->mSharedContext) - tip = tip->mSharedContext; - tip->DeletedTextures(this, n, names); - } + TrackingContext()->DeletedTextures(this, n, names); } void GLAPIENTRY fDeleteFramebuffers(GLsizei n, GLuint *names) { priv_fDeleteFramebuffers(n, names); - if (mSharedContext) { - GLContext *tip = mSharedContext; - while (tip->mSharedContext) - tip = tip->mSharedContext; - tip->DeletedFramebuffers(this, n, names); - } - + TrackingContext()->DeletedFramebuffers(this, n, names); } void GLAPIENTRY fDeleteRenderbuffers(GLsizei n, GLuint *names) { priv_fDeleteRenderbuffers(n, names); - if (mSharedContext) { - GLContext *tip = mSharedContext; - while (tip->mSharedContext) - tip = tip->mSharedContext; - tip->DeletedRenderbuffers(this, n, names); - } + TrackingContext()->DeletedRenderbuffers(this, n, names); } void THEBES_API CreatedProgram(GLContext *aOrigin, GLuint aName); diff --git a/gfx/thebes/GLContextProvider.h b/gfx/thebes/GLContextProvider.h index fdd48ae164bd..e86c9ca66526 100644 --- a/gfx/thebes/GLContextProvider.h +++ b/gfx/thebes/GLContextProvider.h @@ -74,12 +74,15 @@ namespace gl { #define GL_CONTEXT_PROVIDER_DEFAULT GLContextProviderCGL #endif -#if defined(ANDROID) || defined(MOZ_PLATFORM_MAEMO) +#if defined(ANDROID) || defined(MOZ_PLATFORM_MAEMO) || defined(XP_WIN) #define GL_CONTEXT_PROVIDER_NAME GLContextProviderEGL #include "GLContextProviderImpl.h" #undef GL_CONTEXT_PROVIDER_NAME + +#ifndef GL_CONTEXT_PROVIDER_DEFAULT #define GL_CONTEXT_PROVIDER_DEFAULT GLContextProviderEGL #endif +#endif // X11, but only if we didn't use EGL above #if defined(MOZ_X11) && !defined(GL_CONTEXT_PROVIDER_DEFAULT) diff --git a/gfx/thebes/GLContextProviderCGL.mm b/gfx/thebes/GLContextProviderCGL.mm index 2a882341325e..934ef4118ea3 100644 --- a/gfx/thebes/GLContextProviderCGL.mm +++ b/gfx/thebes/GLContextProviderCGL.mm @@ -520,6 +520,8 @@ GLContextProviderCGL::GetGlobalContext() gGlobalContext = nsnull; return nsnull; } + + gGlobalContext->SetIsGlobalSharedContext(PR_TRUE); } return gGlobalContext; diff --git a/gfx/thebes/GLContextProviderEGL.cpp b/gfx/thebes/GLContextProviderEGL.cpp index f5cb4a23bcbf..439c7c195f2e 100644 --- a/gfx/thebes/GLContextProviderEGL.cpp +++ b/gfx/thebes/GLContextProviderEGL.cpp @@ -76,6 +76,62 @@ typedef void *EGLNativeWindowType; #define EGL_LIB "/system/lib/libEGL.so" #define GLES2_LIB "/system/lib/libGLESv2.so" +#elif defined(XP_WIN) + +#include +#include +#include + +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN 1 +#endif + +#include + +typedef HDC EGLNativeDisplayType; +typedef HBITMAP EGLNativePixmapType; +typedef HWND EGLNativeWindowType; + +#define GET_NATIVE_WINDOW(aWidget) ((EGLNativeWindowType)aWidget->GetNativeData(NS_NATIVE_WINDOW)) + +#define EGL_LIB "libEGL.dll" +#define GLES2_LIB "libGLESv2.dll" + +// a little helper +class AutoDestroyHWND { +public: + AutoDestroyHWND(HWND aWnd = NULL) + : mWnd(aWnd) + { + } + + ~AutoDestroyHWND() { + if (mWnd) { + ::DestroyWindow(mWnd); + } + } + + operator HWND() { + return mWnd; + } + + HWND forget() { + HWND w = mWnd; + mWnd = NULL; + return w; + } + + HWND operator=(HWND aWnd) { + if (mWnd && mWnd != aWnd) { + ::DestroyWindow(mWnd); + } + mWnd = aWnd; + return mWnd; + } + + HWND mWnd; +}; + #else #error "Platform not recognized" @@ -147,58 +203,58 @@ public: mHave_EGL_KHR_gl_texture_2D_image = PR_FALSE; } - typedef EGLDisplay (*pfnGetDisplay)(void *display_id); + typedef EGLDisplay (GLAPIENTRY * pfnGetDisplay)(void *display_id); pfnGetDisplay fGetDisplay; - typedef EGLContext (*pfnGetCurrentContext)(void); + typedef EGLContext (GLAPIENTRY * pfnGetCurrentContext)(void); pfnGetCurrentContext fGetCurrentContext; - typedef EGLBoolean (*pfnMakeCurrent)(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx); + typedef EGLBoolean (GLAPIENTRY * pfnMakeCurrent)(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx); pfnMakeCurrent fMakeCurrent; - typedef EGLBoolean (*pfnDestroyContext)(EGLDisplay dpy, EGLContext ctx); + typedef EGLBoolean (GLAPIENTRY * pfnDestroyContext)(EGLDisplay dpy, EGLContext ctx); pfnDestroyContext fDestroyContext; - typedef EGLContext (*pfnCreateContext)(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list); + typedef EGLContext (GLAPIENTRY * pfnCreateContext)(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list); pfnCreateContext fCreateContext; - typedef EGLBoolean (*pfnDestroySurface)(EGLDisplay dpy, EGLSurface surface); + typedef EGLBoolean (GLAPIENTRY * pfnDestroySurface)(EGLDisplay dpy, EGLSurface surface); pfnDestroySurface fDestroySurface; - typedef EGLSurface (*pfnCreateWindowSurface)(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint *attrib_list); + typedef EGLSurface (GLAPIENTRY * pfnCreateWindowSurface)(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint *attrib_list); pfnCreateWindowSurface fCreateWindowSurface; - typedef EGLSurface (*pfnCreatePbufferSurface)(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list); + typedef EGLSurface (GLAPIENTRY * pfnCreatePbufferSurface)(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list); pfnCreatePbufferSurface fCreatePbufferSurface; - typedef EGLSurface (*pfnCreatePixmapSurface)(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list); + typedef EGLSurface (GLAPIENTRY * pfnCreatePixmapSurface)(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list); pfnCreatePixmapSurface fCreatePixmapSurface; - typedef EGLBoolean (*pfnBindAPI)(EGLenum api); + typedef EGLBoolean (GLAPIENTRY * pfnBindAPI)(EGLenum api); pfnBindAPI fBindAPI; - typedef EGLBoolean (*pfnInitialize)(EGLDisplay dpy, EGLint *major, EGLint *minor); + typedef EGLBoolean (GLAPIENTRY * pfnInitialize)(EGLDisplay dpy, EGLint *major, EGLint *minor); pfnInitialize fInitialize; - typedef EGLBoolean (*pfnChooseConfig)(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config); + typedef EGLBoolean (GLAPIENTRY * pfnChooseConfig)(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config); pfnChooseConfig fChooseConfig; - typedef EGLint (*pfnGetError)(void); + typedef EGLint (GLAPIENTRY * pfnGetError)(void); pfnGetError fGetError; - typedef EGLBoolean (*pfnGetConfigAttrib)(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value); + typedef EGLBoolean (GLAPIENTRY * pfnGetConfigAttrib)(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value); pfnGetConfigAttrib fGetConfigAttrib; - typedef EGLBoolean (*pfnGetConfigs)(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config); + typedef EGLBoolean (GLAPIENTRY * pfnGetConfigs)(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config); pfnGetConfigs fGetConfigs; - typedef EGLBoolean (*pfnWaitNative)(EGLint engine); + typedef EGLBoolean (GLAPIENTRY * pfnWaitNative)(EGLint engine); pfnWaitNative fWaitNative; - typedef EGLCastToRelevantPtr (*pfnGetProcAddress)(const char *procname); + typedef EGLCastToRelevantPtr (GLAPIENTRY * pfnGetProcAddress)(const char *procname); pfnGetProcAddress fGetProcAddress; - typedef EGLBoolean (*pfnSwapBuffers)(EGLDisplay dpy, EGLSurface surface); + typedef EGLBoolean (GLAPIENTRY * pfnSwapBuffers)(EGLDisplay dpy, EGLSurface surface); pfnSwapBuffers fSwapBuffers; - typedef EGLBoolean (*pfnCopyBuffers)(EGLDisplay dpy, EGLSurface surface, - EGLNativePixmapType target); + typedef EGLBoolean (GLAPIENTRY * pfnCopyBuffers)(EGLDisplay dpy, EGLSurface surface, + EGLNativePixmapType target); pfnCopyBuffers fCopyBuffers; - typedef const GLubyte* (*pfnQueryString)(EGLDisplay, EGLint name); + typedef const GLubyte* (GLAPIENTRY * pfnQueryString)(EGLDisplay, EGLint name); pfnQueryString fQueryString; - typedef EGLBoolean (*pfnBindTexImage)(EGLDisplay, EGLSurface surface, EGLint buffer); + typedef EGLBoolean (GLAPIENTRY * pfnBindTexImage)(EGLDisplay, EGLSurface surface, EGLint buffer); pfnBindTexImage fBindTexImage; - typedef EGLBoolean (*pfnReleaseTexImage)(EGLDisplay, EGLSurface surface, EGLint buffer); + typedef EGLBoolean (GLAPIENTRY * pfnReleaseTexImage)(EGLDisplay, EGLSurface surface, EGLint buffer); pfnReleaseTexImage fReleaseTexImage; - typedef EGLImageKHR (*pfnCreateImageKHR)(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list); + typedef EGLImageKHR (GLAPIENTRY * pfnCreateImageKHR)(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list); pfnCreateImageKHR fCreateImageKHR; - typedef EGLBoolean (*pfnDestroyImageKHR)(EGLDisplay dpy, EGLImageKHR image); + typedef EGLBoolean (GLAPIENTRY * pfnDestroyImageKHR)(EGLDisplay dpy, EGLImageKHR image); pfnDestroyImageKHR fDestroyImageKHR; // This is EGL specific GL ext symbol "glEGLImageTargetTexture2DOES" // Lets keep it here for now. - typedef void (*pfnImageTargetTexture2DOES)(GLenum target, GLeglImageOES image); + typedef void (GLAPIENTRY * pfnImageTargetTexture2DOES)(GLenum target, GLeglImageOES image); pfnImageTargetTexture2DOES fImageTargetTexture2DOES; PRBool EnsureInitialized() @@ -207,6 +263,43 @@ public: return PR_TRUE; } +#ifdef XP_WIN + // ANGLE is an addon currently, so we have to do a bit of work + // to find the directory; the addon sets this on startup/shutdown. + do { + nsCOMPtr prefs = do_GetService("@mozilla.org/preferences-service;1"); + nsCOMPtr angleFile, glesv2File; + if (!prefs) + break; + + nsresult rv = prefs->GetComplexValue("gfx.angle.egl.path", + NS_GET_IID(nsILocalFile), + getter_AddRefs(angleFile)); + if (NS_FAILED(rv) || !angleFile) + break; + + nsCAutoString s; + + // note that we have to load the libs in this order, because libEGL.dll + // depends on libGLESv2.dll, but is not in our search path. + nsCOMPtr f; + angleFile->Clone(getter_AddRefs(f)); + glesv2File = do_QueryInterface(f); + if (!glesv2File) + break; + + glesv2File->Append(NS_LITERAL_STRING("libGLESv2.dll")); + + PRLibrary *glesv2lib = nsnull; // this will be leaked on purpose + glesv2File->Load(&glesv2lib); + if (!glesv2lib) + break; + + angleFile->Append(NS_LITERAL_STRING("libEGL.dll")); + angleFile->Load(&mEGLLibrary); + } while (false); +#endif + if (!mEGLLibrary) { mEGLLibrary = PR_LoadLibrary(EGL_LIB); if (!mEGLLibrary) { @@ -253,6 +346,11 @@ public: return PR_FALSE; const char *extensions = (const char*) fQueryString(mEGLDisplay, LOCAL_EGL_EXTENSIONS); + if (!extensions) + extensions = ""; + + printf_stderr("Extensions: %s 0x%02x\n", extensions, extensions[0]); + printf_stderr("Extensions length: %d\n", strlen(extensions)); // note the extra space -- this ugliness tries to match // EGL_KHR_image in the middle of the string, or right at the @@ -406,10 +504,21 @@ public: , mThebesSurface(nsnull) , mBound(PR_FALSE) , mIsPBuffer(PR_FALSE) - {} +#ifdef XP_WIN + , mWnd(0) +#endif + { + // any EGL contexts will always be GLESv2 + SetIsGLES2(PR_TRUE); + } ~GLContextEGL() { + if (mOffscreenFBO) { + MakeCurrent(); + DeleteOffscreenFBO(); + } + // If mGLWidget is non-null, then we've been given it by the GL context provider, // and it's managed by the widget implementation. In this case, We can't destroy // our contexts. @@ -559,6 +668,15 @@ public: CreateEGLPBufferOffscreenContext(const gfxIntSize& aSize, const ContextFormat& aFormat); +#ifdef XP_WIN + static already_AddRefed + CreateEGLWin32OffscreenContext(const gfxIntSize& aSize, + const ContextFormat& aFormat); + + void HoldWin32Window(HWND aWnd) { mWnd = aWnd; } + HWND GetWin32Window() { return mWnd; } +#endif + void SetOffscreenSize(const gfxIntSize &aRequestedSize, const gfxIntSize &aActualSize) { @@ -577,6 +695,10 @@ protected: PRBool mBound; PRPackedBool mIsPBuffer; + +#ifdef XP_WIN + AutoDestroyHWND mWnd; +#endif }; PRBool @@ -1167,6 +1289,95 @@ GLContextEGL::CreateEGLPixmapOffscreenContext(const gfxIntSize& aSize, return glContext.forget(); } +#ifdef XP_WIN +already_AddRefed +GLContextEGL::CreateEGLWin32OffscreenContext(const gfxIntSize& aSize, + const ContextFormat& aFormat) +{ + if (!sEGLLibrary.EnsureInitialized()) { + return nsnull; + } + + WNDCLASSW wc; + if (!GetClassInfoW(GetModuleHandle(NULL), L"ANGLEContextClass", &wc)) { + ZeroMemory(&wc, sizeof(WNDCLASSW)); + wc.style = CS_OWNDC; + wc.hInstance = GetModuleHandle(NULL); + wc.lpfnWndProc = DefWindowProc; + wc.lpszClassName = L"ANGLEContextClass"; + if (!RegisterClassW(&wc)) { + NS_WARNING("Failed to register ANGLEContextClass?!"); + return NULL; + } + } + + AutoDestroyHWND wnd = CreateWindowW(L"ANGLEContextClass", L"ANGLEContext", 0, + 0, 0, 16, 16, + NULL, NULL, GetModuleHandle(NULL), NULL); + NS_ENSURE_TRUE(HWND(wnd), NULL); + + EGLConfig config; + EGLSurface surface; + EGLContext context; + + // We don't really care, we're going to use a FBO anyway + EGLint attribs[] = { + LOCAL_EGL_SURFACE_TYPE, LOCAL_EGL_WINDOW_BIT, + LOCAL_EGL_RENDERABLE_TYPE, LOCAL_EGL_OPENGL_ES2_BIT, + LOCAL_EGL_NONE + }; + + EGLint ncfg = 1; + if (!sEGLLibrary.fChooseConfig(sEGLLibrary.Display(), attribs, &config, ncfg, &ncfg) || + ncfg < 1) + { + return nsnull; + } + + surface = sEGLLibrary.fCreateWindowSurface(sEGLLibrary.Display(), + config, + HWND(wnd), + 0); + if (!surface) { + return nsnull; + } + + if (!sEGLLibrary.fBindAPI(LOCAL_EGL_OPENGL_ES_API)) { + sEGLLibrary.fDestroySurface(sEGLLibrary.Display(), surface); + return nsnull; + } + + EGLint cxattribs[] = { + LOCAL_EGL_CONTEXT_CLIENT_VERSION, 2, + LOCAL_EGL_NONE + }; + context = sEGLLibrary.fCreateContext(sEGLLibrary.Display(), + config, + EGL_NO_CONTEXT, + cxattribs); + if (!context) { + sEGLLibrary.fDestroySurface(sEGLLibrary.Display(), surface); + return nsnull; + } + + nsRefPtr glContext = new GLContextEGL(aFormat, nsnull, + config, surface, context, + PR_TRUE); + + // hold this even before we initialize, because we need to make + // sure it gets destroyed after the surface etc. in case of error. + glContext->HoldWin32Window(wnd.forget()); + + if (!glContext->Init() || + !glContext->ResizeOffscreenFBO(aSize)) + { + return nsnull; + } + + return glContext.forget(); +} +#endif + // Under EGL, if we're under X11, then we have to create a Pixmap // because Maemo's EGL implementation doesn't support pbuffers at all // for some reason. On Android, pbuffers are supported fine, though @@ -1183,6 +1394,8 @@ GLContextProviderEGL::CreateOffscreen(const gfxIntSize& aSize, return GLContextEGL::CreateEGLPBufferOffscreenContext(aSize, aFormat); #elif defined(MOZ_X11) return GLContextEGL::CreateEGLPixmapOffscreenContext(aSize, aFormat); +#elif defined(XP_WIN) + return GLContextEGL::CreateEGLWin32OffscreenContext(aSize, aFormat); #else return nsnull; #endif @@ -1291,6 +1504,8 @@ GLContextProviderEGL::GetGlobalContext() if (!triedToCreateContext && !gGlobalContext) { triedToCreateContext = true; gGlobalContext = CreateOffscreen(gfxIntSize(16, 16)); + if (gGlobalContext) + gGlobalContext->SetIsGlobalSharedContext(PR_TRUE); } return gGlobalContext; diff --git a/gfx/thebes/GLContextProviderGLX.cpp b/gfx/thebes/GLContextProviderGLX.cpp index eef367971bf4..e2a0bbb299d5 100644 --- a/gfx/thebes/GLContextProviderGLX.cpp +++ b/gfx/thebes/GLContextProviderGLX.cpp @@ -225,6 +225,11 @@ TRY_AGAIN_NO_SHARING: ~GLContextGLX() { + if (mOffscreenFBO) { + MakeCurrent(); + DeleteOffscreenFBO(); + } + sGLXLibrary.xDeleteContext(mDisplay, mContext); if (mDeleteDrawable) { @@ -287,34 +292,6 @@ TRY_AGAIN_NO_SHARING: return PR_TRUE; } - void WindowDestroyed() - { - for (unsigned int i=0; i CreateBasicTextureImage(GLuint aTexture, const nsIntSize& aSize, @@ -347,7 +324,6 @@ private: PRPackedBool mDeleteDrawable; PRPackedBool mDoubleBuffered; - nsTArray textures; nsRefPtr mPixmap; }; @@ -740,6 +716,8 @@ GLContextProviderGLX::GetGlobalContext() gGlobalContext = CreateOffscreenPixmapContext(gfxIntSize(1, 1), ContextFormat(ContextFormat::BasicRGB24), PR_FALSE); + if (gGlobalContext) + gGlobalContext->SetIsGlobalSharedContext(PR_TRUE); } return gGlobalContext; diff --git a/gfx/thebes/GLContextProviderWGL.cpp b/gfx/thebes/GLContextProviderWGL.cpp index f5fa0a3427b4..94102c91e537 100644 --- a/gfx/thebes/GLContextProviderWGL.cpp +++ b/gfx/thebes/GLContextProviderWGL.cpp @@ -87,6 +87,10 @@ CreateDummyWindow(HDC *aWindowDC = nsnull) pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL; pfd.iPixelType = PFD_TYPE_RGBA; pfd.cColorBits = 24; + pfd.cRedBits = 8; + pfd.cGreenBits = 8; + pfd.cBlueBits = 8; + pfd.cAlphaBits = 8; pfd.cDepthBits = 0; pfd.iLayerType = PFD_MAIN_PLANE; @@ -688,6 +692,8 @@ GLContextProviderWGL::GetGlobalContext() gGlobalContext = nsnull; return PR_FALSE; } + + gGlobalContext->SetIsGlobalSharedContext(PR_TRUE); } return static_cast(gGlobalContext); diff --git a/gfx/thebes/GLXLibrary.h b/gfx/thebes/GLXLibrary.h index d8fa23b38bc2..2a093784606e 100644 --- a/gfx/thebes/GLXLibrary.h +++ b/gfx/thebes/GLXLibrary.h @@ -116,6 +116,15 @@ public: GLXContext, Bool); PFNGLXCREATECONTEXT xCreateContext; + typedef int (GLAPIENTRY * PFNGLXGETCONFIG) (Display *, + XVisualInfo *, + int, + int *); + PFNGLXGETCONFIG xGetConfig; + typedef GLXPixmap (GLAPIENTRY * PFNGLXCREATEGLXPIXMAP) (Display *, + XVisualInfo *, + Pixmap); + PFNGLXCREATEGLXPIXMAP xCreateGLXPixmap; PRBool EnsureInitialized(); diff --git a/gfx/thebes/Makefile.in b/gfx/thebes/Makefile.in index d16108108783..7c8ae150d955 100644 --- a/gfx/thebes/Makefile.in +++ b/gfx/thebes/Makefile.in @@ -414,6 +414,11 @@ else CPPSRCS += GLContextProvider$(GL_PROVIDER).cpp endif +# Win32 is a special snowflake, for ANGLE +ifeq ($(MOZ_WIDGET_TOOLKIT),windows) +CPPSRCS += GLContextProviderEGL.cpp +endif + DEFINES += -DIMPL_THEBES -DWOFF_MOZILLA_CLIENT include $(topsrcdir)/config/rules.mk diff --git a/gfx/thebes/gfxOS2Fonts.cpp b/gfx/thebes/gfxOS2Fonts.cpp index 237d80185fd1..3a25503344e3 100644 --- a/gfx/thebes/gfxOS2Fonts.cpp +++ b/gfx/thebes/gfxOS2Fonts.cpp @@ -500,9 +500,10 @@ PRBool gfxOS2Font::SetupCairoFont(gfxContext *aContext) already_AddRefed gfxOS2Font::GetOrMakeFont(const nsAString& aName, const gfxFontStyle *aStyle) { - nsRefPtr font = gfxFontCache::GetCache()->Lookup(aName, aStyle); + nsRefPtr fe = new gfxOS2FontEntry(aName); + nsRefPtr font = + gfxFontCache::GetCache()->Lookup(static_cast(fe), aStyle); if (!font) { - nsRefPtr fe = new gfxOS2FontEntry(aName); font = new gfxOS2Font(fe, aStyle); if (!font) return nsnull; diff --git a/js/narcissus/jsdefs.js b/js/narcissus/jsdefs.js index f83cd8531c55..a3385f60b87b 100644 --- a/js/narcissus/jsdefs.js +++ b/js/narcissus/jsdefs.js @@ -43,13 +43,17 @@ * separately to take advantage of the simple switch-case constant propagation * done by SpiderMonkey. */ -Narcissus = {}; + +Narcissus = { + options: { version: 185 } +}; + Narcissus.jsdefs = (function() { var tokens = [ // End of source. "END", - + // Operators and punctuators. Some pair-wise order matters, e.g. (+, -) // and (UNARY_PLUS, UNARY_MINUS). "\n", ";", @@ -72,15 +76,15 @@ Narcissus.jsdefs = (function() { "[", "]", "{", "}", "(", ")", - + // Nonterminal tree node type codes. "SCRIPT", "BLOCK", "LABEL", "FOR_IN", "CALL", "NEW_WITH_ARGS", "INDEX", "ARRAY_INIT", "OBJECT_INIT", "PROPERTY_INIT", "GETTER", "SETTER", "GROUP", "LIST", "LET_BLOCK", "ARRAY_COMP", "GENERATOR", "COMP_TAIL", - + // Terminals. "IDENTIFIER", "NUMBER", "STRING", "REGEXP", - + // Keywords. "break", "case", "catch", "const", "continue", @@ -97,7 +101,7 @@ Narcissus.jsdefs = (function() { "yield", "while", "with", ]; - + // Operator and punctuator mapping from token to tree node type name. // NB: because the lexer doesn't backtrack, all token prefixes must themselves // be valid tokens (e.g. !== is acceptable because its prefixes are the valid @@ -142,14 +146,14 @@ Narcissus.jsdefs = (function() { '(': "LEFT_PAREN", ')': "RIGHT_PAREN" }; - + // Hash of keyword identifier to tokens index. NB: we must null __proto__ to // avoid toString, etc. namespace pollution. var keywords = {__proto__: null}; - + // Define const END, etc., based on the token names. Also map name to index. var tokenIds = {}; - + // Building up a string to be eval'd in different contexts. var consts = "const "; for (var i = 0, j = tokens.length; i < j; i++) { @@ -168,23 +172,23 @@ Narcissus.jsdefs = (function() { tokens[t] = i; } consts += ";"; - + // Map assignment operators to their indexes in the tokens array. var assignOps = ['|', '^', '&', '<<', '>>', '>>>', '+', '-', '*', '/', '%']; - + for (i = 0, j = assignOps.length; i < j; i++) { t = assignOps[i]; assignOps[t] = tokens[t]; } - + function defineGetter(obj, prop, fn, dontDelete, dontEnum) { Object.defineProperty(obj, prop, { get: fn, configurable: !dontDelete, enumerable: !dontEnum }); } - + function defineProperty(obj, prop, val, dontDelete, readOnly, dontEnum) { Object.defineProperty(obj, prop, { value: val, writable: !readOnly, configurable: !dontDelete, enumerable: !dontEnum }); } - + return { "tokens": tokens, "opTypeNames": opTypeNames, diff --git a/js/narcissus/jsexec.js b/js/narcissus/jsexec.js index f86d9d04acb7..1a02da28c52b 100644 --- a/js/narcissus/jsexec.js +++ b/js/narcissus/jsexec.js @@ -52,25 +52,25 @@ Narcissus.jsexec = (function() { var jsparse = Narcissus.jsparse; var jsdefs = Narcissus.jsdefs; - + // Set constants in the local scope. eval(jsdefs.consts); - + const GLOBAL_CODE = 0, EVAL_CODE = 1, FUNCTION_CODE = 2; - + function ExecutionContext(type) { this.type = type; } - + var global = { // Value properties. NaN: NaN, Infinity: Infinity, undefined: undefined, - + // Function properties. eval: function eval(s) { if (typeof s != "string") return s; - + var x = ExecutionContext.current; var x2 = new ExecutionContext(EVAL_CODE); x2.thisObject = x.thisObject; @@ -110,7 +110,7 @@ Narcissus.jsexec = (function() { decodeURI: decodeURI, encodeURI: encodeURI, decodeURIComponent: decodeURIComponent, encodeURIComponent: encodeURIComponent, - + // Class constructors. Where ECMA-262 requires C.length == 1, we declare // a dummy formal parameter. Object: Object, @@ -125,11 +125,11 @@ Narcissus.jsexec = (function() { } b += arguments[m]; } - + // XXX We want to pass a good file and line to the tokenizer. // Note the anonymous name to maintain parity with Spidermonkey. var t = new jsparse.Tokenizer("anonymous(" + p + ") {" + b + "}"); - + // NB: Use the STATEMENT_FORM constant since we don't want to push this // function onto the fake compilation context. var x = { builder: new jsparse.VanillaBuilder }; @@ -156,27 +156,28 @@ Narcissus.jsexec = (function() { Error: Error, EvalError: EvalError, RangeError: RangeError, ReferenceError: ReferenceError, SyntaxError: SyntaxError, TypeError: TypeError, URIError: URIError, - + // Other properties. Math: Math, - + // Extensions to ECMA. snarf: snarf, evaluate: evaluate, load: function load(s) { if (typeof s != "string") return s; - + evaluate(snarf(s), s, 1) }, print: print, - version: function() { return 185; } + version: function() { return Narcissus.options.version; }, + quit: function() { throw END; } }; - + // Helper to avoid Object.prototype.hasOwnProperty polluting scope objects. function hasDirectProperty(o, p) { return Object.prototype.hasOwnProperty.call(o, p); } - + // Reflect a host class into the target global environment by delegation. function reflectClass(name, proto) { var gctor = global[name]; @@ -184,19 +185,19 @@ Narcissus.jsexec = (function() { jsdefs.defineProperty(proto, "constructor", gctor, false, false, true); return proto; } - + // Reflect Array -- note that all Array methods are generic. reflectClass('Array', new Array); - + // Reflect String, overriding non-generic methods. var gSp = reflectClass('String', new String); gSp.toSource = function () { return this.value.toSource(); }; gSp.toString = function () { return this.value; }; gSp.valueOf = function () { return this.value; }; global.String.fromCharCode = String.fromCharCode; - + ExecutionContext.current = null; - + ExecutionContext.prototype = { caller: null, callee: null, @@ -204,17 +205,34 @@ Narcissus.jsexec = (function() { thisObject: global, result: undefined, target: null, - ecma3OnlyMode: false + ecma3OnlyMode: false, + // Run a thunk in this execution context and return its result. + run: function(thunk) { + var prev = ExecutionContext.current; + ExecutionContext.current = this; + try { + thunk(); + return this.result; + } catch (e if e == THROW) { + if (prev) { + prev.result = this.result; + throw THROW; + } + throw this.result; + } finally { + ExecutionContext.current = prev; + } + } }; - + function Reference(base, propertyName, node) { this.base = base; this.propertyName = propertyName; this.node = node; } - + Reference.prototype.toString = function () { return this.node.getSource(); } - + function getValue(v) { if (v instanceof Reference) { if (!v.base) { @@ -225,24 +243,24 @@ Narcissus.jsexec = (function() { } return v; } - + function putValue(v, w, vn) { if (v instanceof Reference) return (v.base || global)[v.propertyName] = w; throw new ReferenceError("Invalid assignment left-hand side", vn.filename, vn.lineno); } - + function isPrimitive(v) { var t = typeof v; return (t == "object") ? v === null : t != "function"; } - + function isObject(v) { var t = typeof v; return (t == "object") ? v !== null : t == "function"; } - + // If r instanceof Reference, v == getValue(r); else v === r. If passed, rn // is the node whose execute result was r. function toObject(v, r, rn) { @@ -263,10 +281,10 @@ Narcissus.jsexec = (function() { throw rn ? new TypeError(message, rn.filename, rn.lineno) : new TypeError(message); } - + function execute(n, x) { var a, f, i, j, r, s, t, u, v; - + switch (n.type) { case FUNCTION: if (n.functionForm != jsparse.DECLARED_FORM) { @@ -286,7 +304,7 @@ Narcissus.jsexec = (function() { } } break; - + case SCRIPT: t = x.scope.object; a = n.funDecls; @@ -308,19 +326,19 @@ Narcissus.jsexec = (function() { } } // FALL THROUGH - + case BLOCK: for (i = 0, j = n.length; i < j; i++) execute(n[i], x); break; - + case IF: if (getValue(execute(n.condition, x))) execute(n.thenPart, x); else if (n.elsePart) execute(n.elsePart, x); break; - + case SWITCH: s = getValue(execute(n.discriminant, x)); a = n.cases; @@ -360,7 +378,7 @@ Narcissus.jsexec = (function() { } } break; - + case FOR: n.setup && getValue(execute(n.setup, x)); // FALL THROUGH @@ -376,7 +394,7 @@ Narcissus.jsexec = (function() { n.update && getValue(execute(n.update, x)); } break; - + case FOR_IN: u = n.varDecl; if (u) @@ -384,7 +402,7 @@ Narcissus.jsexec = (function() { r = n.iterator; s = execute(n.object, x); v = getValue(s); - + // ECMA deviation to track extant browser JS implementation behavior. t = (v == null && !x.ecma3OnlyMode) ? v : toObject(v, s, n.object); a = []; @@ -401,7 +419,7 @@ Narcissus.jsexec = (function() { } } break; - + case DO: do { try { @@ -413,12 +431,12 @@ Narcissus.jsexec = (function() { } } while (getValue(execute(n.condition, x))); break; - + case BREAK: case CONTINUE: x.target = n.target; throw n.type; - + case TRY: try { execute(n.tryBlock, x); @@ -447,15 +465,15 @@ Narcissus.jsexec = (function() { execute(n.finallyBlock, x); } break; - + case THROW: x.result = getValue(execute(n.exception, x)); throw THROW; - + case RETURN: x.result = getValue(execute(n.value, x)); throw RETURN; - + case WITH: r = execute(n.object, x); t = toObject(getValue(r), r, n.object); @@ -466,7 +484,7 @@ Narcissus.jsexec = (function() { x.scope = x.scope.parent; } break; - + case VAR: case CONST: for (i = 0, j = n.length; i < j; i++) { @@ -485,27 +503,27 @@ Narcissus.jsexec = (function() { s.object[t] = u; } break; - + case DEBUGGER: throw "NYI: " + jsdefs.tokens[n.type]; - + case SEMICOLON: if (n.expression) x.result = getValue(execute(n.expression, x)); break; - + case LABEL: try { execute(n.statement, x); } catch (e if e == BREAK && x.target == n) { } break; - + case COMMA: for (i = 0, j = n.length; i < j; i++) v = getValue(execute(n[i], x)); break; - + case ASSIGN: r = execute(n[0], x); t = n.assignOp; @@ -529,68 +547,68 @@ Narcissus.jsexec = (function() { } putValue(r, v, n[0]); break; - + case HOOK: v = getValue(execute(n[0], x)) ? getValue(execute(n[1], x)) : getValue(execute(n[2], x)); break; - + case OR: v = getValue(execute(n[0], x)) || getValue(execute(n[1], x)); break; - + case AND: v = getValue(execute(n[0], x)) && getValue(execute(n[1], x)); break; - + case BITWISE_OR: v = getValue(execute(n[0], x)) | getValue(execute(n[1], x)); break; - + case BITWISE_XOR: v = getValue(execute(n[0], x)) ^ getValue(execute(n[1], x)); break; - + case BITWISE_AND: v = getValue(execute(n[0], x)) & getValue(execute(n[1], x)); break; - + case EQ: v = getValue(execute(n[0], x)) == getValue(execute(n[1], x)); break; - + case NE: v = getValue(execute(n[0], x)) != getValue(execute(n[1], x)); break; - + case STRICT_EQ: v = getValue(execute(n[0], x)) === getValue(execute(n[1], x)); break; - + case STRICT_NE: v = getValue(execute(n[0], x)) !== getValue(execute(n[1], x)); break; - + case LT: v = getValue(execute(n[0], x)) < getValue(execute(n[1], x)); break; - + case LE: v = getValue(execute(n[0], x)) <= getValue(execute(n[1], x)); break; - + case GE: v = getValue(execute(n[0], x)) >= getValue(execute(n[1], x)); break; - + case GT: v = getValue(execute(n[0], x)) > getValue(execute(n[1], x)); break; - + case IN: v = getValue(execute(n[0], x)) in getValue(execute(n[1], x)); break; - + case INSTANCEOF: t = getValue(execute(n[0], x)); u = getValue(execute(n[1], x)); @@ -599,71 +617,71 @@ Narcissus.jsexec = (function() { else v = t instanceof u; break; - + case LSH: v = getValue(execute(n[0], x)) << getValue(execute(n[1], x)); break; - + case RSH: v = getValue(execute(n[0], x)) >> getValue(execute(n[1], x)); break; - + case URSH: v = getValue(execute(n[0], x)) >>> getValue(execute(n[1], x)); break; - + case PLUS: v = getValue(execute(n[0], x)) + getValue(execute(n[1], x)); break; - + case MINUS: v = getValue(execute(n[0], x)) - getValue(execute(n[1], x)); break; - + case MUL: v = getValue(execute(n[0], x)) * getValue(execute(n[1], x)); break; - + case DIV: v = getValue(execute(n[0], x)) / getValue(execute(n[1], x)); break; - + case MOD: v = getValue(execute(n[0], x)) % getValue(execute(n[1], x)); break; - + case DELETE: t = execute(n[0], x); v = !(t instanceof Reference) || delete t.base[t.propertyName]; break; - + case VOID: getValue(execute(n[0], x)); break; - + case TYPEOF: t = execute(n[0], x); if (t instanceof Reference) t = t.base ? t.base[t.propertyName] : undefined; v = typeof t; break; - + case NOT: v = !getValue(execute(n[0], x)); break; - + case BITWISE_NOT: v = ~getValue(execute(n[0], x)); break; - + case UNARY_PLUS: v = +getValue(execute(n[0], x)); break; - + case UNARY_MINUS: v = -getValue(execute(n[0], x)); break; - + case INCREMENT: case DECREMENT: t = execute(n[0], x); @@ -674,21 +692,21 @@ Narcissus.jsexec = (function() { if (!n.postfix) v = u; break; - + case DOT: r = execute(n[0], x); t = getValue(r); u = n[1].value; v = new Reference(toObject(t, r, n[0]), u, n); break; - + case INDEX: r = execute(n[0], x); t = getValue(r); u = getValue(execute(n[1], x)); v = new Reference(toObject(t, r, n[0]), String(u), n); break; - + case LIST: // Curse ECMA for specifying that arguments is not an Array object! v = {}; @@ -698,7 +716,7 @@ Narcissus.jsexec = (function() { } jsdefs.defineProperty(v, "length", i, false, false, true); break; - + case CALL: r = execute(n[0], x); a = execute(n[1], x); @@ -712,7 +730,7 @@ Narcissus.jsexec = (function() { t = null; v = f.__call__(t, a, x); break; - + case NEW: case NEW_WITH_ARGS: r = execute(n[0], x); @@ -729,7 +747,7 @@ Narcissus.jsexec = (function() { } v = f.__construct__(a, x); break; - + case ARRAY_INIT: v = []; for (i = 0, j = n.length; i < j; i++) { @@ -738,7 +756,7 @@ Narcissus.jsexec = (function() { } v.length = j; break; - + case OBJECT_INIT: v = {}; for (i = 0, j = n.length; i < j; i++) { @@ -753,23 +771,23 @@ Narcissus.jsexec = (function() { } } break; - + case NULL: v = null; break; - + case THIS: v = x.thisObject; break; - + case TRUE: v = true; break; - + case FALSE: v = false; break; - + case IDENTIFIER: for (s = x.scope; s; s = s.parent) { if (n.value in s.object) @@ -777,37 +795,37 @@ Narcissus.jsexec = (function() { } v = new Reference(s && s.object, n.value, n); break; - + case NUMBER: case STRING: case REGEXP: v = n.value; break; - + case GROUP: v = execute(n[0], x); break; - + default: throw "PANIC: unknown operation " + n.type + ": " + uneval(n); } - + return v; } - + function Activation(f, a) { for (var i = 0, j = f.params.length; i < j; i++) jsdefs.defineProperty(this, f.params[i], a[i], true); jsdefs.defineProperty(this, "arguments", a, true); } - + // Null Activation.prototype's proto slot so that Object.prototype.* does not // pollute the scope of heavyweight functions. Also delete its 'constructor' // property so that it doesn't pollute function scopes. - + Activation.prototype.__proto__ = null; delete Activation.prototype.constructor; - + function FunctionObject(node, scope) { this.node = node; this.scope = scope; @@ -816,65 +834,80 @@ Narcissus.jsexec = (function() { jsdefs.defineProperty(this, "prototype", proto, true); jsdefs.defineProperty(proto, "constructor", this, false, false, true); } - + + function getPropertyDescriptor(obj, name) { + while (obj) { + if (({}).hasOwnProperty.call(obj, name)) + return Object.getOwnPropertyDescriptor(obj, name); + obj = Object.getPrototypeOf(obj); + } + } + + function getOwnProperties(obj) { + var map = {}; + for (var name in Object.getOwnPropertyNames(obj)) + map[name] = Object.getOwnPropertyDescriptor(obj, name); + return map; + } + // Returns a new function wrapped with a Proxy. - function newFunction(n,x) { - var f = new FunctionObject(n, x.scope); - var p = Proxy.createFunction( - - // Handler function copied from - // http://wiki.ecmascript.org/doku.php?id=harmony:proxies&s=proxy%20object#examplea_no-op_forwarding_proxy - function(obj) { return { - getOwnPropertyDescriptor: function(name) { - var desc = Object.getOwnPropertyDescriptor(obj); - - // a trapping proxy's properties must always be configurable - desc.configurable = true; - return desc; - }, - getPropertyDescriptor: function(name) { - var desc = Object.getPropertyDescriptor(obj); //assumed - - // a trapping proxy's properties must always be configurable - desc.configurable = true; - return desc; - }, - getOwnPropertyNames: function() { - return Object.getOwnPropertyNames(obj); - }, - defineProperty: function(name, desc) { - Object.defineProperty(obj, name, desc); - }, - delete: function(name) { return delete obj[name]; }, - fix: function() { - if (Object.isFrozen(obj)) { - return Object.getOwnProperties(obj); // assumed - } - - // As long as obj is not frozen, the proxy won't allow itself to be fixed. - return undefined; // will cause a TypeError to be thrown - }, - - has: function(name) { return name in obj; }, - hasOwn: function(name) { return ({}).hasOwnProperty.call(obj, name); }, - get: function(receiver, name) { return obj[name]; }, - - // bad behavior when set fails in non-strict mode - set: function(receiver, name, val) { obj[name] = val; return true; }, - enumerate: function() { - var result = []; - for (name in obj) { result.push(name); }; - return result; - }, - enumerateOwn: function() { return Object.keys(obj); } }; - }(f), - function() { return f.__call__(this, arguments, x); }, - function() { return f.__construct__(arguments, x); }); + function newFunction(n, x) { + var fobj = new FunctionObject(n, x.scope); + + // Handler copied from + // http://wiki.ecmascript.org/doku.php?id=harmony:proxies&s=proxy%20object#examplea_no-op_forwarding_proxy + var handler = { + getOwnPropertyDescriptor: function(name) { + var desc = Object.getOwnPropertyDescriptor(fobj, name); + + // a trapping proxy's properties must always be configurable + desc.configurable = true; + return desc; + }, + getPropertyDescriptor: function(name) { + var desc = getPropertyDescriptor(fobj, name); + + // a trapping proxy's properties must always be configurable + desc.configurable = true; + return desc; + }, + getOwnPropertyNames: function() { + return Object.getOwnPropertyNames(fobj); + }, + defineProperty: function(name, desc) { + Object.defineProperty(fobj, name, desc); + }, + delete: function(name) { return delete fobj[name]; }, + fix: function() { + if (Object.isFrozen(fobj)) { + return getOwnProperties(fobj); + } + + // As long as fobj is not frozen, the proxy won't allow itself to be fixed. + return undefined; // will cause a TypeError to be thrown + }, + + has: function(name) { return name in fobj; }, + hasOwn: function(name) { return ({}).hasOwnProperty.call(fobj, name); }, + get: function(receiver, name) { return fobj[name]; }, + + // bad behavior when set fails in non-strict mode + set: function(receiver, name, val) { fobj[name] = val; return true; }, + enumerate: function() { + var result = []; + for (name in fobj) { result.push(name); }; + return result; + }, + keys: function() { return Object.keys(fobj); } + }; + var p = Proxy.createFunction(handler, + function() { return fobj.__call__(this, arguments, x); }, + function() { return fobj.__construct__(arguments, x); }); return p; } - + var FOp = FunctionObject.prototype = { - + // Internal methods. __call__: function (t, a, x) { var x2 = new ExecutionContext(FUNCTION_CODE); @@ -884,7 +917,7 @@ Narcissus.jsexec = (function() { jsdefs.defineProperty(a, "callee", this, false, false, true); var f = this.node; x2.scope = {object: new Activation(f, a), parent: this.scope}; - + ExecutionContext.current = x2; try { execute(f.body, x2); @@ -898,20 +931,20 @@ Narcissus.jsexec = (function() { } return undefined; }, - + __construct__: function (a, x) { var o = new Object; var p = this.prototype; if (isObject(p)) o.__proto__ = p; // else o.__proto__ defaulted to Object.prototype - + var v = this.__call__(o, a, x); if (isObject(v)) return v; return o; }, - + __hasInstance__: function (v) { if (isPrimitive(v)) return false; @@ -928,24 +961,24 @@ Narcissus.jsexec = (function() { } return false; }, - + // Standard methods. toString: function () { return this.node.getSource(); }, - + apply: function (t, a) { // Curse ECMA again! if (typeof this.__call__ != "function") { throw new TypeError("Function.prototype.apply called on" + " uncallable object"); } - + if (t === undefined || t === null) t = global; else if (typeof t != "object") t = toObject(t, t); - + if (a === undefined || a === null) { a = {}; jsdefs.defineProperty(a, "length", 0, false, false, true); @@ -961,24 +994,24 @@ Narcissus.jsexec = (function() { " must be an array or arguments object", this.node.filename, this.node.lineno); } - + return this.__call__(t, a, ExecutionContext.current); }, - + call: function (t) { // Curse ECMA a third time! var a = Array.prototype.splice.call(arguments, 1); return this.apply(t, a); } }; - + // Connect Function.prototype and Function.prototype.constructor in global. reflectClass('Function', FOp); - + // Help native and host-scripted functions be like FunctionObjects. var Fp = Function.prototype; var REp = RegExp.prototype; - + if (!('__call__' in Fp)) { jsdefs.defineProperty(Fp, "__call__", function (t, a, x) { @@ -1011,7 +1044,7 @@ Narcissus.jsexec = (function() { return eval('new this(' + argStr.slice(0,-1) + ');'); } }, true, true, true); - + // Since we use native functions such as Date along with host ones such // as global.eval, we want both to be considered instances of the native // Function constructor. @@ -1020,15 +1053,15 @@ Narcissus.jsexec = (function() { return v instanceof Function || v instanceof global.Function; }, true, true, true); } - + function thunk(f, x) { return function () { return f.__call__(this, arguments, x); }; } - + function evaluate(s, f, l) { if (typeof s != "string") return s; - + var x = ExecutionContext.current; var x2 = new ExecutionContext(GLOBAL_CODE); ExecutionContext.current = x2; @@ -1045,9 +1078,67 @@ Narcissus.jsexec = (function() { } return x2.result; } - + + // A read-eval-print-loop that roughly tracks the behavior of the js shell. + function repl() { + + // Display a value similarly to the js shell. + function display(x) { + if (typeof x == "object") { + // At the js shell, objects with no |toSource| don't print. + if (x != null && "toSource" in x) { + try { + print(x.toSource()); + } catch (e) { + } + } else { + print("null"); + } + } else if (typeof x == "string") { + print(uneval(x)); + } else if (typeof x != "undefined") { + // Since x must be primitive, String can't throw. + print(String(x)); + } + } + + // String conversion that never throws. + function string(x) { + try { + return String(x); + } catch (e) { + return "unknown (can't convert to string)"; + } + } + + var b = new jsparse.VanillaBuilder; + var x = new ExecutionContext(GLOBAL_CODE); + + x.run(function() { + for (;;) { + putstr("njs> "); + var line = readline(); + x.result = undefined; + try { + execute(jsparse.parse(b, line, "stdin", 1), x); + display(x.result); + } catch (e if e == THROW) { + print("uncaught exception: " + string(x.result)); + } catch (e if e == END) { + break; + } catch (e if e instanceof SyntaxError) { + print(e.toString()); + } catch (e) { + print("internal Narcissus error"); + throw e; + } + } + }); + } + return { - "evaluate": evaluate + "evaluate": evaluate, + "repl": repl }; }()); diff --git a/js/narcissus/jslex.js b/js/narcissus/jslex.js index 4f841817d9c4..8e262acf86e8 100644 --- a/js/narcissus/jslex.js +++ b/js/narcissus/jslex.js @@ -44,16 +44,16 @@ Narcissus.jslex = (function() { var jsdefs = Narcissus.jsdefs; - + // Set constants in the local scope. eval(jsdefs.consts); - + // Build up a trie of operator tokens. var opTokens = {}; for (var op in jsdefs.opTypeNames) { if (op === '\n' || op === '.') continue; - + var node = opTokens; for (var i = 0; i < op.length; i++) { var ch = op[i]; @@ -63,7 +63,7 @@ Narcissus.jslex = (function() { node.op = op; } } - + /* * Tokenizer :: (file ptr, path, line number) -> Tokenizer */ @@ -77,28 +77,28 @@ Narcissus.jslex = (function() { this.filename = f || ""; this.lineno = l || 1; } - + Tokenizer.prototype = { get done() { // We need to set scanOperand to true here because the first thing // might be a regexp. return this.peek(true) == END; }, - + get token() { return this.tokens[this.tokenIndex]; }, - + match: function (tt, scanOperand) { return this.get(scanOperand) == tt || this.unget(); }, - + mustMatch: function (tt) { if (!this.match(tt)) throw this.newSyntaxError("Missing " + tokens[tt].toLowerCase()); return this.token; }, - + peek: function (scanOperand) { var tt, next; if (this.lookahead) { @@ -112,14 +112,14 @@ Narcissus.jslex = (function() { } return tt; }, - + peekOnSameLine: function (scanOperand) { this.scanNewlines = true; var tt = this.peek(scanOperand); this.scanNewlines = false; return tt; }, - + // Eats comments and whitespace. skip: function () { var input = this.source; @@ -134,7 +134,7 @@ Narcissus.jslex = (function() { ch = input[this.cursor++]; if (ch === undefined) throw this.newSyntaxError("Unterminated comment"); - + if (ch === '*') { next = input[this.cursor]; if (next === '/') { @@ -151,7 +151,7 @@ Narcissus.jslex = (function() { ch = input[this.cursor++]; if (ch === undefined) return; - + if (ch === '\n') { this.lineno++; break; @@ -163,7 +163,7 @@ Narcissus.jslex = (function() { } } }, - + // Lexes the exponential part of a number, if present. Returns true iff an // exponential part was found. lexExponent: function() { @@ -174,32 +174,32 @@ Narcissus.jslex = (function() { ch = input[this.cursor++]; if (ch === '+' || ch === '-') ch = input[this.cursor++]; - + if (ch < '0' || ch > '9') throw this.newSyntaxError("Missing exponent"); - + do { ch = input[this.cursor++]; } while (ch >= '0' && ch <= '9'); this.cursor--; - + return true; } - + return false; }, - + lexZeroNumber: function (ch) { var token = this.token, input = this.source; token.type = NUMBER; - + ch = input[this.cursor++]; if (ch === '.') { do { ch = input[this.cursor++]; } while (ch >= '0' && ch <= '9'); this.cursor--; - + this.lexExponent(); token.value = parseFloat(token.start, this.cursor); } else if (ch === 'x' || ch === 'X') { @@ -208,14 +208,14 @@ Narcissus.jslex = (function() { } while ((ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'f') || (ch >= 'A' && ch <= 'F')); this.cursor--; - + token.value = parseInt(input.substring(token.start, this.cursor)); } else if (ch >= '0' && ch <= '7') { do { ch = input[this.cursor++]; } while (ch >= '0' && ch <= '7'); this.cursor--; - + token.value = parseInt(input.substring(token.start, this.cursor)); } else { this.cursor--; @@ -223,11 +223,11 @@ Narcissus.jslex = (function() { token.value = 0; } }, - + lexNumber: function (ch) { var token = this.token, input = this.source; token.type = NUMBER; - + var floating = false; do { ch = input[this.cursor++]; @@ -236,16 +236,16 @@ Narcissus.jslex = (function() { ch = input[this.cursor++]; } } while (ch >= '0' && ch <= '9'); - + this.cursor--; - + var exponent = this.lexExponent(); floating = floating || exponent; - + var str = input.substring(token.start, this.cursor); token.value = floating ? parseFloat(str) : parseInt(str); }, - + lexDot: function (ch) { var token = this.token, input = this.source; var next = input[this.cursor]; @@ -254,9 +254,9 @@ Narcissus.jslex = (function() { ch = input[this.cursor++]; } while (ch >= '0' && ch <= '9'); this.cursor--; - + this.lexExponent(); - + token.type = NUMBER; token.value = parseFloat(token.start, this.cursor); } else { @@ -265,11 +265,11 @@ Narcissus.jslex = (function() { token.value = '.'; } }, - + lexString: function (ch) { var token = this.token, input = this.source; token.type = STRING; - + var hasEscapes = false; var delim = ch; ch = input[this.cursor++]; @@ -280,16 +280,16 @@ Narcissus.jslex = (function() { } ch = input[this.cursor++]; } - + token.value = (hasEscapes) ? eval(input.substring(token.start, this.cursor)) : input.substring(token.start + 1, this.cursor - 1); }, - + lexRegExp: function (ch) { var token = this.token, input = this.source; token.type = REGEXP; - + do { ch = input[this.cursor++]; if (ch === '\\') { @@ -298,29 +298,29 @@ Narcissus.jslex = (function() { do { if (ch === undefined) throw this.newSyntaxError("Unterminated character class"); - + if (ch === '\\') this.cursor++; - + ch = input[this.cursor++]; } while (ch !== ']'); } else if (ch === undefined) { throw this.newSyntaxError("Unterminated regex"); } } while (ch !== '/'); - + do { ch = input[this.cursor++]; } while (ch >= 'a' && ch <= 'z'); - + this.cursor--; - + token.value = eval(input.substring(token.start, this.cursor)); }, - + lexOp: function (ch) { var token = this.token, input = this.source; - + // A bit ugly, but it seems wasteful to write a trie lookup routine for // only 3 characters... var node = opTokens[ch]; @@ -335,7 +335,7 @@ Narcissus.jslex = (function() { next = input[this.cursor]; } } - + var op = node.op; if (jsdefs.assignOps[op] && input[this.cursor] === '=') { this.cursor++; @@ -346,27 +346,27 @@ Narcissus.jslex = (function() { token.type = jsdefs.tokenIds[jsdefs.opTypeNames[op]]; token.assignOp = null; } - + token.value = op; }, - + // FIXME: Unicode escape sequences // FIXME: Unicode identifiers lexIdent: function (ch) { var token = this.token, input = this.source; - + do { ch = input[this.cursor++]; } while ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || (ch >= '0' && ch <= '9') || ch === '$' || ch === '_'); - + this.cursor--; // Put the non-word character back. - + var id = input.substring(token.start, this.cursor); token.type = jsdefs.keywords[id] || IDENTIFIER; token.value = id; }, - + /* * Tokenizer.get :: void -> token type * @@ -382,21 +382,21 @@ Narcissus.jslex = (function() { if (token.type != NEWLINE || this.scanNewlines) return token.type; } - + this.skip(); - + this.tokenIndex = (this.tokenIndex + 1) & 3; token = this.tokens[this.tokenIndex]; if (!token) this.tokens[this.tokenIndex] = token = {}; - + var input = this.source; if (this.cursor === input.length) return token.type = END; - + token.start = this.cursor; token.lineno = this.lineno; - + var ch = input[this.cursor++]; if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || ch === '$' || ch === '_') { @@ -420,11 +420,11 @@ Narcissus.jslex = (function() { } else { throw this.newSyntaxError("Illegal token"); } - + token.end = this.cursor; return token.type; }, - + /* * Tokenizer.unget :: void -> undefined * @@ -434,14 +434,14 @@ Narcissus.jslex = (function() { if (++this.lookahead == 4) throw "PANIC: too much lookahead!"; this.tokenIndex = (this.tokenIndex - 1) & 3; }, - + newSyntaxError: function (m) { var e = new SyntaxError(m, this.filename, this.lineno); e.source = this.source; e.cursor = this.cursor; return e; }, - + save: function () { return { cursor: this.cursor, @@ -452,7 +452,7 @@ Narcissus.jslex = (function() { lineno: this.lineno }; }, - + rewind: function(point) { this.cursor = point.cursor; this.tokenIndex = point.tokenIndex; @@ -462,7 +462,7 @@ Narcissus.jslex = (function() { this.lineno = point.lineno; } }; - + return { "Tokenizer": Tokenizer }; }()); diff --git a/js/narcissus/jsparse.js b/js/narcissus/jsparse.js index ae6f6568e02f..1947c2fc0ef8 100644 --- a/js/narcissus/jsparse.js +++ b/js/narcissus/jsparse.js @@ -43,344 +43,344 @@ * Parser. */ -/* - * The vanilla AST builder. - */ - Narcissus.jsparse = (function() { var jslex = Narcissus.jslex; var jsdefs = Narcissus.jsdefs; - + // Set constants in the local scope. eval(jsdefs.consts); - + + /* + * The vanilla AST builder. + */ + VanillaBuilder = function VanillaBuilder() { } - + VanillaBuilder.prototype = { IF$build: function(t) { return new Node(t, IF); }, - + IF$setCondition: function(n, e) { n.condition = e; }, - + IF$setThenPart: function(n, s) { n.thenPart = s; }, - + IF$setElsePart: function(n, s) { n.elsePart = s; }, - + IF$finish: function(n) { }, - + SWITCH$build: function(t) { var n = new Node(t, SWITCH); n.cases = []; n.defaultIndex = -1; return n; }, - + SWITCH$setDiscriminant: function(n, e) { n.discriminant = e; }, - + SWITCH$setDefaultIndex: function(n, i) { n.defaultIndex = i; }, - + SWITCH$addCase: function(n, n2) { n.cases.push(n2); }, - + SWITCH$finish: function(n) { }, - + CASE$build: function(t) { return new Node(t, CASE); }, - + CASE$setLabel: function(n, e) { n.caseLabel = e; }, - + CASE$initializeStatements: function(n, t) { n.statements = new Node(t, BLOCK); }, - + CASE$addStatement: function(n, s) { n.statements.push(s); }, - + CASE$finish: function(n) { }, - + DEFAULT$build: function(t, p) { return new Node(t, DEFAULT); }, - + DEFAULT$initializeStatements: function(n, t) { n.statements = new Node(t, BLOCK); }, - + DEFAULT$addStatement: function(n, s) { n.statements.push(s); }, - + DEFAULT$finish: function(n) { }, - + FOR$build: function(t) { var n = new Node(t, FOR); n.isLoop = true; n.isEach = false; return n; }, - + FOR$rebuildForEach: function(n) { n.isEach = true; }, - + // NB. This function is called after rebuildForEach, if that's called // at all. FOR$rebuildForIn: function(n) { n.type = FOR_IN; }, - + FOR$setCondition: function(n, e) { n.condition = e; }, - + FOR$setSetup: function(n, e) { n.setup = e || null; }, - + FOR$setUpdate: function(n, e) { n.update = e; }, - + FOR$setObject: function(n, e) { n.object = e; }, - + FOR$setIterator: function(n, e, e2) { n.iterator = e; n.varDecl = e2; }, - + FOR$setBody: function(n, s) { n.body = s; }, - + FOR$finish: function(n) { }, - + WHILE$build: function(t) { var n = new Node(t, WHILE); n.isLoop = true; return n; }, - + WHILE$setCondition: function(n, e) { n.condition = e; }, - + WHILE$setBody: function(n, s) { n.body = s; }, - + WHILE$finish: function(n) { }, - + DO$build: function(t) { var n = new Node(t, DO); n.isLoop = true; return n; }, - + DO$setCondition: function(n, e) { n.condition = e; }, - + DO$setBody: function(n, s) { n.body = s; }, - + DO$finish: function(n) { }, - + BREAK$build: function(t) { return new Node(t, BREAK); }, - + BREAK$setLabel: function(n, v) { n.label = v; }, - + BREAK$setTarget: function(n, n2) { n.target = n2; }, - + BREAK$finish: function(n) { }, - + CONTINUE$build: function(t) { return new Node(t, CONTINUE); }, - + CONTINUE$setLabel: function(n, v) { n.label = v; }, - + CONTINUE$setTarget: function(n, n2) { n.target = n2; }, - + CONTINUE$finish: function(n) { }, - + TRY$build: function(t) { var n = new Node(t, TRY); n.catchClauses = []; return n; }, - + TRY$setTryBlock: function(n, s) { n.tryBlock = s; }, - + TRY$addCatch: function(n, n2) { n.catchClauses.push(n2); }, - + TRY$finishCatches: function(n) { }, - + TRY$setFinallyBlock: function(n, s) { n.finallyBlock = s; }, - + TRY$finish: function(n) { }, - + CATCH$build: function(t) { var n = new Node(t, CATCH); n.guard = null; return n; }, - + CATCH$setVarName: function(n, v) { n.varName = v; }, - + CATCH$setGuard: function(n, e) { n.guard = e; }, - + CATCH$setBlock: function(n, s) { n.block = s; }, - + CATCH$finish: function(n) { }, - + THROW$build: function(t) { return new Node(t, THROW); }, - + THROW$setException: function(n, e) { n.exception = e; }, - + THROW$finish: function(n) { }, - + RETURN$build: function(t) { return new Node(t, RETURN); }, - + RETURN$setValue: function(n, e) { n.value = e; }, - + RETURN$finish: function(n) { }, - + YIELD$build: function(t) { return new Node(t, YIELD); }, - + YIELD$setValue: function(n, e) { n.value = e; }, - + YIELD$finish: function(n) { }, - + GENERATOR$build: function(t) { return new Node(t, GENERATOR); }, - + GENERATOR$setExpression: function(n, e) { n.expression = e; }, - + GENERATOR$setTail: function(n, n2) { n.tail = n2; }, - + GENERATOR$finish: function(n) { }, - + WITH$build: function(t) { return new Node(t, WITH); }, - + WITH$setObject: function(n, e) { n.object = e; }, - + WITH$setBody: function(n, s) { n.body = s; }, - + WITH$finish: function(n) { }, - + DEBUGGER$build: function(t) { return new Node(t, DEBUGGER); }, - + SEMICOLON$build: function(t) { return new Node(t, SEMICOLON); }, - + SEMICOLON$setExpression: function(n, e) { n.expression = e; }, - + SEMICOLON$finish: function(n) { }, - + LABEL$build: function(t) { return new Node(t, LABEL); }, - + LABEL$setLabel: function(n, e) { n.label = e; }, - + LABEL$setStatement: function(n, s) { n.statement = s; }, - + LABEL$finish: function(n) { }, - + FUNCTION$build: function(t) { var n = new Node(t); if (n.type != FUNCTION) @@ -388,275 +388,275 @@ Narcissus.jsparse = (function() { n.params = []; return n; }, - + FUNCTION$setName: function(n, v) { n.name = v; }, - + FUNCTION$addParam: function(n, v) { n.params.push(v); }, - + FUNCTION$setBody: function(n, s) { n.body = s; }, - + FUNCTION$hoistVars: function(x) { }, - + FUNCTION$finish: function(n, x) { }, - + VAR$build: function(t) { return new Node(t, VAR); }, - + VAR$addDecl: function(n, n2, x) { n.push(n2); }, - + VAR$finish: function(n) { }, - + CONST$build: function(t) { return new Node(t, VAR); }, - + CONST$addDecl: function(n, n2, x) { n.push(n2); }, - + CONST$finish: function(n) { }, - + LET$build: function(t) { return new Node(t, LET); }, - + LET$addDecl: function(n, n2, x) { n.push(n2); }, - + LET$finish: function(n) { }, - + DECL$build: function(t) { return new Node(t, IDENTIFIER); }, - + DECL$setName: function(n, v) { n.name = v; }, - + DECL$setInitializer: function(n, e) { n.initializer = e; }, - + DECL$setReadOnly: function(n, b) { n.readOnly = b; }, - + DECL$finish: function(n) { }, - + LET_BLOCK$build: function(t) { var n = Node(t, LET_BLOCK); n.varDecls = []; return n; }, - + LET_BLOCK$setVariables: function(n, n2) { n.variables = n2; }, - + LET_BLOCK$setExpression: function(n, e) { n.expression = e; }, - + LET_BLOCK$setBlock: function(n, s) { n.block = s; }, - + LET_BLOCK$finish: function(n) { }, - + BLOCK$build: function(t, id) { var n = new Node(t, BLOCK); n.varDecls = []; n.id = id; return n; }, - + BLOCK$hoistLets: function(n) { }, - + BLOCK$addStatement: function(n, n2) { n.push(n2); }, - + BLOCK$finish: function(n) { }, - + EXPRESSION$build: function(t, tt) { return new Node(t, tt); }, - + EXPRESSION$addOperand: function(n, n2) { n.push(n2); }, - + EXPRESSION$finish: function(n) { }, - + ASSIGN$build: function(t) { return new Node(t, ASSIGN); }, - + ASSIGN$addOperand: function(n, n2) { n.push(n2); }, - + ASSIGN$setAssignOp: function(n, o) { n.assignOp = o; }, - + ASSIGN$finish: function(n) { }, - + HOOK$build: function(t) { return new Node(t, HOOK); }, - + HOOK$setCondition: function(n, e) { n[0] = e; }, - + HOOK$setThenPart: function(n, n2) { n[1] = n2; }, - + HOOK$setElsePart: function(n, n2) { n[2] = n2; }, - + HOOK$finish: function(n) { }, - + OR$build: function(t) { return new Node(t, OR); }, - + OR$addOperand: function(n, n2) { n.push(n2); }, - + OR$finish: function(n) { }, - + AND$build: function(t) { return new Node(t, AND); }, - + AND$addOperand: function(n, n2) { n.push(n2); }, - + AND$finish: function(n) { }, - + BITWISE_OR$build: function(t) { return new Node(t, BITWISE_OR); }, - + BITWISE_OR$addOperand: function(n, n2) { n.push(n2); }, - + BITWISE_OR$finish: function(n) { }, - + BITWISE_XOR$build: function(t) { return new Node(t, BITWISE_XOR); }, - + BITWISE_XOR$addOperand: function(n, n2) { n.push(n2); }, - + BITWISE_XOR$finish: function(n) { }, - + BITWISE_AND$build: function(t) { return new Node(t, BITWISE_AND); }, - + BITWISE_AND$addOperand: function(n, n2) { n.push(n2); }, - + BITWISE_AND$finish: function(n) { }, - + EQUALITY$build: function(t) { // NB t.token.type must be EQ, NE, STRICT_EQ, or STRICT_NE. return new Node(t); }, - + EQUALITY$addOperand: function(n, n2) { n.push(n2); }, - + EQUALITY$finish: function(n) { }, - + RELATIONAL$build: function(t) { // NB t.token.type must be LT, LE, GE, or GT. return new Node(t); }, - + RELATIONAL$addOperand: function(n, n2) { n.push(n2); }, - + RELATIONAL$finish: function(n) { }, - + SHIFT$build: function(t) { // NB t.token.type must be LSH, RSH, or URSH. return new Node(t); }, - + SHIFT$addOperand: function(n, n2) { n.push(n2); }, - + SHIFT$finish: function(n) { }, - + ADD$build: function(t) { // NB t.token.type must be PLUS or MINUS. return new Node(t); }, - + ADD$addOperand: function(n, n2) { n.push(n2); }, - + ADD$finish: function(n) { }, - + MULTIPLY$build: function(t) { // NB t.token.type must be MUL, DIV, or MOD. return new Node(t); }, - + MULTIPLY$addOperand: function(n, n2) { n.push(n2); }, - + MULTIPLY$finish: function(n) { }, - + UNARY$build: function(t) { // NB t.token.type must be DELETE, VOID, TYPEOF, NOT, BITWISE_NOT, // UNARY_PLUS, UNARY_MINUS, INCREMENT, or DECREMENT. @@ -666,135 +666,133 @@ Narcissus.jsparse = (function() { t.token.type = UNARY_MINUS; return new Node(t); }, - + UNARY$addOperand: function(n, n2) { n.push(n2); }, - + UNARY$setPostfix: function(n) { n.postfix = true; }, - + UNARY$finish: function(n) { }, - + MEMBER$build: function(t, tt) { // NB t.token.type must be NEW, DOT, or INDEX. return new Node(t, tt); }, - + MEMBER$rebuildNewWithArgs: function(n) { n.type = NEW_WITH_ARGS; }, - + MEMBER$addOperand: function(n, n2) { n.push(n2); }, - + MEMBER$finish: function(n) { }, - + PRIMARY$build: function(t, tt) { // NB t.token.type must be NULL, THIS, TRUIE, FALSE, IDENTIFIER, // NUMBER, STRING, or REGEXP. return new Node(t, tt); }, - + PRIMARY$finish: function(n) { }, - + ARRAY_INIT$build: function(t) { return new Node(t, ARRAY_INIT); }, - + ARRAY_INIT$addElement: function(n, n2) { n.push(n2); }, - + ARRAY_INIT$finish: function(n) { }, - - ARRAY_COMP: { - build: function(t) { - return new Node(t, ARRAY_COMP); - }, - - setExpression: function(n, e) { - n.expression = e - }, - - setTail: function(n, n2) { - n.tail = n2; - }, - - finish: function(n) { - } + + ARRAY_COMP$build: function(t) { + return new Node(t, ARRAY_COMP); }, - + + ARRAY_COMP$setExpression: function(n, e) { + n.expression = e + }, + + ARRAY_COMP$setTail: function(n, n2) { + n.tail = n2; + }, + + ARRAY_COMP$finish: function(n) { + }, + COMP_TAIL$build: function(t) { return new Node(t, COMP_TAIL); }, - + COMP_TAIL$setGuard: function(n, e) { n.guard = e; }, - + COMP_TAIL$addFor: function(n, n2) { n.push(n2); }, - + COMP_TAIL$finish: function(n) { }, - + OBJECT_INIT$build: function(t) { return new Node(t, OBJECT_INIT); }, - + OBJECT_INIT$addProperty: function(n, n2) { n.push(n2); }, - + OBJECT_INIT$finish: function(n) { }, - + PROPERTY_INIT$build: function(t) { return new Node(t, PROPERTY_INIT); }, - + PROPERTY_INIT$addOperand: function(n, n2) { n.push(n2); }, - + PROPERTY_INIT$finish: function(n) { }, - + COMMA$build: function(t) { return new Node(t, COMMA); }, - + COMMA$addOperand: function(n, n2) { n.push(n2); }, - + COMMA$finish: function(n) { }, - + LIST$build: function(t) { return new Node(t, LIST); }, - + LIST$addOperand: function(n, n2) { n.push(n2); }, - + LIST$finish: function(n) { }, - + setHoists: function(id, vds) { } }; - - function CompilerContext(inFunction, builder) { + + function StaticContext(inFunction, builder) { this.inFunction = inFunction; this.hasEmptyReturn = false; this.hasReturnWithValue = false; @@ -805,8 +803,8 @@ Narcissus.jsparse = (function() { this.funDecls = []; this.varDecls = []; } - - CompilerContext.prototype = { + + StaticContext.prototype = { bracketLevel: 0, curlyLevel: 0, parenLevel: 0, @@ -814,7 +812,7 @@ Narcissus.jsparse = (function() { ecma3OnlyMode: false, inForLoopInit: false, }; - + /* * Script :: (tokenizer, compiler context) -> node * @@ -827,13 +825,13 @@ Narcissus.jsparse = (function() { n.varDecls = x.varDecls; return n; } - + // Node extends Array, which we extend slightly with a top-of-stack method. jsdefs.defineProperty(Array.prototype, "top", function() { return this.length && this[this.length-1]; }, false, false, true); - + /* * Node :: (tokenizer, optional type) -> node */ @@ -852,15 +850,15 @@ Narcissus.jsparse = (function() { } // Nodes use a tokenizer for debugging (getSource, filename getter). this.tokenizer = t; - + for (var i = 2; i < arguments.length; i++) this.push(arguments[i]); } - + var Np = Node.prototype = new Array; Np.constructor = Node; Np.toSource = Object.prototype.toSource; - + // Always use push to add operands to an expression, to update start and end. Np.push = function (kid) { // kid can be null e.g. [1, , 2]. @@ -872,14 +870,14 @@ Narcissus.jsparse = (function() { } return Array.prototype.push.call(this, kid); } - + Node.indentLevel = 0; - + function tokenstr(tt) { var t = jsdefs.tokens[tt]; return /^\W/.test(t) ? jsdefs.opTypeNames[t] : t.toUpperCase(); } - + Np.toString = function () { var a = []; for (var i in this) { @@ -896,16 +894,16 @@ Narcissus.jsparse = (function() { s += "\n" + INDENTATION.repeat(n) + "}"; return s; } - + Np.getSource = function () { return this.tokenizer.source.slice(this.start, this.end); }; - + jsdefs.defineGetter(Np, "filename", function() { return this.tokenizer.filename; }); - + jsdefs.defineProperty(String.prototype, "repeat", function(n) { var s = "", t = this + s; @@ -913,7 +911,7 @@ Narcissus.jsparse = (function() { s += t; return s; }, false, false, true); - + // Statement stack and nested statement handler. function nest(t, x, node, func, end) { x.stmtStack.push(node); @@ -922,7 +920,7 @@ Narcissus.jsparse = (function() { end && t.mustMatch(end); return n; } - + /* * Statements :: (tokenizer, compiler context) -> node * @@ -944,16 +942,16 @@ Narcissus.jsparse = (function() { } return n; } - + function Block(t, x) { t.mustMatch(LEFT_CURLY); var n = Statements(t, x); t.mustMatch(RIGHT_CURLY); return n; } - + const DECLARED_FORM = 0, EXPRESSED_FORM = 1, STATEMENT_FORM = 2; - + /* * Statement :: (tokenizer, compiler context) -> node * @@ -962,7 +960,7 @@ Narcissus.jsparse = (function() { function Statement(t, x) { var i, label, n, n2, ss, tt = t.get(true); var b = x.builder; - + // Cases for statements ending in a right curly return early, avoiding the // common semicolon insertion magic after this switch. switch (tt) { @@ -972,12 +970,12 @@ Narcissus.jsparse = (function() { (x.stmtStack.length > 1) ? STATEMENT_FORM : DECLARED_FORM); - + case LEFT_CURLY: n = Statements(t, x); t.mustMatch(RIGHT_CURLY); return n; - + case IF: n = b.IF$build(t); b.IF$setCondition(n, ParenExpression(t, x)); @@ -988,7 +986,7 @@ Narcissus.jsparse = (function() { x.stmtStack.pop(); b.IF$finish(n); return n; - + case SWITCH: // This allows CASEs after a DEFAULT, which is in the standard. n = b.SWITCH$build(t); @@ -1009,7 +1007,7 @@ Narcissus.jsparse = (function() { b.DEFAULT$addStatement(n2, Statement(t, x)); b.DEFAULT$finish(n2); break; - + case CASE: n2 = b.CASE$build(t); b.CASE$setLabel(n2, Expression(t, x, COLON)); @@ -1020,7 +1018,7 @@ Narcissus.jsparse = (function() { b.CASE$addStatement(n2, Statement(t, x)); b.CASE$finish(n2); break; - + default: throw t.newSyntaxError("Invalid switch case"); } @@ -1029,7 +1027,7 @@ Narcissus.jsparse = (function() { x.stmtStack.pop(); b.SWITCH$finish(n); return n; - + case FOR: n = b.FOR$build(t); if (t.match(IDENTIFIER) && t.token.value == "each") @@ -1091,14 +1089,14 @@ Narcissus.jsparse = (function() { } b.FOR$finish(n); return n; - + case WHILE: n = b.WHILE$build(t); b.WHILE$setCondition(n, ParenExpression(t, x)); b.WHILE$setBody(n, nest(t, x, n, Statement)); b.WHILE$finish(n); return n; - + case DO: n = b.DO$build(t); b.DO$setBody(n, nest(t, x, n, Statement, WHILE)); @@ -1112,11 +1110,11 @@ Narcissus.jsparse = (function() { return n; } break; - + case BREAK: case CONTINUE: n = tt == BREAK ? b.BREAK$build(t) : b.CONTINUE$build(t); - + if (t.peekOnSameLine() == IDENTIFIER) { t.get(); if (tt == BREAK) @@ -1124,17 +1122,17 @@ Narcissus.jsparse = (function() { else b.CONTINUE$setLabel(n, t.token.value); } - + ss = x.stmtStack; i = ss.length; label = n.label; - + if (label) { do { if (--i < 0) throw t.newSyntaxError("Label not found"); } while (ss[i].label != label); - + /* * Both break and continue to label need to be handled specially * within a labeled loop, so that they target that loop. If not in @@ -1165,7 +1163,7 @@ Narcissus.jsparse = (function() { b.CONTINUE$finish(n); } break; - + case TRY: n = b.TRY$build(t); b.TRY$setTryBlock(n, Block(t, x)); @@ -1206,51 +1204,51 @@ Narcissus.jsparse = (function() { throw t.newSyntaxError("Invalid try statement"); b.TRY$finish(n); return n; - + case CATCH: case FINALLY: throw t.newSyntaxError(jsdefs.tokens[tt] + " without preceding try"); - + case THROW: n = b.THROW$build(t); b.THROW$setException(n, Expression(t, x)); b.THROW$finish(n); break; - + case RETURN: n = returnOrYield(t, x); break; - + case WITH: n = b.WITH$build(t); b.WITH$setObject(n, ParenExpression(t, x)); b.WITH$setBody(n, nest(t, x, n, Statement)); b.WITH$finish(n); return n; - + case VAR: case CONST: n = Variables(t, x); break; - + case LET: if (t.peek() == LEFT_PAREN) n = LetBlock(t, x, true); else n = Variables(t, x); break; - + case DEBUGGER: n = b.DEBUGGER$build(t); break; - + case NEWLINE: case SEMICOLON: n = b.SEMICOLON$build(t); b.SEMICOLON$setExpression(n, null); b.SEMICOLON$finish(t); return n; - + default: if (tt == IDENTIFIER) { tt = t.peek(); @@ -1270,7 +1268,7 @@ Narcissus.jsparse = (function() { return n; } } - + // Expression statement. // We unget the current token to parse the expression as a whole. n = b.SEMICOLON$build(t); @@ -1280,11 +1278,11 @@ Narcissus.jsparse = (function() { b.SEMICOLON$finish(n); break; } - + MagicalSemicolon(t); return n; } - + function MagicalSemicolon(t) { var tt; if (t.lineno == t.token.lineno) { @@ -1294,10 +1292,10 @@ Narcissus.jsparse = (function() { } t.match(SEMICOLON); } - + function returnOrYield(t, x) { var n, b = x.builder, tt = t.token.type, tt2; - + if (tt == RETURN) { if (!x.inFunction) throw t.newSyntaxError("Return not in function"); @@ -1308,7 +1306,7 @@ Narcissus.jsparse = (function() { x.isGenerator = true; n = b.YIELD$build(t); } - + tt2 = t.peek(true); if (tt2 != END && tt2 != NEWLINE && tt2 != SEMICOLON && tt2 != RIGHT_CURLY && (tt != YIELD || @@ -1323,19 +1321,19 @@ Narcissus.jsparse = (function() { } else if (tt == RETURN) { x.hasEmptyReturn = true; } - + // Disallow return v; in generator. if (x.hasReturnWithValue && x.isGenerator) throw t.newSyntaxError("Generator returns a value"); - + if (tt == RETURN) b.RETURN$finish(n); else b.YIELD$finish(n); - + return n; } - + /* * FunctionDefinition :: (tokenizer, compiler context, boolean, * DECLARED_FORM or EXPRESSED_FORM or STATEMENT_FORM) @@ -1348,7 +1346,7 @@ Narcissus.jsparse = (function() { b.FUNCTION$setName(f, t.token.value); else if (requireName) throw t.newSyntaxError("missing function identifier"); - + t.mustMatch(LEFT_PAREN); if (!t.match(RIGHT_PAREN)) { do { @@ -1369,13 +1367,13 @@ Narcissus.jsparse = (function() { } while (t.match(COMMA)); t.mustMatch(RIGHT_PAREN); } - + // Do we have an expression closure or a normal body? var tt = t.get(); if (tt != LEFT_CURLY) t.unget(); - - var x2 = new CompilerContext(true, b); + + var x2 = new StaticContext(true, b); var rp = t.save(); if (x.inFunction) { /* @@ -1385,7 +1383,7 @@ Narcissus.jsparse = (function() { */ x2.blockId = x.blockId; } - + if (tt != LEFT_CURLY) { b.FUNCTION$setBody(f, AssignExpression(t, x)); if (x.isGenerator) @@ -1394,7 +1392,7 @@ Narcissus.jsparse = (function() { b.FUNCTION$hoistVars(x2.blockId); b.FUNCTION$setBody(f, Script(t, x2)); } - + /* * To linearize hoisting with nested blocks needing hoists, if a toplevel * function has any hoists we reparse the entire thing. Each toplevel @@ -1423,14 +1421,14 @@ Narcissus.jsparse = (function() { if (x2.needsHoisting) { // Order is important here! funDecls must come _after_ varDecls! b.setHoists(f.body.id, x2.varDecls.concat(x2.funDecls)); - + if (x.inFunction) { // Propagate up to the parent function if we're an inner function. x.needsHoisting = true; } else { // Only re-parse toplevel functions. var x3 = x2; - x2 = new CompilerContext(true, b); + x2 = new StaticContext(true, b); t.rewind(rp); // Set a flag in case the builder wants to have different behavior // on the second pass. @@ -1440,10 +1438,10 @@ Narcissus.jsparse = (function() { b.secondPass = false; } } - + if (tt == LEFT_CURLY) t.mustMatch(RIGHT_CURLY); - + f.end = t.token.end; f.functionForm = functionForm; if (functionForm == DECLARED_FORM) @@ -1451,7 +1449,7 @@ Narcissus.jsparse = (function() { b.FUNCTION$finish(f, x); return f; } - + /* * Variables :: (tokenizer, compiler context) -> node * @@ -1522,35 +1520,35 @@ Narcissus.jsparse = (function() { addDecl.call(b, n, n2, s); continue; } - + t.mustMatch(ASSIGN); if (t.token.assignOp) throw t.newSyntaxError("Invalid variable initialization"); - + // Parse the init as a normal assignment. var n3 = b.ASSIGN$build(t); b.ASSIGN$addOperand(n3, n2.name); b.ASSIGN$addOperand(n3, AssignExpression(t, x)); b.ASSIGN$finish(n3); - + // But only add the rhs as the initializer. b.DECL$setInitializer(n2, n3[1]); b.DECL$finish(n2); addDecl.call(b, n, n2, s); continue; } - + if (tt != IDENTIFIER) throw t.newSyntaxError("missing variable name"); - + b.DECL$setName(n2, t.token.value); b.DECL$setReadOnly(n2, n.type == CONST); addDecl.call(b, n, n2, s); - + if (t.match(ASSIGN)) { if (t.token.assignOp) throw t.newSyntaxError("Invalid variable initialization"); - + // Parse the init as a normal assignment with a fake lhs. var id = new Node(n2.tokenizer, IDENTIFIER); var n3 = b.ASSIGN$build(t); @@ -1559,18 +1557,18 @@ Narcissus.jsparse = (function() { b.ASSIGN$addOperand(n3, AssignExpression(t, x)); b.ASSIGN$finish(n3); initializers.push(n3); - + // But only add the rhs as the initializer. b.DECL$setInitializer(n2, n3[1]); } - + b.DECL$finish(n2); s.varDecls.push(n2); } while (t.match(COMMA)); finish.call(b, n); return n; } - + /* * LetBlock :: (tokenizer, compiler context, boolean) -> node * @@ -1579,13 +1577,13 @@ Narcissus.jsparse = (function() { function LetBlock(t, x, isStatement) { var n, n2, binds; var b = x.builder; - + // t.token.type must be LET n = b.LET_BLOCK$build(t); t.mustMatch(LEFT_PAREN); b.LET_BLOCK$setVariables(n, Variables(t, x, n)); t.mustMatch(RIGHT_PAREN); - + if (isStatement && t.peek() != LEFT_CURLY) { /* * If this is really an expression in let statement guise, then we @@ -1597,7 +1595,7 @@ Narcissus.jsparse = (function() { b.SEMICOLON$finish(n2); isStatement = false; } - + if (isStatement) { n2 = Block(t, x); b.LET_BLOCK$setBlock(n, n2); @@ -1605,20 +1603,20 @@ Narcissus.jsparse = (function() { n2 = AssignExpression(t, x); b.LET_BLOCK$setExpression(n, n2); } - + b.LET_BLOCK$finish(n); - + return n; } - + function checkDestructuring(t, x, n, simpleNamesOnly, data) { if (n.type == ARRAY_COMP) throw t.newSyntaxError("Invalid array comprehension left-hand side"); if (n.type != ARRAY_INIT && n.type != OBJECT_INIT) return; - + var b = x.builder; - + for (var i = 0, j = n.length; i < j; i++) { var nn = n[i], lhs, rhs; if (!nn) @@ -1645,30 +1643,30 @@ Narcissus.jsparse = (function() { } } } - + function DestructuringExpression(t, x, simpleNamesOnly, data) { var n = PrimaryExpression(t, x); checkDestructuring(t, x, n, simpleNamesOnly, data); return n; } - + function GeneratorExpression(t, x, e) { var n; - + n = b.GENERATOR$build(t); b.GENERATOR$setExpression(n, e); b.GENERATOR$setTail(n, comprehensionTail(t, x)); b.GENERATOR$finish(n); - + return n; } - + function comprehensionTail(t, x) { var body, n; var b = x.builder; // t.token.type must be FOR body = b.COMP_TAIL$build(t); - + do { n = b.FOR$build(t); // Comprehension tails are always for..in loops. @@ -1688,7 +1686,7 @@ Narcissus.jsparse = (function() { // Destructured left side of for in comprehension tails. b.FOR$setIterator(n, DestructuringExpression(t, x), null); break; - + case IDENTIFIER: var n3 = b.DECL$build(t); b.DECL$setName(n3, n3.value); @@ -1703,7 +1701,7 @@ Narcissus.jsparse = (function() { * desugared. */ break; - + default: throw t.newSyntaxError("missing identifier"); } @@ -1712,18 +1710,18 @@ Narcissus.jsparse = (function() { t.mustMatch(RIGHT_PAREN); b.COMP_TAIL$addFor(body, n); } while (t.match(FOR)); - + // Optional guard. if (t.match(IF)) b.COMP_TAIL$setGuard(body, ParenExpression(t, x)); - + b.COMP_TAIL$finish(body); return body; } - + function ParenExpression(t, x) { t.mustMatch(LEFT_PAREN); - + /* * Always accept the 'in' operator in a parenthesized expression, * where it's unambiguous, even if we might be parsing the init of a @@ -1733,7 +1731,7 @@ Narcissus.jsparse = (function() { x.inForLoopInit = false; var n = Expression(t, x); x.inForLoopInit = oldLoopInit; - + var err = "expression must be parenthesized"; if (t.match(FOR)) { if (n.type == YIELD && !n.parenthesized) @@ -1742,12 +1740,12 @@ Narcissus.jsparse = (function() { throw t.newSyntaxError("Generator " + err); n = GeneratorExpression(t, x, n); } - + t.mustMatch(RIGHT_PAREN); - + return n; } - + /* * Expression: (tokenizer, compiler context) -> node * @@ -1756,7 +1754,7 @@ Narcissus.jsparse = (function() { function Expression(t, x) { var n, n2; var b = x.builder; - + n = AssignExpression(t, x); if (t.match(COMMA)) { n2 = b.COMMA$build(t); @@ -1770,27 +1768,27 @@ Narcissus.jsparse = (function() { } while (t.match(COMMA)); b.COMMA$finish(n); } - + return n; } - + function AssignExpression(t, x) { var n, lhs; var b = x.builder; - + // Have to treat yield like an operand because it could be the leftmost // operand of the expression. if (t.match(YIELD, true)) return returnOrYield(t, x); - + n = b.ASSIGN$build(t); lhs = ConditionalExpression(t, x); - + if (!t.match(ASSIGN)) { b.ASSIGN$finish(n); return lhs; } - + switch (lhs.type) { case OBJECT_INIT: case ARRAY_INIT: @@ -1802,19 +1800,19 @@ Narcissus.jsparse = (function() { throw t.newSyntaxError("Bad left-hand side of assignment"); break; } - + b.ASSIGN$setAssignOp(n, t.token.assignOp); b.ASSIGN$addOperand(n, lhs); b.ASSIGN$addOperand(n, AssignExpression(t, x)); b.ASSIGN$finish(n); - + return n; } - + function ConditionalExpression(t, x) { var n, n2; var b = x.builder; - + n = OrExpression(t, x); if (t.match(HOOK)) { n2 = n; @@ -1834,14 +1832,14 @@ Narcissus.jsparse = (function() { b.HOOK$setElsePart(n, AssignExpression(t, x)); b.HOOK$finish(n); } - + return n; } - + function OrExpression(t, x) { var n, n2; var b = x.builder; - + n = AndExpression(t, x); while (t.match(OR)) { n2 = b.OR$build(t); @@ -1850,14 +1848,14 @@ Narcissus.jsparse = (function() { b.OR$finish(n2); n = n2; } - + return n; } - + function AndExpression(t, x) { var n, n2; var b = x.builder; - + n = BitwiseOrExpression(t, x); while (t.match(AND)) { n2 = b.AND$build(t); @@ -1866,14 +1864,14 @@ Narcissus.jsparse = (function() { b.AND$finish(n2); n = n2; } - + return n; } - + function BitwiseOrExpression(t, x) { var n, n2; var b = x.builder; - + n = BitwiseXorExpression(t, x); while (t.match(BITWISE_OR)) { n2 = b.BITWISE_OR$build(t); @@ -1882,14 +1880,14 @@ Narcissus.jsparse = (function() { b.BITWISE_OR$finish(n2); n = n2; } - + return n; } - + function BitwiseXorExpression(t, x) { var n, n2; var b = x.builder; - + n = BitwiseAndExpression(t, x); while (t.match(BITWISE_XOR)) { n2 = b.BITWISE_XOR$build(t); @@ -1898,14 +1896,14 @@ Narcissus.jsparse = (function() { b.BITWISE_XOR$finish(n2); n = n2; } - + return n; } - + function BitwiseAndExpression(t, x) { var n, n2; var b = x.builder; - + n = EqualityExpression(t, x); while (t.match(BITWISE_AND)) { n2 = b.BITWISE_AND$build(t); @@ -1914,14 +1912,14 @@ Narcissus.jsparse = (function() { b.BITWISE_AND$finish(n2); n = n2; } - + return n; } - + function EqualityExpression(t, x) { var n, n2; var b = x.builder; - + n = RelationalExpression(t, x); while (t.match(EQ) || t.match(NE) || t.match(STRICT_EQ) || t.match(STRICT_NE)) { @@ -1931,15 +1929,15 @@ Narcissus.jsparse = (function() { b.EQUALITY$finish(n2); n = n2; } - + return n; } - + function RelationalExpression(t, x) { var n, n2; var b = x.builder; var oldLoopInit = x.inForLoopInit; - + /* * Uses of the in operator in shiftExprs are always unambiguous, * so unset the flag that prohibits recognizing it. @@ -1956,14 +1954,14 @@ Narcissus.jsparse = (function() { n = n2; } x.inForLoopInit = oldLoopInit; - + return n; } - + function ShiftExpression(t, x) { var n, n2; var b = x.builder; - + n = AddExpression(t, x); while (t.match(LSH) || t.match(RSH) || t.match(URSH)) { n2 = b.SHIFT$build(t); @@ -1972,14 +1970,14 @@ Narcissus.jsparse = (function() { b.SHIFT$finish(n2); n = n2; } - + return n; } - + function AddExpression(t, x) { var n, n2; var b = x.builder; - + n = MultiplyExpression(t, x); while (t.match(PLUS) || t.match(MINUS)) { n2 = b.ADD$build(t); @@ -1988,14 +1986,14 @@ Narcissus.jsparse = (function() { b.ADD$finish(n2); n = n2; } - + return n; } - + function MultiplyExpression(t, x) { var n, n2; var b = x.builder; - + n = UnaryExpression(t, x); while (t.match(MUL) || t.match(DIV) || t.match(MOD)) { n2 = b.MULTIPLY$build(t); @@ -2004,32 +2002,32 @@ Narcissus.jsparse = (function() { b.MULTIPLY$finish(n2); n = n2; } - + return n; } - + function UnaryExpression(t, x) { var n, n2, tt; var b = x.builder; - + switch (tt = t.get(true)) { case DELETE: case VOID: case TYPEOF: case NOT: case BITWISE_NOT: case PLUS: case MINUS: n = b.UNARY$build(t); b.UNARY$addOperand(n, UnaryExpression(t, x)); break; - + case INCREMENT: case DECREMENT: // Prefix increment/decrement. n = b.UNARY$build(t) b.UNARY$addOperand(n, MemberExpression(t, x, true)); break; - + default: t.unget(); n = MemberExpression(t, x, true); - + // Don't look across a newline boundary for a postfix {in,de}crement. if (t.tokens[(t.tokenIndex + t.lookahead - 1) & 3].lineno == t.lineno) { @@ -2043,15 +2041,15 @@ Narcissus.jsparse = (function() { } break; } - + b.UNARY$finish(n); return n; } - + function MemberExpression(t, x, allowCallSyntax) { var n, n2, tt; var b = x.builder; - + if (t.match(NEW)) { n = b.MEMBER$build(t); b.MEMBER$addOperand(n, MemberExpression(t, x, false)); @@ -2063,7 +2061,7 @@ Narcissus.jsparse = (function() { } else { n = PrimaryExpression(t, x); } - + while ((tt = t.get()) != END) { switch (tt) { case DOT: @@ -2072,14 +2070,14 @@ Narcissus.jsparse = (function() { t.mustMatch(IDENTIFIER); b.MEMBER$addOperand(n2, b.MEMBER$build(t)); break; - + case LEFT_BRACKET: n2 = b.MEMBER$build(t, INDEX); b.MEMBER$addOperand(n2, n); b.MEMBER$addOperand(n2, Expression(t, x)); t.mustMatch(RIGHT_BRACKET); break; - + case LEFT_PAREN: if (allowCallSyntax) { n2 = b.MEMBER$build(t, CALL); @@ -2087,25 +2085,25 @@ Narcissus.jsparse = (function() { b.MEMBER$addOperand(n2, ArgumentList(t, x)); break; } - + // FALL THROUGH default: t.unget(); return n; } - + b.MEMBER$finish(n2); n = n2; } - + return n; } - + function ArgumentList(t, x) { var n, n2; var b = x.builder; var err = "expression must be parenthesized"; - + n = b.LIST$build(t); if (t.match(RIGHT_PAREN, true)) return n; @@ -2122,19 +2120,19 @@ Narcissus.jsparse = (function() { } while (t.match(COMMA)); t.mustMatch(RIGHT_PAREN); b.LIST$finish(n); - + return n; } - + function PrimaryExpression(t, x) { var n, n2, n3, tt = t.get(true); var b = x.builder; - + switch (tt) { case FUNCTION: n = FunctionDefinition(t, x, false, EXPRESSED_FORM); break; - + case LEFT_BRACKET: n = b.ARRAY_INIT$build(t); while ((tt = t.peek()) != RIGHT_BRACKET) { @@ -2147,7 +2145,7 @@ Narcissus.jsparse = (function() { if (tt != COMMA && !t.match(COMMA)) break; } - + // If we matched exactly one element and got a FOR, we have an // array comprehension. if (n.length == 1 && t.match(FOR)) { @@ -2159,11 +2157,11 @@ Narcissus.jsparse = (function() { t.mustMatch(RIGHT_BRACKET); b.PRIMARY$finish(n); break; - + case LEFT_CURLY: var id; n = b.OBJECT_INIT$build(t); - + object_init: if (!t.match(RIGHT_CURLY)) { do { @@ -2211,7 +2209,7 @@ Narcissus.jsparse = (function() { } b.OBJECT_INIT$finish(n); break; - + case LEFT_PAREN: // ParenExpression does its own matching on parentheses, so we need to // unget. @@ -2219,38 +2217,38 @@ Narcissus.jsparse = (function() { n = ParenExpression(t, x); n.parenthesized = true; break; - + case LET: n = LetBlock(t, x, false); break; - + case NULL: case THIS: case TRUE: case FALSE: case IDENTIFIER: case NUMBER: case STRING: case REGEXP: n = b.PRIMARY$build(t); b.PRIMARY$finish(n); break; - + default: throw t.newSyntaxError("missing operand"); break; } - + return n; } - + /* * parse :: (builder, file ptr, path, line number) -> node */ function parse(b, s, f, l) { var t = new jslex.Tokenizer(s, f, l); - var x = new CompilerContext(false, b); + var x = new StaticContext(false, b); var n = Script(t, x); if (!t.done) throw t.newSyntaxError("Syntax error"); - + return n; } - + return { "parse": parse, "VanillaBuilder": VanillaBuilder, diff --git a/js/src/config/config.mk b/js/src/config/config.mk index c48f43522e50..33f15cd4589b 100644 --- a/js/src/config/config.mk +++ b/js/src/config/config.mk @@ -45,6 +45,9 @@ # # Define an include-at-most-once flag +#ifdef INCLUDED_CONFIG_MK +#$(error Don't include config.mk twice!) +#endif INCLUDED_CONFIG_MK = 1 EXIT_ON_ERROR = set -e; # Shell loops continue past errors without this. @@ -182,7 +185,7 @@ else endif endif -MOZALLOC_LIB = -L$(DIST)/bin $(call EXPAND_MOZLIBNAME,mozalloc) +MOZALLOC_LIB = $(call EXPAND_LIBNAME_PATH,mozalloc,$(DIST)/lib) OS_CFLAGS += $(_DEBUG_CFLAGS) OS_CXXFLAGS += $(_DEBUG_CFLAGS) diff --git a/js/src/ctypes/CTypes.cpp b/js/src/ctypes/CTypes.cpp index 4f8b3ae89260..54b666c3b05d 100644 --- a/js/src/ctypes/CTypes.cpp +++ b/js/src/ctypes/CTypes.cpp @@ -1520,17 +1520,17 @@ jsvalToPtrExplicit(JSContext* cx, jsval val, uintptr_t* result) return false; } -template +template void -IntegerToString(IntegerType i, jsuint radix, AutoString& result) +IntegerToString(IntegerType i, jsuint radix, Vector& result) { JS_STATIC_ASSERT(numeric_limits::is_exact); // The buffer must be big enough for all the bits of IntegerType to fit, // in base-2, including '-'. - jschar buffer[sizeof(IntegerType) * 8 + 1]; - jschar* end = buffer + sizeof(buffer) / sizeof(jschar); - jschar* cp = end; + CharType buffer[sizeof(IntegerType) * 8 + 1]; + CharType* end = buffer + sizeof(buffer) / sizeof(CharType); + CharType* cp = end; // Build the string in reverse. We use multiplication and subtraction // instead of modulus because that's much faster. @@ -4636,6 +4636,46 @@ PrepareCIF(JSContext* cx, } } +void +FunctionType::BuildSymbolName(JSContext* cx, + JSString* name, + JSObject* typeObj, + AutoCString& result) +{ + FunctionInfo* fninfo = GetFunctionInfo(cx, typeObj); + + switch (GetABICode(cx, fninfo->mABI)) { + case ABI_DEFAULT: + // For cdecl functions, no mangling is necessary. + AppendString(result, name); + break; + + case ABI_STDCALL: { + // On WIN32, stdcall functions look like: + // _foo@40 + // where 'foo' is the function name, and '40' is the aligned size of the + // arguments. + AppendString(result, "_"); + AppendString(result, name); + AppendString(result, "@"); + + // Compute the suffix by aligning each argument to sizeof(ffi_arg). + size_t size = 0; + for (size_t i = 0; i < fninfo->mArgTypes.length(); ++i) { + JSObject* argType = fninfo->mArgTypes[i]; + size += Align(CType::GetSize(cx, argType), sizeof(ffi_arg)); + } + + IntegerToString(size, 10, result); + break; + } + + case INVALID_ABI: + JS_NOT_REACHED("invalid abi"); + break; + } +} + static FunctionInfo* NewFunctionInfo(JSContext* cx, jsval abiType, diff --git a/js/src/ctypes/CTypes.h b/js/src/ctypes/CTypes.h index 339347dd10e8..b0809b45b1ac 100644 --- a/js/src/ctypes/CTypes.h +++ b/js/src/ctypes/CTypes.h @@ -111,6 +111,8 @@ class Array : public Vector // String and AutoString classes, based on Vector. typedef Vector String; typedef Vector AutoString; +typedef Vector CString; +typedef Vector AutoCString; // Convenience functions to append, insert, and compare Strings. template @@ -142,6 +144,20 @@ AppendString(Vector &v, JSString* str) v.append(str->chars(), str->length()); } +template +void +AppendString(Vector &v, JSString* str) +{ + JS_ASSERT(str); + size_t vlen = v.length(); + size_t alen = str->length(); + if (!v.resize(vlen + alen)) + return; + + for (size_t i = 0; i < alen; ++i) + v[i + vlen] = char(str->chars()[i]); +} + template void PrependString(Vector &v, const char (&array)[ArrayLength]) @@ -462,6 +478,8 @@ namespace FunctionType { FunctionInfo* GetFunctionInfo(JSContext* cx, JSObject* obj); JSObject* GetLibrary(JSContext* cx, JSObject* obj); + void BuildSymbolName(JSContext* cx, JSString* name, JSObject* typeObj, + AutoCString& result); } namespace CClosure { diff --git a/js/src/ctypes/Library.cpp b/js/src/ctypes/Library.cpp index 26befe00e886..f75db9707c48 100644 --- a/js/src/ctypes/Library.cpp +++ b/js/src/ctypes/Library.cpp @@ -268,24 +268,21 @@ Library::Declare(JSContext* cx, uintN argc, jsval* vp) return JS_FALSE; } - const char* name = JS_GetStringBytesZ(cx, JSVAL_TO_STRING(argv[0])); - if (!name) - return JS_FALSE; - + JSObject* fnObj = NULL; JSObject* typeObj; js::AutoObjectRooter root(cx); bool isFunction = argc > 2; if (isFunction) { // Case 1). // Create a FunctionType representing the function. - typeObj = FunctionType::CreateInternal(cx, - argv[1], argv[2], &argv[3], argc - 3); - if (!typeObj) + fnObj = FunctionType::CreateInternal(cx, + argv[1], argv[2], &argv[3], argc - 3); + if (!fnObj) return JS_FALSE; - root.setObject(typeObj); + root.setObject(fnObj); // Make a function pointer type. - typeObj = PointerType::CreateInternal(cx, typeObj); + typeObj = PointerType::CreateInternal(cx, fnObj); if (!typeObj) return JS_FALSE; root.setObject(typeObj); @@ -301,16 +298,22 @@ Library::Declare(JSContext* cx, uintN argc, jsval* vp) typeObj = JSVAL_TO_OBJECT(argv[1]); if (CType::GetTypeCode(cx, typeObj) == TYPE_pointer) { - JSObject* baseType = PointerType::GetBaseType(cx, typeObj); - isFunction = baseType && CType::GetTypeCode(cx, baseType) == TYPE_function; + fnObj = PointerType::GetBaseType(cx, typeObj); + isFunction = fnObj && CType::GetTypeCode(cx, fnObj) == TYPE_function; } } void* data; PRFuncPtr fnptr; + JSString* nameStr = JSVAL_TO_STRING(argv[0]); + AutoCString symbol; if (isFunction) { + // Build the symbol, with mangling if necessary. + FunctionType::BuildSymbolName(cx, nameStr, fnObj, symbol); + AppendString(symbol, "\0"); + // Look up the function symbol. - fnptr = PR_FindFunctionSymbol(library, name); + fnptr = PR_FindFunctionSymbol(library, symbol.begin()); if (!fnptr) { JS_ReportError(cx, "couldn't find function symbol in library"); return JS_FALSE; @@ -319,7 +322,10 @@ Library::Declare(JSContext* cx, uintN argc, jsval* vp) } else { // 'typeObj' is another data type. Look up the data symbol. - data = PR_FindSymbol(library, name); + AppendString(symbol, nameStr); + AppendString(symbol, "\0"); + + data = PR_FindSymbol(library, symbol.begin()); if (!data) { JS_ReportError(cx, "couldn't find symbol in library"); return JS_FALSE; diff --git a/js/src/ctypes/libffi.patch b/js/src/ctypes/libffi.patch index 678a85587ac4..b66844b1e6c9 100644 --- a/js/src/ctypes/libffi.patch +++ b/js/src/ctypes/libffi.patch @@ -1,4 +1,4 @@ -Patch libffi to fix bug 550602, bug 528129, bug 538216, bug 556902, bug 538002, and bug 581909. +Patch libffi to fix bug 550602 and bug 538216. diff --git a/js/src/ctypes/libffi/Makefile.in b/js/src/ctypes/libffi/Makefile.in --- a/js/src/ctypes/libffi/Makefile.in @@ -107,645 +107,4 @@ diff --git a/js/src/ctypes/libffi/configure b/js/src/ctypes/libffi/configure archive_cmds_need_lc=no hardcode_direct=no -@@ -12179,17 +12179,17 @@ case "$host" in - ;; - hppa*-*-hpux*) - TARGET=PA_HPUX; TARGETDIR=pa - ;; - - i?86-*-freebsd* | i?86-*-openbsd*) - TARGET=X86_FREEBSD; TARGETDIR=x86 - ;; -- i?86-win32* | i?86-*-cygwin* | i?86-*-mingw*) -+ i?86-win32* | i?86-*-cygwin* | i?86-*-mingw* | i?86-*-os2*) - TARGET=X86_WIN32; TARGETDIR=x86 - # All mingw/cygwin/win32 builds require this for sharedlib - AM_LTLDFLAGS="-no-undefined" - ;; - i?86-*-darwin*) - TARGET=X86_DARWIN; TARGETDIR=x86 - ;; - i?86-*-solaris2.1[0-9]*) -diff --git a/js/src/ctypes/libffi/msvcc.sh b/js/src/ctypes/libffi/msvcc.sh ---- a/js/src/ctypes/libffi/msvcc.sh -+++ b/js/src/ctypes/libffi/msvcc.sh -@@ -37,20 +37,21 @@ - # - # ***** END LICENSE BLOCK ***** - - # - # GCC-compatible wrapper for cl.exe and ml.exe. Arguments are given in GCC - # format and translated into something sensible for cl or ml. - # - --args="-nologo -W3" -+args="-nologo" - md=-MD - cl="cl" - ml="ml" -+safeseh="-safeseh" - output= - - while [ $# -gt 0 ] - do - case $1 - in - -fexceptions) - # Don't enable exceptions for now. -@@ -58,16 +59,17 @@ do - shift 1 - ;; - -m32) - shift 1 - ;; - -m64) - cl="cl" # "$MSVC/x86_amd64/cl" - ml="ml64" # "$MSVC/x86_amd64/ml64" -+ safeseh= - shift 1 - ;; - -O*) - args="$args $1" - shift 1 - ;; - -g) - # Can't specify -RTC1 or -Zi in opt. -Gy is ok. Use -OPT:REF? -@@ -103,17 +105,18 @@ do - includes="$includes $1" - shift 1 - ;; - -W|-Wextra) - # TODO map extra warnings - shift 1 - ;; - -Wall) -- args="$args -Wall" -+ # -Wall on MSVC is overzealous. Use -W3 instead. -+ args="$args -W3" - shift 1 - ;; - -Werror) - args="$args -WX" - shift 1 - ;; - -W*) - # TODO map specific warnings -@@ -158,17 +161,17 @@ done - if [ -n "$assembly" ]; then - if [ -z "$outdir" ]; then - outdir="." - fi - ppsrc="$outdir/$(basename $src|sed 's/.S$/.asm/g')" - echo "$cl -nologo -EP $includes $defines $src > $ppsrc" - "$cl" -nologo -EP $includes $defines $src > $ppsrc || exit $? - output="$(echo $output | sed 's%/F[dpa][^ ]*%%g')" -- args="-nologo -safeseh $single $output $ppsrc" -+ args="-nologo $safeseh $single $output $ppsrc" - - echo "$ml $args" - eval "\"$ml\" $args" - result=$? - - # required to fix ml64 broken output? - #mv *.obj $outdir - else -diff --git a/js/src/ctypes/libffi/src/powerpc/ffi_darwin.c b/js/src/ctypes/libffi/src/powerpc/ffi_darwin.c ---- a/js/src/ctypes/libffi/src/powerpc/ffi_darwin.c -+++ b/js/src/ctypes/libffi/src/powerpc/ffi_darwin.c -@@ -339,17 +339,17 @@ aix_adjust_aggregate_sizes (ffi_type *s) - /* Do not add additional tail padding. */ - } - - /* Perform machine dependent cif processing. */ - ffi_status - ffi_prep_cif_machdep (ffi_cif *cif) - { - /* All this is for the DARWIN ABI. */ -- int i; -+ unsigned i; - ffi_type **ptr; - unsigned bytes; - int fparg_count = 0, intarg_count = 0; - unsigned flags = 0; - unsigned size_al = 0; - - /* All the machine-independent calculation of cif->bytes will be wrong. - All the calculation of structure sizes will also be wrong. -@@ -537,21 +537,21 @@ ffi_call (ffi_cif *cif, void (*fn)(void) - } - else - ecif.rvalue = rvalue; - - switch (cif->abi) - { - case FFI_AIX: - ffi_call_AIX(&ecif, -(long)cif->bytes, cif->flags, ecif.rvalue, fn, -- ffi_prep_args); -+ FFI_FN(ffi_prep_args)); - break; - case FFI_DARWIN: - ffi_call_DARWIN(&ecif, -(long)cif->bytes, cif->flags, ecif.rvalue, fn, -- ffi_prep_args); -+ FFI_FN(ffi_prep_args)); - break; - default: - FFI_ASSERT(0); - break; - } - } - - static void flush_icache(char *); -@@ -794,32 +794,32 @@ ffi_closure_helper_DARWIN (ffi_closure * - break; - - case FFI_TYPE_STRUCT: - #ifdef POWERPC64 - size_al = arg_types[i]->size; - if (arg_types[i]->elements[0]->type == FFI_TYPE_DOUBLE) - size_al = ALIGN (arg_types[i]->size, 8); - if (size_al < 3 && cif->abi == FFI_DARWIN) -- avalue[i] = (void *) pgr + 8 - size_al; -+ avalue[i] = (char *) pgr + 8 - size_al; - else -- avalue[i] = (void *) pgr; -+ avalue[i] = pgr; - pgr += (size_al + 7) / 8; - #else - /* Structures that match the basic modes (QI 1 byte, HI 2 bytes, - SI 4 bytes) are aligned as if they were those modes. */ - size_al = arg_types[i]->size; - /* If the first member of the struct is a double, then align - the struct to double-word. */ - if (arg_types[i]->elements[0]->type == FFI_TYPE_DOUBLE) - size_al = ALIGN(arg_types[i]->size, 8); - if (size_al < 3 && cif->abi == FFI_DARWIN) -- avalue[i] = (void*) pgr + 4 - size_al; -+ avalue[i] = (char*) pgr + 4 - size_al; - else -- avalue[i] = (void*) pgr; -+ avalue[i] = pgr; - pgr += (size_al + 3) / 4; - #endif - break; - - case FFI_TYPE_SINT64: - case FFI_TYPE_UINT64: - #ifdef POWERPC64 - case FFI_TYPE_POINTER: -diff --git a/js/src/ctypes/libffi/src/x86/ffi.c b/js/src/ctypes/libffi/src/x86/ffi.c ---- a/js/src/ctypes/libffi/src/x86/ffi.c -+++ b/js/src/ctypes/libffi/src/x86/ffi.c -@@ -204,17 +204,17 @@ ffi_status ffi_prep_cif_machdep(ffi_cif - else if (cif->rtype->size == 8) - { - cif->flags = FFI_TYPE_SINT64; /* same as int64 type */ - } - else - #endif - { - cif->flags = FFI_TYPE_STRUCT; -- // allocate space for return value pointer -+ /* allocate space for return value pointer */ - cif->bytes += ALIGN(sizeof(void*), FFI_SIZEOF_ARG); - } - break; - - default: - #ifdef X86_WIN64 - cif->flags = FFI_TYPE_SINT64; - break; -@@ -229,17 +229,17 @@ ffi_status ffi_prep_cif_machdep(ffi_cif - for (ptr = cif->arg_types, i = cif->nargs; i > 0; i--, ptr++) - { - if (((*ptr)->alignment - 1) & cif->bytes) - cif->bytes = ALIGN(cif->bytes, (*ptr)->alignment); - cif->bytes += ALIGN((*ptr)->size, FFI_SIZEOF_ARG); - } - - #ifdef X86_WIN64 -- // ensure space for storing four registers -+ /* ensure space for storing four registers */ - cif->bytes += 4 * sizeof(ffi_arg); - #endif - - #ifdef X86_DARWIN - cif->bytes = (cif->bytes + 15) & ~0xF; - #endif - - return FFI_OK; -@@ -287,18 +287,18 @@ void ffi_call(ffi_cif *cif, void (*fn)(v - ecif.rvalue = rvalue; - - - switch (cif->abi) - { - #ifdef X86_WIN64 - case FFI_WIN64: - { -- // Make copies of all struct arguments -- // NOTE: not sure if responsibility should be here or in caller -+ /* Make copies of all struct arguments -+ NOTE: not sure if responsibility should be here or in caller */ - unsigned int i; - for (i=0; i < cif->nargs;i++) { - size_t size = cif->arg_types[i]->size; - if ((cif->arg_types[i]->type == FFI_TYPE_STRUCT - && (size != 1 && size != 2 && size != 4 && size != 8)) - #if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE - || cif->arg_types[i]->type == FFI_TYPE_LONGDOUBLE - #endif -@@ -580,20 +580,20 @@ ffi_prep_raw_closure_loc (ffi_raw_closur - void *codeloc) - { - int i; - - if (cif->abi != FFI_SYSV) { - return FFI_BAD_ABI; - } - -- // we currently don't support certain kinds of arguments for raw -- // closures. This should be implemented by a separate assembly language -- // routine, since it would require argument processing, something we -- // don't do now for performance. -+ /* we currently don't support certain kinds of arguments for raw -+ closures. This should be implemented by a separate assembly language -+ routine, since it would require argument processing, something we -+ don't do now for performance. */ - - for (i = cif->nargs-1; i >= 0; i--) - { - FFI_ASSERT (cif->arg_types[i]->type != FFI_TYPE_STRUCT); - FFI_ASSERT (cif->arg_types[i]->type != FFI_TYPE_LONGDOUBLE); - } - - -diff --git a/js/src/ctypes/libffi/src/x86/ffitarget.h b/js/src/ctypes/libffi/src/x86/ffitarget.h ---- a/js/src/ctypes/libffi/src/x86/ffitarget.h -+++ b/js/src/ctypes/libffi/src/x86/ffitarget.h -@@ -33,17 +33,17 @@ - - #if defined (X86_64) && defined (__i386__) - #undef X86_64 - #define X86 - #endif - - #ifdef X86_WIN64 - #define FFI_SIZEOF_ARG 8 --#define USE_BUILTIN_FFS 0 // not yet implemented in mingw-64 -+#define USE_BUILTIN_FFS 0 /* not yet implemented in mingw-64 */ - #endif - - /* ---- Generic type definitions ----------------------------------------- */ - - #ifndef LIBFFI_ASM - #ifdef X86_WIN64 - #ifdef _MSC_VER - typedef unsigned __int64 ffi_arg; -diff --git a/js/src/ctypes/libffi/src/closures.c b/js/src/ctypes/libffi/src/closures.c ---- a/js/src/ctypes/libffi/src/closures.c -+++ b/js/src/ctypes/libffi/src/closures.c -@@ -39,17 +39,17 @@ - option is defined will attempt to map such pages once, but if it - fails, it falls back to creating a temporary file in a writable and - executable filesystem and mapping pages from it into separate - locations in the virtual memory space, one location writable and - another executable. */ - # define FFI_MMAP_EXEC_WRIT 1 - # define HAVE_MNTENT 1 - # endif --# if defined(X86_WIN32) || defined(X86_WIN64) -+# if defined(X86_WIN32) || defined(X86_WIN64) || defined(__OS2__) - /* Windows systems may have Data Execution Protection (DEP) enabled, - which requires the use of VirtualMalloc/VirtualFree to alloc/free - executable memory. */ - # define FFI_MMAP_EXEC_WRIT 1 - # endif - #endif - - #if FFI_MMAP_EXEC_WRIT && !defined FFI_MMAP_EXEC_SELINUX -@@ -188,31 +188,31 @@ static size_t dlmalloc_footprint(void) M - static size_t dlmalloc_max_footprint(void) MAYBE_UNUSED; - static void** dlindependent_calloc(size_t, size_t, void**) MAYBE_UNUSED; - static void** dlindependent_comalloc(size_t, size_t*, void**) MAYBE_UNUSED; - static void *dlpvalloc(size_t) MAYBE_UNUSED; - static int dlmalloc_trim(size_t) MAYBE_UNUSED; - static size_t dlmalloc_usable_size(void*) MAYBE_UNUSED; - static void dlmalloc_stats(void) MAYBE_UNUSED; - --#if !(defined(X86_WIN32) || defined(X86_WIN64)) || defined (__CYGWIN__) -+#if !(defined(X86_WIN32) || defined(X86_WIN64) || defined(__OS2__)) || defined (__CYGWIN__) - /* Use these for mmap and munmap within dlmalloc.c. */ - static void *dlmmap(void *, size_t, int, int, int, off_t); - static int dlmunmap(void *, size_t); --#endif /* !(defined(X86_WIN32) || defined(X86_WIN64)) || defined (__CYGWIN__) */ -+#endif /* !(defined(X86_WIN32) || defined(X86_WIN64) || defined(__OS2__)) || defined (__CYGWIN__) */ - - #define mmap dlmmap - #define munmap dlmunmap - - #include "dlmalloc.c" - - #undef mmap - #undef munmap - --#if !(defined(X86_WIN32) || defined(X86_WIN64)) || defined (__CYGWIN__) -+#if !(defined(X86_WIN32) || defined(X86_WIN64) || defined(__OS2__)) || defined (__CYGWIN__) - - /* A mutex used to synchronize access to *exec* variables in this file. */ - static pthread_mutex_t open_temp_exec_file_mutex = PTHREAD_MUTEX_INITIALIZER; - - /* A file descriptor of a temporary file from which we'll map - executable pages. */ - static int execfd = -1; - -@@ -517,17 +517,17 @@ segment_holding_code (mstate m, char* ad - && addr < add_segment_exec_offset (sp->base, sp) + sp->size) - return sp; - if ((sp = sp->next) == 0) - return 0; - } - } - #endif - --#endif /* !(defined(X86_WIN32) || defined(X86_WIN64)) || defined (__CYGWIN__) */ -+#endif /* !(defined(X86_WIN32) || defined(X86_WIN64) || defined(__OS2__)) || defined (__CYGWIN__) */ - - /* Allocate a chunk of memory with the given size. Returns a pointer - to the writable address, and sets *CODE to the executable - corresponding virtual address. */ - void * - ffi_closure_alloc (size_t size, void **code) - { - void *ptr; -diff --git a/js/src/ctypes/libffi/src/dlmalloc.c b/js/src/ctypes/libffi/src/dlmalloc.c ---- a/js/src/ctypes/libffi/src/dlmalloc.c -+++ b/js/src/ctypes/libffi/src/dlmalloc.c -@@ -454,16 +454,24 @@ DEFAULT_MMAP_THRESHOLD default: 25 - #define LACKS_STRING_H - #define LACKS_STRINGS_H - #define LACKS_SYS_TYPES_H - #define LACKS_ERRNO_H - #define MALLOC_FAILURE_ACTION - #define MMAP_CLEARS 0 /* WINCE and some others apparently don't clear */ - #endif /* WIN32 */ - -+#ifdef __OS2__ -+#define INCL_DOS -+#include -+#define HAVE_MMAP 1 -+#define HAVE_MORECORE 0 -+#define LACKS_SYS_MMAN_H -+#endif /* __OS2__ */ -+ - #if defined(DARWIN) || defined(_DARWIN) - /* Mac OSX docs advise not to use sbrk; it seems better to use mmap */ - #ifndef HAVE_MORECORE - #define HAVE_MORECORE 0 - #define HAVE_MMAP 1 - #endif /* HAVE_MORECORE */ - #endif /* DARWIN */ - -@@ -1283,17 +1291,17 @@ extern void* sbrk(ptrdiff_t); - #define CALL_MMAP(s) MFAIL - #define CALL_MUNMAP(a, s) (-1) - #define DIRECT_MMAP(s) MFAIL - - #else /* HAVE_MMAP */ - #define IS_MMAPPED_BIT (SIZE_T_ONE) - #define USE_MMAP_BIT (SIZE_T_ONE) - --#ifndef WIN32 -+#if !defined(WIN32) && !defined (__OS2__) - #define CALL_MUNMAP(a, s) munmap((a), (s)) - #define MMAP_PROT (PROT_READ|PROT_WRITE) - #if !defined(MAP_ANONYMOUS) && defined(MAP_ANON) - #define MAP_ANONYMOUS MAP_ANON - #endif /* MAP_ANON */ - #ifdef MAP_ANONYMOUS - #define MMAP_FLAGS (MAP_PRIVATE|MAP_ANONYMOUS) - #define CALL_MMAP(s) mmap(0, (s), MMAP_PROT, MMAP_FLAGS, -1, 0) -@@ -1306,16 +1314,52 @@ extern void* sbrk(ptrdiff_t); - static int dev_zero_fd = -1; /* Cached file descriptor for /dev/zero. */ - #define CALL_MMAP(s) ((dev_zero_fd < 0) ? \ - (dev_zero_fd = open("/dev/zero", O_RDWR), \ - mmap(0, (s), MMAP_PROT, MMAP_FLAGS, dev_zero_fd, 0)) : \ - mmap(0, (s), MMAP_PROT, MMAP_FLAGS, dev_zero_fd, 0)) - #endif /* MAP_ANONYMOUS */ - - #define DIRECT_MMAP(s) CALL_MMAP(s) -+ -+#elif defined(__OS2__) -+ -+/* OS/2 MMAP via DosAllocMem */ -+static void* os2mmap(size_t size) { -+ void* ptr; -+ if (DosAllocMem(&ptr, size, OBJ_ANY|PAG_COMMIT|PAG_READ|PAG_WRITE) && -+ DosAllocMem(&ptr, size, PAG_COMMIT|PAG_READ|PAG_WRITE)) -+ return MFAIL; -+ return ptr; -+} -+ -+#define os2direct_mmap(n) os2mmap(n) -+ -+/* This function supports releasing coalesed segments */ -+static int os2munmap(void* ptr, size_t size) { -+ while (size) { -+ ULONG ulSize = size; -+ ULONG ulFlags = 0; -+ if (DosQueryMem(ptr, &ulSize, &ulFlags) != 0) -+ return -1; -+ if ((ulFlags & PAG_BASE) == 0 ||(ulFlags & PAG_COMMIT) == 0 || -+ ulSize > size) -+ return -1; -+ if (DosFreeMem(ptr) != 0) -+ return -1; -+ ptr = ( void * ) ( ( char * ) ptr + ulSize ); -+ size -= ulSize; -+ } -+ return 0; -+} -+ -+#define CALL_MMAP(s) os2mmap(s) -+#define CALL_MUNMAP(a, s) os2munmap((a), (s)) -+#define DIRECT_MMAP(s) os2direct_mmap(s) -+ - #else /* WIN32 */ - - /* Win32 MMAP via VirtualAlloc */ - static void* win32mmap(size_t size) { - void* ptr = VirtualAlloc(0, size, MEM_RESERVE|MEM_COMMIT, PAGE_EXECUTE_READWRITE); - return (ptr != 0)? ptr: MFAIL; - } - -@@ -1382,30 +1426,40 @@ static int win32munmap(void* ptr, size_t - protect against direct calls to MORECORE by other threads not - using this lock, so there is still code to cope the best we can on - interference. - - * magic_init_mutex ensures that mparams.magic and other - unique mparams values are initialized only once. - */ - --#ifndef WIN32 -+#if !defined(WIN32) && !defined(__OS2__) - /* By default use posix locks */ - #include - #define MLOCK_T pthread_mutex_t - #define INITIAL_LOCK(l) pthread_mutex_init(l, NULL) - #define ACQUIRE_LOCK(l) pthread_mutex_lock(l) - #define RELEASE_LOCK(l) pthread_mutex_unlock(l) - - #if HAVE_MORECORE - static MLOCK_T morecore_mutex = PTHREAD_MUTEX_INITIALIZER; - #endif /* HAVE_MORECORE */ - - static MLOCK_T magic_init_mutex = PTHREAD_MUTEX_INITIALIZER; - -+#elif defined(__OS2__) -+#define MLOCK_T HMTX -+#define INITIAL_LOCK(l) DosCreateMutexSem(0, l, 0, FALSE) -+#define ACQUIRE_LOCK(l) DosRequestMutexSem(*l, SEM_INDEFINITE_WAIT) -+#define RELEASE_LOCK(l) DosReleaseMutexSem(*l) -+#if HAVE_MORECORE -+static MLOCK_T morecore_mutex; -+#endif /* HAVE_MORECORE */ -+static MLOCK_T magic_init_mutex; -+ - #else /* WIN32 */ - /* - Because lock-protected regions have bounded times, and there - are no recursive lock calls, we can use simple spinlocks. - */ - - #define MLOCK_T long - static int win32_acquire_lock (MLOCK_T *sl) { -@@ -2487,20 +2541,25 @@ static int init_mparams(void) { - if (mparams.magic == 0) { - mparams.magic = s; - /* Set up lock for main malloc area */ - INITIAL_LOCK(&gm->mutex); - gm->mflags = mparams.default_mflags; - } - RELEASE_MAGIC_INIT_LOCK(); - --#ifndef WIN32 -+#if !defined(WIN32) && !defined(__OS2__) - mparams.page_size = malloc_getpagesize; - mparams.granularity = ((DEFAULT_GRANULARITY != 0)? - DEFAULT_GRANULARITY : mparams.page_size); -+#elif defined (__OS2__) -+ /* if low-memory is used, os2munmap() would break -+ if it were anything other than 64k */ -+ mparams.page_size = 4096u; -+ mparams.granularity = 65536u; - #else /* WIN32 */ - { - SYSTEM_INFO system_info; - GetSystemInfo(&system_info); - mparams.page_size = system_info.dwPageSize; - mparams.granularity = system_info.dwAllocationGranularity; - } - #endif /* WIN32 */ -diff --git a/js/src/ctypes/libffi/src/x86/win32.S b/js/src/ctypes/libffi/src/x86/win32.S ---- a/js/src/ctypes/libffi/src/x86/win32.S -+++ b/js/src/ctypes/libffi/src/x86/win32.S -@@ -390,17 +390,19 @@ END - - #else - - .text - - # This assumes we are using gas. - .balign 16 - .globl _ffi_call_win32 -+#ifndef __OS2__ - .def _ffi_call_win32; .scl 2; .type 32; .endef -+#endif - _ffi_call_win32: - .LFB1: - pushl %ebp - .LCFI0: - movl %esp,%ebp - .LCFI1: - # Make room for all of the new args. - movl 16(%ebp),%ecx -@@ -542,17 +544,19 @@ 1: - popl %ebp - ret - .ffi_call_win32_end: - .LFE1: - - # This assumes we are using gas. - .balign 16 - .globl _ffi_closure_SYSV -+#ifndef __OS2__ - .def _ffi_closure_SYSV; .scl 2; .type 32; .endef -+#endif - _ffi_closure_SYSV: - .LFB3: - pushl %ebp - .LCFI4: - movl %esp, %ebp - .LCFI5: - subl $40, %esp - leal -24(%ebp), %edx -@@ -663,17 +667,19 @@ 1: - #define RAW_CLOSURE_CIF_OFFSET ((FFI_TRAMPOLINE_SIZE + 3) & ~3) - #define RAW_CLOSURE_FUN_OFFSET (RAW_CLOSURE_CIF_OFFSET + 4) - #define RAW_CLOSURE_USER_DATA_OFFSET (RAW_CLOSURE_FUN_OFFSET + 4) - #define CIF_FLAGS_OFFSET 20 - - # This assumes we are using gas. - .balign 16 - .globl _ffi_closure_raw_SYSV -+#ifndef __OS2__ - .def _ffi_closure_raw_SYSV; .scl 2; .type 32; .endef -+#endif - _ffi_closure_raw_SYSV: - .LFB4: - pushl %ebp - .LCFI6: - movl %esp, %ebp - .LCFI7: - pushl %esi - .LCFI8: -@@ -779,17 +785,19 @@ 1: - .ffi_closure_raw_SYSV_end: - .LFE4: - - #endif /* !FFI_NO_RAW_API */ - - # This assumes we are using gas. - .balign 16 - .globl _ffi_closure_STDCALL -+#ifndef __OS2__ - .def _ffi_closure_STDCALL; .scl 2; .type 32; .endef -+#endif - _ffi_closure_STDCALL: - .LFB5: - pushl %ebp - .LCFI9: - movl %esp, %ebp - .LCFI10: - subl $40, %esp - leal -24(%ebp), %edx -@@ -885,17 +893,19 @@ 1: - .Lscls_noretval: - .Lscls_epilogue: - movl %ebp, %esp - popl %ebp - ret - .ffi_closure_STDCALL_end: - .LFE5: - -+#ifndef __OS2__ - .section .eh_frame,"w" -+#endif - .Lframe1: - .LSCIE1: - .long .LECIE1-.LASCIE1 /* Length of Common Information Entry */ - .LASCIE1: - .long 0x0 /* CIE Identifier Tag */ - .byte 0x1 /* CIE Version */ - #ifdef __PIC__ - .ascii "zR\0" /* CIE Augmentation */ + diff --git a/js/src/ctypes/libffi/ChangeLog b/js/src/ctypes/libffi/ChangeLog index 57e72b87900c..5768c10b4ac7 100644 --- a/js/src/ctypes/libffi/ChangeLog +++ b/js/src/ctypes/libffi/ChangeLog @@ -1,3 +1,122 @@ +2010-08-05 Dan Witte + + * Makefile.am: Pass FFI_DEBUG define to msvcc.sh for linking to the + debug CRT when --enable-debug is given. + * configure.ac: Define it. + * msvcc.sh: Translate -g and -DFFI_DEBUG appropriately. + +2010-08-04 Dan Witte + + * src/x86/ffitarget.h: Add X86_ANY define for all x86/x86_64 + platforms. + * src/x86/ffi.c: Remove redundant ifdef checks. + * src/prep_cif.c: Push stack space computation into src/x86/ffi.c + for X86_ANY so return value space doesn't get added twice. + +2010-08-03 Neil Rashbrooke + + * msvcc.sh: Don't pass -safeseh to ml64 because behavior is buggy. + +2010-07-22 Dan Witte + + * src/*/ffitarget.h: Make FFI_LAST_ABI one past the last valid ABI. + * src/prep_cif.c: Fix ABI assertion. + * src/cris/ffi.c: Ditto. + +2010-07-10 Evan Phoenix + + * src/closures.c (selinux_enabled_check): Fix strncmp usage bug. + +2010-07-07 Dan Horák + + * include/ffi.h.in: Protect #define with #ifndef. + * src/powerpc/ffitarget.h: Ditto. + * src/s390/ffitarget.h: Ditto. + * src/sparc/ffitarget.h: Ditto. + +2010-05-11 Dan Witte + + * doc/libffi.tex: Document previous change. + +2010-05-11 Makoto Kato + + * src/x86/ffi.c (ffi_call): Don't copy structs passed by value. + +2010-05-05 Michael Kohler + + * src/dlmalloc.c (dlfree): Fix spelling. + * src/ia64/ffi.c (ffi_prep_cif_machdep): Ditto. + * configure.ac: Ditto. + * configure: Rebuilt. + +2010-04-13 Dan Witte + + * msvcc.sh: Build with -W3 instead of -Wall. + * src/powerpc/ffi_darwin.c: Remove build warnings. + * src/x86/ffi.c: Ditto. + * src/x86/ffitarget.h: Ditto. + +2010-03-30 Dan Witte + + * msvcc.sh: Disable build warnings. + * README (tested): Clarify windows build procedure. + +2010-03-14 Matthias Klose + + * src/x86/ffi64.c: Fix typo in comment. + * src/x86/ffi.c: Use /* ... */ comment style. + +2010-07-07 Neil Roberts + + * src/x86/sysv.S (ffi_call_SYSV): Align the stack pointer to + 16-bytes. + +2010-07-02 Jakub Jelinek + + * Makefile.am (AM_MAKEFLAGS): Pass also mandir to submakes. + * Makefile.in: Regenerated. + +2010-05-19 Rainer Orth + + * configure.ac (libffi_cv_as_x86_pcrel): Check for illegal in as + output, too. + (libffi_cv_as_ascii_pseudo_op): Check for .ascii. + (libffi_cv_as_string_pseudo_op): Check for .string. + * configure: Regenerate. + * fficonfig.h.in: Regenerate. + * src/x86/sysv.S (.eh_frame): Use .ascii, .string or error. + +2010-04-07 Jakub Jelinek + + * regex.c (byte_re_match_2_internal): Avoid set but not used + warning. + +2010-04-02 Ralf Wildenhues + + * Makefile.in: Regenerate. + * aclocal.m4: Regenerate. + * include/Makefile.in: Regenerate. + * man/Makefile.in: Regenerate. + * testsuite/Makefile.in: Regenerate. + +2010-03-15 Rainer Orth + + * configure.ac (libffi_cv_as_x86_64_unwind_section_type): New test. + * configure: Regenerate. + * fficonfig.h.in: Regenerate. + * libffi/src/x86/unix64.S (.eh_frame) + [HAVE_AS_X86_64_UNWIND_SECTION_TYPE]: Use @unwind section type. + +2010-02-24 Rainer Orth + + * doc/libffi.texi (The Closure API): Fix typo. + * doc/libffi.info: Remove. + +2010-02-15 Matthias Klose + + * src/arm/sysv.S (__ARM_ARCH__): Define for processor + __ARM_ARCH_7EM__. + 2010-01-07 Rainer Orth PR libffi/40701 diff --git a/js/src/ctypes/libffi/Makefile.am b/js/src/ctypes/libffi/Makefile.am index f47dd1a549d5..aa4a55ceae91 100644 --- a/js/src/ctypes/libffi/Makefile.am +++ b/js/src/ctypes/libffi/Makefile.am @@ -69,6 +69,7 @@ AM_MAKEFLAGS = \ "exec_prefix=$(exec_prefix)" \ "infodir=$(infodir)" \ "libdir=$(libdir)" \ + "mandir=$(mandir)" \ "prefix=$(prefix)" \ "AR=$(AR)" \ "AS=$(AS)" \ @@ -151,6 +152,9 @@ endif if FRV nodist_libffi_la_SOURCES += src/frv/eabi.S src/frv/ffi.c endif +if MOXIE +nodist_libffi_la_SOURCES += src/moxie/eabi.S src/moxie/ffi.c +endif if S390 nodist_libffi_la_SOURCES += src/s390/sysv.S src/s390/ffi.c endif @@ -174,6 +178,14 @@ libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) AM_CFLAGS = -Wall -g -fexceptions +if FFI_DEBUG +# Build debug. Define FFI_DEBUG on the commandline so that, when building with +# MSVC, it can link against the debug CRT. +AM_CFLAGS += -DFFI_DEBUG +else +# Build opt. +AM_CFLAGS += -O2 +endif libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS) diff --git a/js/src/ctypes/libffi/Makefile.in b/js/src/ctypes/libffi/Makefile.in index aa7a8244b21d..bc5902700a04 100644 --- a/js/src/ctypes/libffi/Makefile.in +++ b/js/src/ctypes/libffi/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -55,12 +55,18 @@ target_triplet = @target@ @AVR32_TRUE@am__append_17 = src/avr32/sysv.S src/avr32/ffi.c @LIBFFI_CRIS_TRUE@am__append_18 = src/cris/sysv.S src/cris/ffi.c @FRV_TRUE@am__append_19 = src/frv/eabi.S src/frv/ffi.c -@S390_TRUE@am__append_20 = src/s390/sysv.S src/s390/ffi.c -@X86_64_TRUE@am__append_21 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S -@SH_TRUE@am__append_22 = src/sh/sysv.S src/sh/ffi.c -@SH64_TRUE@am__append_23 = src/sh64/sysv.S src/sh64/ffi.c -@PA_LINUX_TRUE@am__append_24 = src/pa/linux.S src/pa/ffi.c -@PA_HPUX_TRUE@am__append_25 = src/pa/hpux32.S src/pa/ffi.c +@MOXIE_TRUE@am__append_20 = src/moxie/eabi.S src/moxie/ffi.c +@S390_TRUE@am__append_21 = src/s390/sysv.S src/s390/ffi.c +@X86_64_TRUE@am__append_22 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S +@SH_TRUE@am__append_23 = src/sh/sysv.S src/sh/ffi.c +@SH64_TRUE@am__append_24 = src/sh64/sysv.S src/sh64/ffi.c +@PA_LINUX_TRUE@am__append_25 = src/pa/linux.S src/pa/ffi.c +@PA_HPUX_TRUE@am__append_26 = src/pa/hpux32.S src/pa/ffi.c +# Build debug. Define FFI_DEBUG on the commandline so that, when building with +# MSVC, it can link against the debug CRT. +@FFI_DEBUG_TRUE@am__append_27 = -DFFI_DEBUG +# Build opt. +@FFI_DEBUG_FALSE@am__append_28 = -O2 subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \ @@ -138,13 +144,14 @@ am_libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo src/types.lo \ @AVR32_TRUE@am__objects_17 = src/avr32/sysv.lo src/avr32/ffi.lo @LIBFFI_CRIS_TRUE@am__objects_18 = src/cris/sysv.lo src/cris/ffi.lo @FRV_TRUE@am__objects_19 = src/frv/eabi.lo src/frv/ffi.lo -@S390_TRUE@am__objects_20 = src/s390/sysv.lo src/s390/ffi.lo -@X86_64_TRUE@am__objects_21 = src/x86/ffi64.lo src/x86/unix64.lo \ +@MOXIE_TRUE@am__objects_20 = src/moxie/eabi.lo src/moxie/ffi.lo +@S390_TRUE@am__objects_21 = src/s390/sysv.lo src/s390/ffi.lo +@X86_64_TRUE@am__objects_22 = src/x86/ffi64.lo src/x86/unix64.lo \ @X86_64_TRUE@ src/x86/ffi.lo src/x86/sysv.lo -@SH_TRUE@am__objects_22 = src/sh/sysv.lo src/sh/ffi.lo -@SH64_TRUE@am__objects_23 = src/sh64/sysv.lo src/sh64/ffi.lo -@PA_LINUX_TRUE@am__objects_24 = src/pa/linux.lo src/pa/ffi.lo -@PA_HPUX_TRUE@am__objects_25 = src/pa/hpux32.lo src/pa/ffi.lo +@SH_TRUE@am__objects_23 = src/sh/sysv.lo src/sh/ffi.lo +@SH64_TRUE@am__objects_24 = src/sh64/sysv.lo src/sh64/ffi.lo +@PA_LINUX_TRUE@am__objects_25 = src/pa/linux.lo src/pa/ffi.lo +@PA_HPUX_TRUE@am__objects_26 = src/pa/hpux32.lo src/pa/ffi.lo nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ $(am__objects_3) $(am__objects_4) $(am__objects_5) \ $(am__objects_6) $(am__objects_7) $(am__objects_8) \ @@ -153,17 +160,17 @@ nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ $(am__objects_15) $(am__objects_16) $(am__objects_17) \ $(am__objects_18) $(am__objects_19) $(am__objects_20) \ $(am__objects_21) $(am__objects_22) $(am__objects_23) \ - $(am__objects_24) $(am__objects_25) + $(am__objects_24) $(am__objects_25) $(am__objects_26) libffi_la_OBJECTS = $(am_libffi_la_OBJECTS) \ $(nodist_libffi_la_OBJECTS) libffi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libffi_la_LDFLAGS) $(LDFLAGS) -o $@ libffi_convenience_la_LIBADD = -am__objects_26 = src/debug.lo src/prep_cif.lo src/types.lo \ +am__objects_27 = src/debug.lo src/prep_cif.lo src/types.lo \ src/raw_api.lo src/java_raw_api.lo src/closures.lo -am_libffi_convenience_la_OBJECTS = $(am__objects_26) -am__objects_27 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ +am_libffi_convenience_la_OBJECTS = $(am__objects_27) +am__objects_28 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ $(am__objects_4) $(am__objects_5) $(am__objects_6) \ $(am__objects_7) $(am__objects_8) $(am__objects_9) \ $(am__objects_10) $(am__objects_11) $(am__objects_12) \ @@ -171,8 +178,8 @@ am__objects_27 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ $(am__objects_16) $(am__objects_17) $(am__objects_18) \ $(am__objects_19) $(am__objects_20) $(am__objects_21) \ $(am__objects_22) $(am__objects_23) $(am__objects_24) \ - $(am__objects_25) -nodist_libffi_convenience_la_OBJECTS = $(am__objects_27) + $(am__objects_25) $(am__objects_26) +nodist_libffi_convenience_la_OBJECTS = $(am__objects_28) libffi_convenience_la_OBJECTS = $(am_libffi_convenience_la_OBJECTS) \ $(nodist_libffi_convenience_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ @@ -319,6 +326,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ @@ -448,6 +456,7 @@ AM_MAKEFLAGS = \ "exec_prefix=$(exec_prefix)" \ "infodir=$(infodir)" \ "libdir=$(libdir)" \ + "mandir=$(mandir)" \ "prefix=$(prefix)" \ "AR=$(AR)" \ "AS=$(AS)" \ @@ -475,10 +484,10 @@ nodist_libffi_la_SOURCES = $(am__append_1) $(am__append_2) \ $(am__append_15) $(am__append_16) $(am__append_17) \ $(am__append_18) $(am__append_19) $(am__append_20) \ $(am__append_21) $(am__append_22) $(am__append_23) \ - $(am__append_24) $(am__append_25) + $(am__append_24) $(am__append_25) $(am__append_26) libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) -AM_CFLAGS = -Wall -g -fexceptions +AM_CFLAGS = -Wall -g -fexceptions $(am__append_27) $(am__append_28) libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS) AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src AM_CCASFLAGS = $(AM_CPPFLAGS) @@ -744,6 +753,16 @@ src/frv/eabi.lo: src/frv/$(am__dirstamp) \ src/frv/$(DEPDIR)/$(am__dirstamp) src/frv/ffi.lo: src/frv/$(am__dirstamp) \ src/frv/$(DEPDIR)/$(am__dirstamp) +src/moxie/$(am__dirstamp): + @$(MKDIR_P) src/moxie + @: > src/moxie/$(am__dirstamp) +src/moxie/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) src/moxie/$(DEPDIR) + @: > src/moxie/$(DEPDIR)/$(am__dirstamp) +src/moxie/eabi.lo: src/moxie/$(am__dirstamp) \ + src/moxie/$(DEPDIR)/$(am__dirstamp) +src/moxie/ffi.lo: src/moxie/$(am__dirstamp) \ + src/moxie/$(DEPDIR)/$(am__dirstamp) src/s390/$(am__dirstamp): @$(MKDIR_P) src/s390 @: > src/s390/$(am__dirstamp) @@ -837,6 +856,10 @@ mostlyclean-compile: -rm -f src/mips/n32.lo -rm -f src/mips/o32.$(OBJEXT) -rm -f src/mips/o32.lo + -rm -f src/moxie/eabi.$(OBJEXT) + -rm -f src/moxie/eabi.lo + -rm -f src/moxie/ffi.$(OBJEXT) + -rm -f src/moxie/ffi.lo -rm -f src/pa/ffi.$(OBJEXT) -rm -f src/pa/ffi.lo -rm -f src/pa/hpux32.$(OBJEXT) @@ -934,6 +957,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/mips/$(DEPDIR)/ffi.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/mips/$(DEPDIR)/n32.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/mips/$(DEPDIR)/o32.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/moxie/$(DEPDIR)/eabi.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/moxie/$(DEPDIR)/ffi.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/pa/$(DEPDIR)/ffi.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/pa/$(DEPDIR)/hpux32.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/pa/$(DEPDIR)/linux.Plo@am__quote@ @@ -1029,6 +1054,7 @@ clean-libtool: -rm -rf src/m32r/.libs src/m32r/_libs -rm -rf src/m68k/.libs src/m68k/_libs -rm -rf src/mips/.libs src/mips/_libs + -rm -rf src/moxie/.libs src/moxie/_libs -rm -rf src/pa/.libs src/pa/_libs -rm -rf src/powerpc/.libs src/powerpc/_libs -rm -rf src/s390/.libs src/s390/_libs @@ -1232,7 +1258,7 @@ uninstall-pkgconfigDATA: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -1257,7 +1283,7 @@ $(RECURSIVE_TARGETS): fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -1424,7 +1450,8 @@ distdir: $(DISTFILES) top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-info -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ @@ -1468,17 +1495,17 @@ dist dist-all: distdir distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -1587,6 +1614,8 @@ distclean-generic: -rm -f src/m68k/$(am__dirstamp) -rm -f src/mips/$(DEPDIR)/$(am__dirstamp) -rm -f src/mips/$(am__dirstamp) + -rm -f src/moxie/$(DEPDIR)/$(am__dirstamp) + -rm -f src/moxie/$(am__dirstamp) -rm -f src/pa/$(DEPDIR)/$(am__dirstamp) -rm -f src/pa/$(am__dirstamp) -rm -f src/powerpc/$(DEPDIR)/$(am__dirstamp) @@ -1612,7 +1641,7 @@ clean-am: clean-aminfo clean-generic clean-libLTLIBRARIES \ distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR) + -rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-tags @@ -1732,7 +1761,7 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR) + -rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-aminfo \ maintainer-clean-generic maintainer-clean-vti diff --git a/js/src/ctypes/libffi/README b/js/src/ctypes/libffi/README index 167de424619c..1ed0ca552be9 100644 --- a/js/src/ctypes/libffi/README +++ b/js/src/ctypes/libffi/README @@ -75,6 +75,7 @@ tested: | X86 | Linux | | X86 | Mac OSX | | X86 | OpenBSD | +| X86 | OS/2 | | X86 | Solaris | | X86 | Windows/Cygwin | | X86 | Windows/MingW | @@ -113,9 +114,13 @@ It's also possible to build libffi on Windows platforms with Microsoft's Visual C++ compiler. In this case, use the msvcc.sh wrapper script during configuration like so: -path/to/configure --enable-shared --enable-static \ - CC=path/to/msvcc.sh LD=link \ - CPP=\"cl -nologo -EP\" +path/to/configure CC=path/to/msvcc.sh LD=link CPP=\"cl -nologo -EP\" + +For 64-bit Windows builds, use CC="path/to/msvcc.sh -m64". +You may also need to specify --build appropriately. When building with MSVC +under a MingW environment, you may need to remove the line in configure +that sets 'fix_srcfile_path' to a 'cygpath' command. ('cygpath' is not +present in MingW, and is not required when using MingW-style paths.) Configure has many other options. Use "configure --help" to see them all. diff --git a/js/src/ctypes/libffi/aclocal.m4 b/js/src/ctypes/libffi/aclocal.m4 index ecbfb1503341..d5eb6a612fd3 100644 --- a/js/src/ctypes/libffi/aclocal.m4 +++ b/js/src/ctypes/libffi/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, -[m4_warning([this file was generated for autoconf 2.63. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, +[m4_warning([this file was generated for autoconf 2.65. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -7862,15 +7862,15 @@ m4_define([lt_dict_filter], # Generated from ltversion.in. -# serial 3012 ltversion.m4 +# serial 3017 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.6]) -m4_define([LT_PACKAGE_REVISION], [1.3012]) +m4_define([LT_PACKAGE_VERSION], [2.2.6b]) +m4_define([LT_PACKAGE_REVISION], [1.3017]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.6' -macro_revision='1.3012' +[macro_version='2.2.6b' +macro_revision='1.3017' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) @@ -7983,7 +7983,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11], [], +m4_if([$1], [1.11.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -7999,7 +7999,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11])dnl +[AM_AUTOMAKE_VERSION([1.11.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff --git a/js/src/ctypes/libffi/configure b/js/src/ctypes/libffi/configure index 9cccca82b27c..67ccf207b34c 100755 --- a/js/src/ctypes/libffi/configure +++ b/js/src/ctypes/libffi/configure @@ -1,20 +1,24 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for libffi 3.0.10rc0. +# Generated by GNU Autoconf 2.65 for libffi 3.0.10rc0. # # Report bugs to . # +# # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# +# # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -22,23 +26,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -46,7 +42,13 @@ export as_nl as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -57,7 +59,7 @@ else as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -80,13 +82,6 @@ if test "${PATH_SEPARATOR+set}" != set; then } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -96,15 +91,15 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -116,12 +111,16 @@ if test "x$as_myself" = x; then fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -133,7 +132,249 @@ export LC_ALL LANGUAGE=C export LANGUAGE -# Required to use basename. +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes +else + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi + done;; + esac + as_found=false +done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } +IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org and +$0: http://gcc.gnu.org/bugs.html about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + fi + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error + if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -147,8 +388,12 @@ else as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ @@ -168,295 +413,19 @@ $as_echo X/"$0" | } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits -if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes -else - as_have_required=no -fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : -else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - case $as_dir in - /*) - for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" - done;; - esac -done -IFS=$as_save_IFS - - - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi - - - -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell bug-autoconf@gnu.org about your system, - echo including any error possibly output before this message. - echo This can help us improve future autoconf versions. - echo Configuration will now proceed without shell functions. -} - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) sed -n ' p /[$]LINENO/= @@ -473,8 +442,7 @@ test \$exitcode = 0") || { s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the @@ -484,29 +452,18 @@ test \$exitcode = 0") || { exit } - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -536,7 +493,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -555,10 +512,10 @@ else if test -d "$1"; then test -d "$1/."; else - case $1 in + case $1 in #( -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -573,7 +530,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} @@ -722,7 +678,8 @@ fi -exec 7<&0 &1 +test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -740,7 +697,6 @@ cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libffi' @@ -748,6 +704,7 @@ PACKAGE_TARNAME='libffi' PACKAGE_VERSION='3.0.10rc0' PACKAGE_STRING='libffi 3.0.10rc0' PACKAGE_BUGREPORT='http://gcc.gnu.org/bugs.html' +PACKAGE_URL='' # Factoring default headers for most tests. ac_includes_default="\ @@ -791,6 +748,8 @@ LTLIBOBJS LIBOBJS toolexeclibdir toolexecdir +FFI_DEBUG_FALSE +FFI_DEBUG_TRUE TARGETDIR TARGET HAVE_LONG_DOUBLE @@ -825,6 +784,8 @@ POWERPC_AIX_FALSE POWERPC_AIX_TRUE POWERPC_FALSE POWERPC_TRUE +MOXIE_FALSE +MOXIE_TRUE M68K_FALSE M68K_TRUE M32R_FALSE @@ -960,6 +921,7 @@ bindir program_transform_name prefix exec_prefix +PACKAGE_URL PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION @@ -1098,8 +1060,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1125,8 +1086,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1330,8 +1290,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1347,8 +1306,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1378,17 +1336,17 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information." ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1405,15 +1363,13 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { $as_echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1436,8 +1392,7 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1467,11 +1422,9 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { $as_echo "$as_me: error: working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1510,13 +1463,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1648,7 +1599,7 @@ Some influential environment variables: LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CCAS assembler compiler command (defaults to CC) CCASFLAGS assembler compiler flags (defaults to CFLAGS) @@ -1721,21 +1672,556 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF libffi configure 3.0.10rc0 -generated by GNU Autoconf 2.63 +generated by GNU Autoconf 2.65 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_compile + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_func + +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +( cat <<\_ASBOX +## ------------------------------------------- ## +## Report this to http://gcc.gnu.org/bugs.html ## +## ------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_mongrel + +# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES +# -------------------------------------------- +# Tries to find the compile-time value of EXPR in a program that includes +# INCLUDES, setting VAR accordingly. Returns whether the value could be +# computed +ac_fn_c_compute_int () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=0 ac_mid=0 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid; break +else + as_fn_arith $ac_mid + 1 && ac_lo=$as_val + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=-1 ac_mid=-1 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=$ac_mid; break +else + as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + ac_lo= ac_hi= +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid +else + as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in #(( +?*) eval "$3=\$ac_lo"; ac_retval=0 ;; +'') ac_retval=1 ;; +esac + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +static long int longval () { return $2; } +static unsigned long int ulongval () { return $2; } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (($2) < 0) + { + long int i = longval (); + if (i != ($2)) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ($2)) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + echo >>conftest.val; read $3 config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by libffi $as_me 3.0.10rc0, which was -generated by GNU Autoconf 2.63. Invocation command line was +generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -1771,8 +2257,8 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" -done + $as_echo "PATH: $as_dir" + done IFS=$as_save_IFS } >&5 @@ -1809,9 +2295,9 @@ do ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" + as_fn_append ac_configure_args1 " '$ac_arg'" if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else @@ -1827,13 +2313,13 @@ do -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args '$ac_arg'" + as_fn_append ac_configure_args " '$ac_arg'" ;; esac done done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there @@ -1858,13 +2344,13 @@ _ASBOX case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -1936,39 +2422,41 @@ _ASBOX exit $exit_status ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h + # Predefined preprocessor variables. cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION "$PACKAGE_VERSION" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_STRING "$PACKAGE_STRING" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. @@ -1986,8 +2474,8 @@ fi for ac_site_file in "$ac_site_file1" "$ac_site_file2" do test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" @@ -1995,10 +2483,10 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 $as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; @@ -2006,7 +2494,7 @@ $as_echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -2021,11 +2509,11 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; @@ -2035,17 +2523,17 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac @@ -2057,43 +2545,20 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) as_fn_append ac_configure_args " '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi - - - - - - - - - - - - - - - - - - - - - - - - +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -2107,24 +2572,16 @@ ac_config_headers="$ac_config_headers fficonfig.h" ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi + for ac_t in install-sh install.sh shtool; do + if test -f "$ac_dir/$ac_t"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/$ac_t -c" + break 2 + fi + done done if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2138,35 +2595,27 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ $as_echo "$as_me:$LINENO: checking build system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then +if test "${ac_cv_build+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -$as_echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2182,28 +2631,24 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking host system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then +if test "${ac_cv_host+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -$as_echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2219,28 +2664,24 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking target system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 $as_echo_n "checking target system type... " >&6; } -if test "${ac_cv_target+set}" = set; then +if test "${ac_cv_target+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "x$target_alias" = x; then ac_cv_target=$ac_cv_host else ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 $as_echo "$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 -$as_echo "$as_me: error: invalid value of canonical target" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error "invalid value of canonical target" "$LINENO" 5;; esac target=$ac_cv_target ac_save_IFS=$IFS; IFS='-' @@ -2262,6 +2703,7 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- + target_alias=${target_alias-$host_alias} . ${srcdir}/configure.host @@ -2282,10 +2724,10 @@ am__api_version='1.11' # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then +if test "${ac_cv_path_install+set}" = set; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2293,11 +2735,11 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -2334,7 +2776,7 @@ case $as_dir/ in ;; esac -done + done IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir @@ -2350,7 +2792,7 @@ fi INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 $as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2361,7 +2803,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 @@ -2372,15 +2814,11 @@ am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5 -$as_echo "$as_me: error: unsafe absolute working directory name" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5 -$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2402,11 +2840,8 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "ls -t appears to fail. Make sure there is not a broken +alias in your environment" "$LINENO" 5 fi test "$2" = conftest.file @@ -2415,13 +2850,10 @@ then # Ok. : else - { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -$as_echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" @@ -2449,7 +2881,7 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi @@ -2470,9 +2902,9 @@ if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then +if test "${ac_cv_prog_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2483,24 +2915,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 $as_echo "$STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2510,9 +2942,9 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2523,24 +2955,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 $as_echo "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2549,7 +2981,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -2562,10 +2994,10 @@ fi fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then + if test "${ac_cv_path_mkdir+set}" = set; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2573,7 +3005,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do + for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( @@ -2585,11 +3017,12 @@ do esac done done -done + done IFS=$as_save_IFS fi + test -d ./--version && rmdir ./--version if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else @@ -2597,11 +3030,10 @@ fi # value for MKDIR_P within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version MKDIR_P="$ac_install_sh -d" fi fi -{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" @@ -2614,9 +3046,9 @@ for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then +if test "${ac_cv_prog_AWK+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2627,24 +3059,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:$LINENO: result: $AWK" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 $as_echo "$AWK" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2652,11 +3084,11 @@ fi test -n "$AWK" && break done -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2674,11 +3106,11 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2698,9 +3130,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2761,9 +3191,12 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' # We must force CC to /not/ be precious variables; otherwise # the wrong, non-multilib-adjusted value will be used in multilibs. # As a side effect, we have to subst CFLAGS ourselves. +# Also save and restore CFLAGS, since AC_PROG_CC will come up with +# defaults of its own if none are provided. +save_CFLAGS=$CFLAGS ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2772,9 +3205,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2785,24 +3218,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2812,9 +3245,9 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2825,24 +3258,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2851,7 +3284,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -2865,9 +3298,9 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2878,24 +3311,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2905,9 +3338,9 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2919,18 +3352,18 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -2949,10 +3382,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2964,9 +3397,9 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2977,24 +3410,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3008,9 +3441,9 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3021,24 +3454,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3051,7 +3484,7 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -3062,57 +3495,37 @@ fi fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3128,8 +3541,8 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: @@ -3145,17 +3558,17 @@ do done rm -f $ac_rmfiles -if { (ac_try="$ac_link_default" +if { { ac_try="$ac_link_default" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -3172,7 +3585,7 @@ do # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -3191,84 +3604,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeext= else ac_file='' fi - -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -if test -z "$ac_file"; then - $as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } -fi - -ac_exeext=$ac_cv_exeext - -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } - fi - fi -fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 +{ as_fn_set_status 77 +as_fn_error "C compiler cannot create executables +See \`config.log' for more details." "$LINENO" 5; }; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 $as_echo_n "checking for suffix of executables... " >&6; } -if { (ac_try="$ac_link" +if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -3283,32 +3654,83 @@ for ac_file in conftest.exe conftest conftest.*; do esac done else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." "$LINENO" 5; } fi - -rm -f conftest$ac_cv_exeext -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 $as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then +if test "${ac_cv_objext+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3320,17 +3742,17 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -3343,31 +3765,23 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error "cannot compute suffix of object files: cannot compile +See \`config.log' for more details." "$LINENO" 5; } fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 $as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then +if test "${ac_cv_c_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3381,37 +3795,16 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -3420,20 +3813,16 @@ else fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then +if test "${ac_cv_prog_cc_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3444,35 +3833,11 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3483,36 +3848,12 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3523,42 +3864,17 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -3575,18 +3891,14 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -3643,32 +3955,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -3679,17 +3968,19 @@ fi # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3708,7 +3999,7 @@ am__doit: .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 $as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= @@ -3736,12 +4027,12 @@ if test "$am__include" = "#"; then fi -{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 $as_echo "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then +if test "${enable_dependency_tracking+set}" = set; then : enableval=$enable_dependency_tracking; fi @@ -3761,9 +4052,9 @@ fi depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -3871,7 +4162,7 @@ else fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -3886,6 +4177,7 @@ else fi +CFLAGS=$save_CFLAGS @@ -3900,9 +4192,9 @@ test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS depcc="$CCAS" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then +if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -4008,7 +4300,7 @@ else fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5 $as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; } CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type @@ -4024,22 +4316,18 @@ fi if test "x$CC" != xcc; then - { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 $as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } else - { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 $as_echo_n "checking whether cc understands -c and -o together... " >&6; } fi set dummy $CC; ac_cc=`$as_echo "$2" | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then +if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4055,63 +4343,63 @@ _ACEOF # existing .o file with -o, though they will create one. ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' rm -f conftest2.* -if { (case "(($ac_try" in +if { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - test -f conftest2.$ac_objext && { (case "(($ac_try" in + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && + test -f conftest2.$ac_objext && { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then eval ac_cv_prog_cc_${ac_cc}_c_o=yes if test "x$CC" != xcc; then # Test first that cc exists at all. if { ac_try='cc -c conftest.$ac_ext >&5' - { (case "(($ac_try" in + { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' rm -f conftest2.* - if { (case "(($ac_try" in + if { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - test -f conftest2.$ac_objext && { (case "(($ac_try" in + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && + test -f conftest2.$ac_objext && { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then # cc works too. : @@ -4128,15 +4416,13 @@ rm -f core conftest* fi if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } -cat >>confdefs.h <<\_ACEOF -#define NO_MINUS_C_MINUS_O 1 -_ACEOF +$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h fi @@ -4157,14 +4443,14 @@ fi case `pwd` in *\ * | *\ *) - { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac -macro_version='2.2.6' -macro_revision='1.3012' +macro_version='2.2.6b' +macro_revision='1.3017' @@ -4180,9 +4466,9 @@ macro_revision='1.3012' ltmain="$ac_aux_dir/ltmain.sh" -{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then +if test "${ac_cv_path_SED+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ @@ -4190,7 +4476,7 @@ else ac_script="$ac_script$as_nl$ac_script" done echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - $as_unset ac_script || ac_script= + { ac_script=; unset ac_script;} if test -z "$SED"; then ac_path_SED_found=false # Loop through the user's path and test for each of PROGNAME-LIST @@ -4199,7 +4485,7 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do + for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue @@ -4219,7 +4505,7 @@ case `"$ac_path_SED" --version 2>&1` in $as_echo '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_SED_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_SED="$ac_path_SED" @@ -4234,19 +4520,17 @@ esac $ac_path_SED_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 $as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -4264,9 +4548,9 @@ Xsed="$SED -e 1s/^X//" -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then +if test "${ac_cv_path_GREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -4277,7 +4561,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do + for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue @@ -4297,7 +4581,7 @@ case `"$ac_path_GREP" --version 2>&1` in $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" @@ -4312,26 +4596,24 @@ esac $ac_path_GREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 $as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then +if test "${ac_cv_path_EGREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -4345,7 +4627,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do + for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue @@ -4365,7 +4647,7 @@ case `"$ac_path_EGREP" --version 2>&1` in $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" @@ -4380,12 +4662,10 @@ esac $ac_path_EGREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4393,14 +4673,14 @@ fi fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 $as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 $as_echo_n "checking for fgrep... " >&6; } -if test "${ac_cv_path_FGREP+set}" = set; then +if test "${ac_cv_path_FGREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 @@ -4414,7 +4694,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do + for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue @@ -4434,7 +4714,7 @@ case `"$ac_path_FGREP" --version 2>&1` in $as_echo 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_FGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_FGREP="$ac_path_FGREP" @@ -4449,12 +4729,10 @@ esac $ac_path_FGREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_FGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_FGREP=$FGREP @@ -4462,7 +4740,7 @@ fi fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 $as_echo "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" @@ -4488,7 +4766,7 @@ test -z "$GREP" && GREP=grep # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no @@ -4497,7 +4775,7 @@ fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) @@ -4527,13 +4805,13 @@ $as_echo_n "checking for ld used by $CC... " >&6; } ;; esac elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then +if test "${lt_cv_path_LD+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -4564,18 +4842,16 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - { $as_echo "$as_me:$LINENO: result: $LD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 $as_echo "$LD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then +if test "${lt_cv_prog_gnu_ld+set}" = set; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -4588,7 +4864,7 @@ case `$LD -v 2>&1 &5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -4600,9 +4876,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld -{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if test "${lt_cv_path_NM+set}" = set; then +if test "${lt_cv_path_NM+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$NM"; then @@ -4649,7 +4925,7 @@ else : ${lt_cv_path_NM=no} fi fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" @@ -4660,9 +4936,9 @@ else do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DUMPBIN+set}" = set; then +if test "${ac_cv_prog_DUMPBIN+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then @@ -4673,24 +4949,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then - { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 $as_echo "$DUMPBIN" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4704,9 +4980,9 @@ if test -z "$DUMPBIN"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then +if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then @@ -4717,24 +4993,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 $as_echo "$ac_ct_DUMPBIN" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4747,7 +5023,7 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -4767,44 +5043,44 @@ test -z "$NM" && NM=nm -{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 $as_echo_n "checking the name lister ($NM) interface... " >&6; } -if test "${lt_cv_nm_interface+set}" = set; then +if test "${lt_cv_nm_interface+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4777: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5053: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4780: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5056: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4783: output\"" >&5) + (eval echo "\"\$as_me:5059: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" fi rm -f conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 $as_echo "$lt_cv_nm_interface" >&6; } -{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 $as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 $as_echo "no, using $LN_S" >&6; } fi # find the maximum length of command line arguments -{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 $as_echo_n "checking the maximum length of command line arguments... " >&6; } -if test "${lt_cv_sys_max_cmd_len+set}" = set; then +if test "${lt_cv_sys_max_cmd_len+set}" = set; then : $as_echo_n "(cached) " >&6 else i=0 @@ -4922,10 +5198,10 @@ else fi if test -n $lt_cv_sys_max_cmd_len ; then - { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else - { $as_echo "$as_me:$LINENO: result: none" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 $as_echo "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len @@ -4939,7 +5215,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } # Try some XSI features xsi_shell=no @@ -4949,17 +5225,17 @@ xsi_shell=no && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 $as_echo "$xsi_shell" >&6; } -{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 $as_echo_n "checking whether the shell understands \"+=\"... " >&6; } lt_shell_append=no ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ >/dev/null 2>&1 \ && lt_shell_append=yes -{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 $as_echo "$lt_shell_append" >&6; } @@ -4994,14 +5270,14 @@ esac -{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } -if test "${lt_cv_ld_reload_flag+set}" = set; then +if test "${lt_cv_ld_reload_flag+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_reload_flag='-r' fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 $as_echo "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in @@ -5030,9 +5306,9 @@ esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then +if test "${ac_cv_prog_OBJDUMP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then @@ -5043,24 +5319,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 $as_echo "$OBJDUMP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5070,9 +5346,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then @@ -5083,24 +5359,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 $as_echo "$ac_ct_OBJDUMP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5109,7 +5385,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -5129,9 +5405,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump -{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 $as_echo_n "checking how to recognize dependent libraries... " >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then +if test "${lt_cv_deplibs_check_method+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' @@ -5325,7 +5601,7 @@ tpf*) esac fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method @@ -5345,9 +5621,9 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AR+set}" = set; then +if test "${ac_cv_prog_AR+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$AR"; then @@ -5358,24 +5634,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="${ac_tool_prefix}ar" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { $as_echo "$as_me:$LINENO: result: $AR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 $as_echo "$AR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5385,9 +5661,9 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then @@ -5398,24 +5674,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="ar" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 $as_echo "$ac_ct_AR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5424,7 +5700,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -5450,9 +5726,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then +if test "${ac_cv_prog_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -5463,24 +5739,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 $as_echo "$STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5490,9 +5766,9 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -5503,24 +5779,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 $as_echo "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5529,7 +5805,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -5549,9 +5825,9 @@ test -z "$STRIP" && STRIP=: if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then +if test "${ac_cv_prog_RANLIB+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -5562,24 +5838,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 $as_echo "$RANLIB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5589,9 +5865,9 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -5602,24 +5878,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 $as_echo "$ac_ct_RANLIB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5628,7 +5904,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -5706,9 +5982,9 @@ compiler=$CC # Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then +if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -5824,18 +6100,18 @@ void nm_test_func(void){} int main(){nm_test_var='a';nm_test_func();return(0);} _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s "$nlist"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -5888,11 +6164,11 @@ _LT_EOF lt_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext}; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi LIBS="$lt_save_LIBS" @@ -5926,10 +6202,10 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { $as_echo "$as_me:$LINENO: result: failed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 $as_echo "failed" >&6; } else - { $as_echo "$as_me:$LINENO: result: ok" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } fi @@ -5956,7 +6232,7 @@ fi # Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then +if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi @@ -5968,11 +6244,11 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE="32" @@ -5986,12 +6262,12 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5989 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + echo '#line 6265 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -6025,11 +6301,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *32-bit*) case $host in @@ -6078,9 +6354,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if test "${lt_cv_cc_needs_belf+set}" = set; then +if test "${lt_cv_cc_needs_belf+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_ext=c @@ -6089,11 +6365,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -6104,38 +6376,13 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : lt_cv_cc_needs_belf=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_cc_needs_belf=no + lt_cv_cc_needs_belf=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6143,7 +6390,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf @@ -6153,11 +6400,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in @@ -6183,9 +6430,9 @@ need_locks="$enable_libtool_lock" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then @@ -6196,24 +6443,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 $as_echo "$DSYMUTIL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6223,9 +6470,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then @@ -6236,24 +6483,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 $as_echo "$ac_ct_DSYMUTIL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6262,7 +6509,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6275,9 +6522,9 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_NMEDIT+set}" = set; then +if test "${ac_cv_prog_NMEDIT+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then @@ -6288,24 +6535,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 $as_echo "$NMEDIT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6315,9 +6562,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then @@ -6328,24 +6575,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 $as_echo "$ac_ct_NMEDIT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6354,7 +6601,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6367,9 +6614,9 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_LIPO+set}" = set; then +if test "${ac_cv_prog_LIPO+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then @@ -6380,24 +6627,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 $as_echo "$LIPO" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6407,9 +6654,9 @@ if test -z "$ac_cv_prog_LIPO"; then ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then +if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then @@ -6420,24 +6667,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_LIPO="lipo" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 $as_echo "$ac_ct_LIPO" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6446,7 +6693,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6459,9 +6706,9 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL+set}" = set; then +if test "${ac_cv_prog_OTOOL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then @@ -6472,24 +6719,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then - { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 $as_echo "$OTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6499,9 +6746,9 @@ if test -z "$ac_cv_prog_OTOOL"; then ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then +if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then @@ -6512,24 +6759,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OTOOL="otool" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 $as_echo "$ac_ct_OTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6538,7 +6785,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6551,9 +6798,9 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL64+set}" = set; then +if test "${ac_cv_prog_OTOOL64+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then @@ -6564,24 +6811,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then - { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 $as_echo "$OTOOL64" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6591,9 +6838,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then +if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then @@ -6604,24 +6851,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OTOOL64="otool64" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 $as_echo "$ac_ct_OTOOL64" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6630,7 +6877,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6666,9 +6913,9 @@ fi - { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 $as_echo_n "checking for -single_module linker flag... " >&6; } -if test "${lt_cv_apple_cc_single_mod+set}" = set; then +if test "${lt_cv_apple_cc_single_mod+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no @@ -6693,22 +6940,18 @@ else rm -f conftest.* fi fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS echo "_main" > conftest.sym LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -6719,42 +6962,17 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : lt_cv_ld_exported_symbols_list=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_ld_exported_symbols_list=no + lt_cv_ld_exported_symbols_list=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } case $host_os in rhapsody* | darwin1.[012]) @@ -6796,14 +7014,14 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 $as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then + if test "${ac_cv_prog_CPP+set}" = set; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -6818,11 +7036,7 @@ do # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -6831,78 +7045,34 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +if $ac_preproc_ok; then : break fi @@ -6914,7 +7084,7 @@ fi else ac_cv_prog_CPP=$CPP fi -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 $as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -6925,11 +7095,7 @@ do # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -6938,87 +7104,40 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +if $ac_preproc_ok; then : + else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -7028,16 +7147,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then +if test "${ac_cv_header_stdc+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -7052,48 +7167,23 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -7103,18 +7193,14 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -7124,14 +7210,10 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -7158,118 +7240,34 @@ main () return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : +if ac_fn_c_try_run "$LINENO"; then : + else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 $as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi # On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -7279,62 +7277,13 @@ fi done - for ac_header in dlfcn.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_DLFCN_H 1 _ACEOF fi @@ -7354,7 +7303,7 @@ done # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then +if test "${enable_shared+set}" = set; then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; @@ -7385,7 +7334,7 @@ fi # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then +if test "${enable_static+set}" = set; then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -7417,7 +7366,7 @@ fi # Check whether --with-pic was given. -if test "${with_pic+set}" = set; then +if test "${with_pic+set}" = set; then : withval=$with_pic; pic_mode="$withval" else pic_mode=default @@ -7433,7 +7382,7 @@ test -z "$pic_mode" && pic_mode=default # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then +if test "${enable_fast_install+set}" = set; then : enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; @@ -7514,9 +7463,9 @@ if test -n "${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST fi -{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 $as_echo_n "checking for objdir... " >&6; } -if test "${lt_cv_objdir+set}" = set; then +if test "${lt_cv_objdir+set}" = set; then : $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null @@ -7529,7 +7478,7 @@ else fi rmdir .libs 2>/dev/null fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 $as_echo "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir @@ -7622,9 +7571,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -7675,10 +7624,10 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7688,9 +7637,9 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:$LINENO: checking for file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 $as_echo_n "checking for file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -7741,10 +7690,10 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7821,9 +7770,9 @@ lt_prog_compiler_no_builtin_flag= if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' - { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no @@ -7839,11 +7788,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7842: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7791: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7846: \$? = $ac_status" >&5 + echo "$as_me:7795: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7856,7 +7805,7 @@ else $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then @@ -7876,7 +7825,7 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 $as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then @@ -8148,7 +8097,7 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 $as_echo "$lt_prog_compiler_pic" >&6; } @@ -8160,9 +8109,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; } # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no @@ -8178,11 +8127,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8181: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8130: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8185: \$? = $ac_status" >&5 + echo "$as_me:8134: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8195,7 +8144,7 @@ else $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then @@ -8219,9 +8168,9 @@ fi # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works+set}" = set; then +if test "${lt_cv_prog_compiler_static_works+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no @@ -8247,7 +8196,7 @@ else LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then @@ -8262,9 +8211,9 @@ fi - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then +if test "${lt_cv_prog_compiler_c_o+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -8283,11 +8232,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8286: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8235: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8290: \$? = $ac_status" >&5 + echo "$as_me:8239: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8309,7 +8258,7 @@ else $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 $as_echo "$lt_cv_prog_compiler_c_o" >&6; } @@ -8317,9 +8266,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; } - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then +if test "${lt_cv_prog_compiler_c_o+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -8338,11 +8287,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8341: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8290: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8345: \$? = $ac_status" >&5 + echo "$as_me:8294: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8364,7 +8313,7 @@ else $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 $as_echo "$lt_cv_prog_compiler_c_o" >&6; } @@ -8373,7 +8322,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* @@ -8381,10 +8330,10 @@ $as_echo_n "checking if we can lock with hard links... " >&6; } touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi @@ -8397,7 +8346,7 @@ fi - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= @@ -8839,11 +8788,7 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -8854,27 +8799,7 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -8888,16 +8813,9 @@ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpat if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -8910,11 +8828,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -8925,27 +8839,7 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -8959,16 +8853,9 @@ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpat if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -9180,42 +9067,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # implicitly export all symbols. save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat >conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ int foo(void) {} _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' @@ -9471,7 +9332,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ fi fi -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no @@ -9508,16 +9369,16 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } $RM conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then soname=conftest lib=conftest libobjs=conftest.$ac_objext @@ -9531,11 +9392,11 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } libname=conftest lt_save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } then archive_cmds_need_lc=no else @@ -9546,7 +9407,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } cat conftest.err 1>&5 fi $RM conftest* - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 $as_echo "$archive_cmds_need_lc" >&6; } ;; esac @@ -9710,7 +9571,7 @@ esac - { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } if test "$GCC" = yes; then @@ -10132,11 +9993,7 @@ linux* | k*bsd*-gnu) save_libdir=$libdir eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -10147,41 +10004,13 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : shlibpath_overrides_runpath=yes fi - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS libdir=$save_libdir @@ -10396,7 +10225,7 @@ uts4*) dynamic_linker=no ;; esac -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no @@ -10498,7 +10327,7 @@ fi - { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || @@ -10523,7 +10352,7 @@ else # directories. hardcode_action=unsupported fi -{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } if test "$hardcode_action" = relink || @@ -10568,18 +10397,14 @@ else darwin*) # if libdl is installed we need to link against it - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -10597,43 +10422,18 @@ return dlopen (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -10646,106 +10446,18 @@ fi ;; *) - { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 -$as_echo_n "checking for shl_load... " >&6; } -if test "${ac_cv_func_shl_load+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shl_load - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_shl_load || defined __stub___shl_load -choke me -#endif - -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_shl_load=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_shl_load=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -$as_echo "$ac_cv_func_shl_load" >&6; } -if test "x$ac_cv_func_shl_load" = x""yes; then + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +if test "x$ac_cv_func_shl_load" = x""yes; then : lt_cv_dlopen="shl_load" else - { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then +if test "${ac_cv_lib_dld_shl_load+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -10763,145 +10475,32 @@ return shl_load (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dld_shl_load=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_shl_load=no + ac_cv_lib_dld_shl_load=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then +if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else - { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 -$as_echo_n "checking for dlopen... " >&6; } -if test "${ac_cv_func_dlopen+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef dlopen - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_dlopen || defined __stub___dlopen -choke me -#endif - -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_dlopen=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_dlopen=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -$as_echo "$ac_cv_func_dlopen" >&6; } -if test "x$ac_cv_func_dlopen" = x""yes; then + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = x""yes; then : lt_cv_dlopen="dlopen" else - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -10919,57 +10518,28 @@ return dlopen (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then +if test "${ac_cv_lib_svld_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -10987,57 +10557,28 @@ return dlopen (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_svld_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_svld_dlopen=no + ac_cv_lib_svld_dlopen=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then +if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then +if test "${ac_cv_lib_dld_dld_link+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -11055,43 +10596,18 @@ return dld_link (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dld_dld_link=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_dld_link=no + ac_cv_lib_dld_dld_link=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = x""yes; then +if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -11130,9 +10646,9 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 $as_echo_n "checking whether a program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then +if test "${lt_cv_dlopen_self+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -11141,7 +10657,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11144 "configure" +#line 10660 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11200,11 +10716,11 @@ int main () return status; } _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -11221,14 +10737,14 @@ rm -fr conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self_static+set}" = set; then +if test "${lt_cv_dlopen_self_static+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -11237,7 +10753,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11240 "configure" +#line 10756 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11296,11 +10812,11 @@ int main () return status; } _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -11317,7 +10833,7 @@ rm -fr conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 $as_echo "$lt_cv_dlopen_self_static" >&6; } fi @@ -11356,12 +10872,12 @@ fi striplib= old_striplib= -{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 $as_echo_n "checking whether stripping libraries is possible... " >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough @@ -11370,15 +10886,15 @@ else if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi ;; *) - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } ;; esac @@ -11396,12 +10912,12 @@ fi # Report which library types will actually be built - { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 $as_echo "$can_build_shared" >&6; } - { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no @@ -11422,14 +10938,14 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } fi ;; esac - { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 $as_echo "$enable_shared" >&6; } - { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes - { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } @@ -11467,16 +10983,16 @@ CC="$lt_save_CC" -{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then +if test "${enable_maintainer_mode+set}" = set; then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval else USE_MAINTAINER_MODE=no fi - { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 $as_echo "$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= @@ -11490,484 +11006,40 @@ fi - for ac_header in sys/mman.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------- ## -## Report this to http://gcc.gnu.org/bugs.html ## -## ------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_mman_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_SYS_MMAN_H 1 _ACEOF fi done - for ac_func in mmap -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" +if test "x$ac_cv_func_mmap" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_MMAP 1 _ACEOF fi done -if test "${ac_cv_header_sys_mman_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for sys/mman.h" >&5 -$as_echo_n "checking for sys/mman.h... " >&6; } -if test "${ac_cv_header_sys_mman_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_mman_h" >&5 -$as_echo "$ac_cv_header_sys_mman_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking sys/mman.h usability" >&5 -$as_echo_n "checking sys/mman.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking sys/mman.h presence" >&5 -$as_echo_n "checking sys/mman.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: sys/mman.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: sys/mman.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/mman.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: sys/mman.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: sys/mman.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: sys/mman.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/mman.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: sys/mman.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/mman.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: sys/mman.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/mman.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: sys/mman.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/mman.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: sys/mman.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sys/mman.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: sys/mman.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------- ## -## Report this to http://gcc.gnu.org/bugs.html ## -## ------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for sys/mman.h" >&5 -$as_echo_n "checking for sys/mman.h... " >&6; } -if test "${ac_cv_header_sys_mman_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_sys_mman_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_mman_h" >&5 -$as_echo "$ac_cv_header_sys_mman_h" >&6; } - -fi -if test "x$ac_cv_header_sys_mman_h" = x""yes; then +ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_mman_h" = x""yes; then : libffi_header_sys_mman_h=yes else libffi_header_sys_mman_h=no fi -{ $as_echo "$as_me:$LINENO: checking for mmap" >&5 -$as_echo_n "checking for mmap... " >&6; } -if test "${ac_cv_func_mmap+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define mmap to an innocuous variant, in case declares mmap. - For example, HP-UX 11i declares gettimeofday. */ -#define mmap innocuous_mmap - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char mmap (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef mmap - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char mmap (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_mmap || defined __stub___mmap -choke me -#endif - -int -main () -{ -return mmap (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_mmap=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_mmap=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap" >&5 -$as_echo "$ac_cv_func_mmap" >&6; } -if test "x$ac_cv_func_mmap" = x""yes; then +ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" +if test "x$ac_cv_func_mmap" = x""yes; then : libffi_func_mmap=yes else libffi_func_mmap=no @@ -11979,9 +11051,9 @@ if test "$libffi_header_sys_mman_h" != yes \ ac_cv_func_mmap_dev_zero=no ac_cv_func_mmap_anon=no else - { $as_echo "$as_me:$LINENO: checking whether read-only mmap of a plain file works" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether read-only mmap of a plain file works" >&5 $as_echo_n "checking whether read-only mmap of a plain file works... " >&6; } -if test "${ac_cv_func_mmap_file+set}" = set; then +if test "${ac_cv_func_mmap_file+set}" = set; then : $as_echo_n "(cached) " >&6 else # Add a system to this blacklist if @@ -11996,11 +11068,11 @@ else ac_cv_func_mmap_file=yes;; esac fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_file" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_file" >&5 $as_echo "$ac_cv_func_mmap_file" >&6; } - { $as_echo "$as_me:$LINENO: checking whether mmap from /dev/zero works" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mmap from /dev/zero works" >&5 $as_echo_n "checking whether mmap from /dev/zero works... " >&6; } -if test "${ac_cv_func_mmap_dev_zero+set}" = set; then +if test "${ac_cv_func_mmap_dev_zero+set}" = set; then : $as_echo_n "(cached) " >&6 else # Add a system to this blacklist if it has mmap() but /dev/zero @@ -12020,20 +11092,16 @@ else ac_cv_func_mmap_dev_zero=yes;; esac fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_dev_zero" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_dev_zero" >&5 $as_echo "$ac_cv_func_mmap_dev_zero" >&6; } # Unlike /dev/zero, the MAP_ANON(YMOUS) defines can be probed for. - { $as_echo "$as_me:$LINENO: checking for MAP_ANON(YMOUS)" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MAP_ANON(YMOUS)" >&5 $as_echo_n "checking for MAP_ANON(YMOUS)... " >&6; } -if test "${ac_cv_decl_map_anon+set}" = set; then +if test "${ac_cv_decl_map_anon+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -12051,43 +11119,22 @@ int n = MAP_ANONYMOUS; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_decl_map_anon=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_decl_map_anon=no + ac_cv_decl_map_anon=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_decl_map_anon" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_map_anon" >&5 $as_echo "$ac_cv_decl_map_anon" >&6; } if test $ac_cv_decl_map_anon = no; then ac_cv_func_mmap_anon=no else - { $as_echo "$as_me:$LINENO: checking whether mmap with MAP_ANON(YMOUS) works" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mmap with MAP_ANON(YMOUS) works" >&5 $as_echo_n "checking whether mmap with MAP_ANON(YMOUS) works... " >&6; } -if test "${ac_cv_func_mmap_anon+set}" = set; then +if test "${ac_cv_func_mmap_anon+set}" = set; then : $as_echo_n "(cached) " >&6 else # Add a system to this blacklist if it has mmap() and MAP_ANON or @@ -12102,30 +11149,24 @@ else ac_cv_func_mmap_anon=yes;; esac fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_anon" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_anon" >&5 $as_echo "$ac_cv_func_mmap_anon" >&6; } fi fi if test $ac_cv_func_mmap_file = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_MMAP_FILE 1 -_ACEOF +$as_echo "#define HAVE_MMAP_FILE 1" >>confdefs.h fi if test $ac_cv_func_mmap_dev_zero = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_MMAP_DEV_ZERO 1 -_ACEOF +$as_echo "#define HAVE_MMAP_DEV_ZERO 1" >>confdefs.h fi if test $ac_cv_func_mmap_anon = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_MMAP_ANON 1 -_ACEOF +$as_echo "#define HAVE_MMAP_ANON 1" >>confdefs.h fi @@ -12143,7 +11184,7 @@ TARGETDIR="unknown" case "$host" in alpha*-*-*) TARGET=ALPHA; TARGETDIR=alpha; - # Support 128-bit long double, changable via command-line switch. + # Support 128-bit long double, changeable via command-line switch. HAVE_LONG_DOUBLE='defined(__LONG_DOUBLE_128__)' ;; @@ -12220,6 +11261,10 @@ case "$host" in TARGET=MIPS; TARGETDIR=mips ;; + moxie-*-*) + TARGET=MOXIE; TARGETDIR=moxie + ;; + powerpc*-*-linux* | powerpc-*-sysv*) TARGET=POWERPC; TARGETDIR=powerpc ;; @@ -12271,9 +11316,7 @@ esac if test $TARGETDIR = unknown; then - { { $as_echo "$as_me:$LINENO: error: \"libffi has not been ported to $host.\"" >&5 -$as_echo "$as_me: error: \"libffi has not been ported to $host.\"" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "\"libffi has not been ported to $host.\"" "$LINENO" 5 fi if test x$TARGET = xMIPS; then @@ -12364,6 +11407,14 @@ else M68K_FALSE= fi + if test x$TARGET = xMOXIE; then + MOXIE_TRUE= + MOXIE_FALSE='#' +else + MOXIE_TRUE='#' + MOXIE_FALSE= +fi + if test x$TARGET = xPOWERPC; then POWERPC_TRUE= POWERPC_FALSE='#' @@ -12485,16 +11536,12 @@ else fi -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then +if test "${ac_cv_header_stdc+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -12509,48 +11556,23 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -12560,18 +11582,14 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -12581,14 +11599,10 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -12615,150 +11629,31 @@ main () return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : +if ac_fn_c_try_run "$LINENO"; then : + else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 $as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi - for ac_func in memcpy -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + ac_fn_c_check_func "$LINENO" "memcpy" "ac_cv_func_memcpy" +if test "x$ac_cv_func_memcpy" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_MEMCPY 1 _ACEOF fi @@ -12766,16 +11661,12 @@ done # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 $as_echo_n "checking for working alloca.h... " >&6; } -if test "${ac_cv_working_alloca_h+set}" = set; then +if test "${ac_cv_working_alloca_h+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -12787,59 +11678,28 @@ char *p = (char *) alloca (2 * sizeof (int)); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_working_alloca_h=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_working_alloca_h=no + ac_cv_working_alloca_h=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 $as_echo "$ac_cv_working_alloca_h" >&6; } if test $ac_cv_working_alloca_h = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_ALLOCA_H 1 -_ACEOF +$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h fi -{ $as_echo "$as_me:$LINENO: checking for alloca" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 $as_echo_n "checking for alloca... " >&6; } -if test "${ac_cv_func_alloca_works+set}" = set; then +if test "${ac_cv_func_alloca_works+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __GNUC__ # define alloca __builtin_alloca @@ -12871,47 +11731,20 @@ char *p = (char *) alloca (1); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_func_alloca_works=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_alloca_works=no + ac_cv_func_alloca_works=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 $as_echo "$ac_cv_func_alloca_works" >&6; } if test $ac_cv_func_alloca_works = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_ALLOCA 1 -_ACEOF +$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h else # The SVR3 libPW and SVR4 libucb both contain incompatible functions @@ -12921,21 +11754,15 @@ else ALLOCA=\${LIBOBJDIR}alloca.$ac_objext -cat >>confdefs.h <<\_ACEOF -#define C_ALLOCA 1 -_ACEOF +$as_echo "#define C_ALLOCA 1" >>confdefs.h -{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } -if test "${ac_cv_os_cray+set}" = set; then +if test "${ac_cv_os_cray+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if defined CRAY && ! defined CRAY2 webecray @@ -12945,7 +11772,7 @@ wenotbecray _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "webecray" >/dev/null 2>&1; then + $EGREP "webecray" >/dev/null 2>&1; then : ac_cv_os_cray=yes else ac_cv_os_cray=no @@ -12953,101 +11780,14 @@ fi rm -f conftest* fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5 $as_echo "$ac_cv_os_cray" >&6; } if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define CRAY_STACKSEG_END $ac_func @@ -13059,19 +11799,15 @@ fi done fi -{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 $as_echo_n "checking stack direction for C alloca... " >&6; } -if test "${ac_cv_c_stack_direction+set}" = set; then +if test "${ac_cv_c_stack_direction+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_c_stack_direction=0 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -13094,46 +11830,18 @@ main () return find_stack_direction () < 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_c_stack_direction=1 else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_c_stack_direction=-1 + ac_cv_c_stack_direction=-1 fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 $as_echo "$ac_cv_c_stack_direction" >&6; } - cat >>confdefs.h <<_ACEOF #define STACK_DIRECTION $ac_cv_c_stack_direction _ACEOF @@ -13146,352 +11854,27 @@ fi # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:$LINENO: checking size of double" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5 $as_echo_n "checking size of double... " >&6; } -if test "${ac_cv_sizeof_double+set}" = set; then +if test "${ac_cv_sizeof_double+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (double))) >= 0)]; -test_array [0] = 0 + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double" "$ac_includes_default"; then : - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (double))) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (double))) < 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (double))) >= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo= ac_hi= -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (double))) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr '(' $ac_mid ')' + 1` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_sizeof_double=$ac_lo;; -'') if test "$ac_cv_type_double" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + if test "$ac_cv_type_double" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (double) -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (double) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_double=0 - fi ;; -esac -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -static long int longval () { return (long int) (sizeof (double)); } -static unsigned long int ulongval () { return (long int) (sizeof (double)); } -#include -#include -int -main () -{ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (((long int) (sizeof (double))) < 0) - { - long int i = longval (); - if (i != ((long int) (sizeof (double)))) - return 1; - fprintf (f, "%ld", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (double)))) - return 1; - fprintf (f, "%lu", i); - } - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_double=`cat conftest.val` -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -if test "$ac_cv_type_double" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (double) -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (double) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (double) +See \`config.log' for more details." "$LINENO" 5; }; } else ac_cv_sizeof_double=0 fi fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi -rm -f conftest.val -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_double" >&5 $as_echo "$ac_cv_sizeof_double" >&6; } @@ -13505,352 +11888,27 @@ _ACEOF # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:$LINENO: checking size of long double" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long double" >&5 $as_echo_n "checking size of long double... " >&6; } -if test "${ac_cv_sizeof_long_double+set}" = set; then +if test "${ac_cv_sizeof_long_double+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (long double))) >= 0)]; -test_array [0] = 0 + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long double))" "ac_cv_sizeof_long_double" "$ac_includes_default"; then : - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (long double))) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (long double))) < 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (long double))) >= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo= ac_hi= -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (long double))) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr '(' $ac_mid ')' + 1` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_sizeof_long_double=$ac_lo;; -'') if test "$ac_cv_type_long_double" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + if test "$ac_cv_type_long_double" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long double) -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (long double) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_long_double=0 - fi ;; -esac -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -static long int longval () { return (long int) (sizeof (long double)); } -static unsigned long int ulongval () { return (long int) (sizeof (long double)); } -#include -#include -int -main () -{ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (((long int) (sizeof (long double))) < 0) - { - long int i = longval (); - if (i != ((long int) (sizeof (long double)))) - return 1; - fprintf (f, "%ld", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (long double)))) - return 1; - fprintf (f, "%lu", i); - } - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_long_double=`cat conftest.val` -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -if test "$ac_cv_type_long_double" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long double) -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (long double) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (long double) +See \`config.log' for more details." "$LINENO" 5; }; } else ac_cv_sizeof_long_double=0 fi fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi -rm -f conftest.val -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_double" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_double" >&5 $as_echo "$ac_cv_sizeof_long_double" >&6; } @@ -13868,28 +11926,21 @@ if test -z "$HAVE_LONG_DOUBLE"; then if test $ac_cv_sizeof_long_double != 0; then HAVE_LONG_DOUBLE=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_LONG_DOUBLE 1 -_ACEOF +$as_echo "#define HAVE_LONG_DOUBLE 1" >>confdefs.h fi fi fi - - { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if test "${ac_cv_c_bigendian+set}" = set; then +if test "${ac_cv_c_bigendian+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_c_bigendian=unknown # See if we're dealing with a universal compiler. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __APPLE_CC__ not a universal capable compiler @@ -13897,46 +11948,34 @@ cat >>conftest.$ac_ext <<_ACEOF typedef int dummy; _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : # Check for potential -arch flags. It is not universal unless - # there are some -arch flags. Note that *ppc* also matches - # ppc64. This check is also rather less than ideal. - case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #( - *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;; - esac -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - + # there are at least two -arch flags with different values. + ac_arch= + ac_prev= + for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do + if test -n "$ac_prev"; then + case $ac_word in + i?86 | x86_64 | ppc | ppc64) + if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then + ac_arch=$ac_word + else + ac_cv_c_bigendian=universal + break + fi + ;; + esac + ac_prev= + elif test "x$ac_word" = "x-arch"; then + ac_prev=arch + fi + done fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_c_bigendian = unknown; then # See if sys/param.h defines the BYTE_ORDER macro. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -13954,30 +11993,9 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : # It does; now see whether it defined to BIG_ENDIAN or not. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -13993,49 +12011,18 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_bigendian=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_bigendian=no + ac_cv_c_bigendian=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -14050,30 +12037,9 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : # It does; now see whether it defined to _BIG_ENDIAN or not. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -14088,51 +12054,20 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_bigendian=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_bigendian=no + ac_cv_c_bigendian=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # Compile a test program. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : # Try to guess by grepping values from an object file. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; @@ -14158,24 +12093,7 @@ return use_ascii (foo) == use_ebcdic (foo); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ac_cv_c_bigendian=yes fi @@ -14187,20 +12105,10 @@ $as_echo "$ac_try_echo") >&5 ac_cv_c_bigendian=unknown fi fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -14220,82 +12128,44 @@ main () return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_c_bigendian=no else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_c_bigendian=yes + ac_cv_c_bigendian=yes fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 $as_echo "$ac_cv_c_bigendian" >&6; } case $ac_cv_c_bigendian in #( yes) - cat >>confdefs.h <<\_ACEOF -#define WORDS_BIGENDIAN 1 -_ACEOF + $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h ;; #( no) ;; #( universal) -cat >>confdefs.h <<\_ACEOF -#define AC_APPLE_UNIVERSAL_BUILD 1 -_ACEOF +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) - { { $as_echo "$as_me:$LINENO: error: unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -$as_echo "$as_me: error: unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} - { (exit 1); exit 1; }; } ;; + as_fn_error "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac -{ $as_echo "$as_me:$LINENO: checking assembler .cfi pseudo-op support" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler .cfi pseudo-op support" >&5 $as_echo_n "checking assembler .cfi pseudo-op support... " >&6; } -if test "${libffi_cv_as_cfi_pseudo_op+set}" = set; then +if test "${libffi_cv_as_cfi_pseudo_op+set}" = set; then : $as_echo_n "(cached) " >&6 else libffi_cv_as_cfi_pseudo_op=unknown - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ asm (".cfi_startproc\n\t.cfi_endproc"); int @@ -14306,49 +12176,26 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : libffi_cv_as_cfi_pseudo_op=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - libffi_cv_as_cfi_pseudo_op=no + libffi_cv_as_cfi_pseudo_op=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $libffi_cv_as_cfi_pseudo_op" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libffi_cv_as_cfi_pseudo_op" >&5 $as_echo "$libffi_cv_as_cfi_pseudo_op" >&6; } if test "x$libffi_cv_as_cfi_pseudo_op" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_AS_CFI_PSEUDO_OP 1 -_ACEOF +$as_echo "#define HAVE_AS_CFI_PSEUDO_OP 1" >>confdefs.h fi if test x$TARGET = xSPARC; then - { $as_echo "$as_me:$LINENO: checking assembler and linker support unaligned pc related relocs" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler and linker support unaligned pc related relocs" >&5 $as_echo_n "checking assembler and linker support unaligned pc related relocs... " >&6; } -if test "${libffi_cv_as_sparc_ua_pcrel+set}" = set; then +if test "${libffi_cv_as_sparc_ua_pcrel+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -14356,11 +12203,7 @@ else save_LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS -fpic" LDFLAGS="$LDFLAGS -shared" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ asm (".text; foo: nop; .data; .align 4; .byte 0; .uaword %r_disp32(foo); .text"); int @@ -14371,64 +12214,33 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : libffi_cv_as_sparc_ua_pcrel=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - libffi_cv_as_sparc_ua_pcrel=no + libffi_cv_as_sparc_ua_pcrel=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CFLAGS="$save_CFLAGS" LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:$LINENO: result: $libffi_cv_as_sparc_ua_pcrel" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libffi_cv_as_sparc_ua_pcrel" >&5 $as_echo "$libffi_cv_as_sparc_ua_pcrel" >&6; } if test "x$libffi_cv_as_sparc_ua_pcrel" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_AS_SPARC_UA_PCREL 1 -_ACEOF +$as_echo "#define HAVE_AS_SPARC_UA_PCREL 1" >>confdefs.h fi - { $as_echo "$as_me:$LINENO: checking assembler .register pseudo-op support" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler .register pseudo-op support" >&5 $as_echo_n "checking assembler .register pseudo-op support... " >&6; } -if test "${libffi_cv_as_register_pseudo_op+set}" = set; then +if test "${libffi_cv_as_register_pseudo_op+set}" = set; then : $as_echo_n "(cached) " >&6 else libffi_cv_as_register_pseudo_op=unknown # Check if we have .register - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ asm (".register %g2, #scratch"); int @@ -14439,67 +12251,112 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : libffi_cv_as_register_pseudo_op=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - libffi_cv_as_register_pseudo_op=no + libffi_cv_as_register_pseudo_op=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $libffi_cv_as_register_pseudo_op" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libffi_cv_as_register_pseudo_op" >&5 $as_echo "$libffi_cv_as_register_pseudo_op" >&6; } if test "x$libffi_cv_as_register_pseudo_op" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_AS_REGISTER_PSEUDO_OP 1 -_ACEOF +$as_echo "#define HAVE_AS_REGISTER_PSEUDO_OP 1" >>confdefs.h fi fi if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64; then - { $as_echo "$as_me:$LINENO: checking assembler supports pc related relocs" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler supports pc related relocs" >&5 $as_echo_n "checking assembler supports pc related relocs... " >&6; } -if test "${libffi_cv_as_x86_pcrel+set}" = set; then +if test "${libffi_cv_as_x86_pcrel+set}" = set; then : $as_echo_n "(cached) " >&6 else libffi_cv_as_x86_pcrel=yes echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s - if $CC $CFLAGS -c conftest.s 2>&1 | grep -i warning > /dev/null; then + if $CC $CFLAGS -c conftest.s 2>&1 | $EGREP -i 'illegal|warning' > /dev/null; then libffi_cv_as_x86_pcrel=no fi fi -{ $as_echo "$as_me:$LINENO: result: $libffi_cv_as_x86_pcrel" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libffi_cv_as_x86_pcrel" >&5 $as_echo "$libffi_cv_as_x86_pcrel" >&6; } if test "x$libffi_cv_as_x86_pcrel" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_AS_X86_PCREL 1 +$as_echo "#define HAVE_AS_X86_PCREL 1" >>confdefs.h + + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler .ascii pseudo-op support" >&5 +$as_echo_n "checking assembler .ascii pseudo-op support... " >&6; } +if test "${libffi_cv_as_ascii_pseudo_op+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + libffi_cv_as_ascii_pseudo_op=unknown + # Check if we have .ascii + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +asm (".ascii \"string\""); +int +main () +{ + + ; + return 0; +} _ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + libffi_cv_as_ascii_pseudo_op=yes +else + libffi_cv_as_ascii_pseudo_op=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libffi_cv_as_ascii_pseudo_op" >&5 +$as_echo "$libffi_cv_as_ascii_pseudo_op" >&6; } + if test "x$libffi_cv_as_ascii_pseudo_op" = xyes; then + +$as_echo "#define HAVE_AS_ASCII_PSEUDO_OP 1" >>confdefs.h + + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler .string pseudo-op support" >&5 +$as_echo_n "checking assembler .string pseudo-op support... " >&6; } +if test "${libffi_cv_as_string_pseudo_op+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + libffi_cv_as_string_pseudo_op=unknown + # Check if we have .string + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +asm (".string \"string\""); +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + libffi_cv_as_string_pseudo_op=yes +else + libffi_cv_as_string_pseudo_op=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libffi_cv_as_string_pseudo_op" >&5 +$as_echo "$libffi_cv_as_string_pseudo_op" >&6; } + if test "x$libffi_cv_as_string_pseudo_op" = xyes; then + +$as_echo "#define HAVE_AS_STRING_PSEUDO_OP 1" >>confdefs.h fi fi @@ -14507,16 +12364,37 @@ fi case "$target" in *-apple-darwin10* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*) -cat >>confdefs.h <<\_ACEOF -#define FFI_MMAP_EXEC_WRIT 1 -_ACEOF +$as_echo "#define FFI_MMAP_EXEC_WRIT 1" >>confdefs.h ;; esac -{ $as_echo "$as_me:$LINENO: checking whether .eh_frame section should be read-only" >&5 +if test x$TARGET = xX86_64; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler supports unwind section type" >&5 +$as_echo_n "checking assembler supports unwind section type... " >&6; } +if test "${libffi_cv_as_x86_64_unwind_section_type+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + libffi_cv_as_x86_64_unwind_section_type=yes + echo '.section .eh_frame,"a",@unwind' > conftest.s + if $CC $CFLAGS -c conftest.s 2>&1 | grep -i warning > /dev/null; then + libffi_cv_as_x86_64_unwind_section_type=no + fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libffi_cv_as_x86_64_unwind_section_type" >&5 +$as_echo "$libffi_cv_as_x86_64_unwind_section_type" >&6; } + if test "x$libffi_cv_as_x86_64_unwind_section_type" = xyes; then + +$as_echo "#define HAVE_AS_X86_64_UNWIND_SECTION_TYPE 1" >>confdefs.h + + fi +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether .eh_frame section should be read-only" >&5 $as_echo_n "checking whether .eh_frame section should be read-only... " >&6; } -if test "${libffi_cv_ro_eh_frame+set}" = set; then +if test "${libffi_cv_ro_eh_frame+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -14533,41 +12411,35 @@ else rm -f conftest.* fi -{ $as_echo "$as_me:$LINENO: result: $libffi_cv_ro_eh_frame" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libffi_cv_ro_eh_frame" >&5 $as_echo "$libffi_cv_ro_eh_frame" >&6; } if test "x$libffi_cv_ro_eh_frame" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_RO_EH_FRAME 1 -_ACEOF +$as_echo "#define HAVE_RO_EH_FRAME 1" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define EH_FRAME_FLAGS "a" -_ACEOF +$as_echo "#define EH_FRAME_FLAGS \"a\"" >>confdefs.h else -cat >>confdefs.h <<\_ACEOF -#define EH_FRAME_FLAGS "aw" -_ACEOF +$as_echo "#define EH_FRAME_FLAGS \"aw\"" >>confdefs.h fi -{ $as_echo "$as_me:$LINENO: checking for __attribute__((visibility(\"hidden\")))" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((visibility(\"hidden\")))" >&5 $as_echo_n "checking for __attribute__((visibility(\"hidden\")))... " >&6; } -if test "${libffi_cv_hidden_visibility_attribute+set}" = set; then +if test "${libffi_cv_hidden_visibility_attribute+set}" = set; then : $as_echo_n "(cached) " >&6 else echo 'int __attribute__ ((visibility ("hidden"))) foo (void) { return 1; }' > conftest.c libffi_cv_hidden_visibility_attribute=no if { ac_try='${CC-cc} -Werror -S conftest.c -o conftest.s 1>&5' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 (eval $ac_try) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then if grep '\.hidden.*foo' conftest.s >/dev/null; then libffi_cv_hidden_visibility_attribute=yes fi @@ -14575,13 +12447,11 @@ else rm -f conftest.* fi -{ $as_echo "$as_me:$LINENO: result: $libffi_cv_hidden_visibility_attribute" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libffi_cv_hidden_visibility_attribute" >&5 $as_echo "$libffi_cv_hidden_visibility_attribute" >&6; } if test $libffi_cv_hidden_visibility_attribute = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_HIDDEN_VISIBILITY_ATTRIBUTE 1 -_ACEOF +$as_echo "#define HAVE_HIDDEN_VISIBILITY_ATTRIBUTE 1" >>confdefs.h fi @@ -14592,50 +12462,49 @@ fi - # Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then +if test "${enable_debug+set}" = set; then : enableval=$enable_debug; if test "$enable_debug" = "yes"; then -cat >>confdefs.h <<\_ACEOF -#define FFI_DEBUG 1 -_ACEOF +$as_echo "#define FFI_DEBUG 1" >>confdefs.h fi fi + if test "$enable_debug" = "yes"; then + FFI_DEBUG_TRUE= + FFI_DEBUG_FALSE='#' +else + FFI_DEBUG_TRUE='#' + FFI_DEBUG_FALSE= +fi + # Check whether --enable-structs was given. -if test "${enable_structs+set}" = set; then +if test "${enable_structs+set}" = set; then : enableval=$enable_structs; if test "$enable_structs" = "no"; then -cat >>confdefs.h <<\_ACEOF -#define FFI_NO_STRUCTS 1 -_ACEOF +$as_echo "#define FFI_NO_STRUCTS 1" >>confdefs.h fi fi # Check whether --enable-raw-api was given. -if test "${enable_raw_api+set}" = set; then +if test "${enable_raw_api+set}" = set; then : enableval=$enable_raw_api; if test "$enable_raw_api" = "no"; then -cat >>confdefs.h <<\_ACEOF -#define FFI_NO_RAW_API 1 -_ACEOF +$as_echo "#define FFI_NO_RAW_API 1" >>confdefs.h fi fi # Check whether --enable-purify-safety was given. -if test "${enable_purify_safety+set}" = set; then +if test "${enable_purify_safety+set}" = set; then : enableval=$enable_purify_safety; if test "$enable_purify_safety" = "yes"; then -cat >>confdefs.h <<\_ACEOF -#define USING_PURIFY 1 -_ACEOF +$as_echo "#define USING_PURIFY 1" >>confdefs.h fi fi @@ -14701,13 +12570,13 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -14715,8 +12584,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" @@ -14739,11 +12608,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && - { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi @@ -14763,8 +12632,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -14780,231 +12649,147 @@ else fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCCAS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"am__fastdepCCAS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${TESTSUBDIR_TRUE}" && test -z "${TESTSUBDIR_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"TESTSUBDIR\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"TESTSUBDIR\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"TESTSUBDIR\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MIPS_TRUE}" && test -z "${MIPS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MIPS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MIPS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"MIPS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${SPARC_TRUE}" && test -z "${SPARC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"SPARC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"SPARC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"SPARC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${X86_TRUE}" && test -z "${X86_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"X86\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"X86\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"X86\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${X86_FREEBSD_TRUE}" && test -z "${X86_FREEBSD_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"X86_FREEBSD\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"X86_FREEBSD\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"X86_FREEBSD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${X86_WIN32_TRUE}" && test -z "${X86_WIN32_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"X86_WIN32\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"X86_WIN32\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"X86_WIN32\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${X86_WIN64_TRUE}" && test -z "${X86_WIN64_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"X86_WIN64\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"X86_WIN64\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"X86_WIN64\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${X86_DARWIN_TRUE}" && test -z "${X86_DARWIN_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"X86_DARWIN\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"X86_DARWIN\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"X86_DARWIN\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ALPHA_TRUE}" && test -z "${ALPHA_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"ALPHA\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"ALPHA\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"ALPHA\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${IA64_TRUE}" && test -z "${IA64_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"IA64\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"IA64\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"IA64\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${M32R_TRUE}" && test -z "${M32R_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"M32R\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"M32R\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"M32R\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${M68K_TRUE}" && test -z "${M68K_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"M68K\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"M68K\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"M68K\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${MOXIE_TRUE}" && test -z "${MOXIE_FALSE}"; then + as_fn_error "conditional \"MOXIE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${POWERPC_TRUE}" && test -z "${POWERPC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"POWERPC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"POWERPC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"POWERPC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${POWERPC_AIX_TRUE}" && test -z "${POWERPC_AIX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"POWERPC_AIX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"POWERPC_AIX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"POWERPC_AIX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${POWERPC_DARWIN_TRUE}" && test -z "${POWERPC_DARWIN_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"POWERPC_DARWIN\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"POWERPC_DARWIN\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"POWERPC_DARWIN\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${POWERPC_FREEBSD_TRUE}" && test -z "${POWERPC_FREEBSD_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"POWERPC_FREEBSD\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"POWERPC_FREEBSD\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"POWERPC_FREEBSD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ARM_TRUE}" && test -z "${ARM_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"ARM\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"ARM\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"ARM\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${AVR32_TRUE}" && test -z "${AVR32_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"AVR32\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"AVR32\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"AVR32\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${LIBFFI_CRIS_TRUE}" && test -z "${LIBFFI_CRIS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"LIBFFI_CRIS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"LIBFFI_CRIS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"LIBFFI_CRIS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${FRV_TRUE}" && test -z "${FRV_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"FRV\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"FRV\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"FRV\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${S390_TRUE}" && test -z "${S390_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"S390\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"S390\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"S390\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${X86_64_TRUE}" && test -z "${X86_64_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"X86_64\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"X86_64\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"X86_64\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${SH_TRUE}" && test -z "${SH_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"SH\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"SH\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"SH\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${SH64_TRUE}" && test -z "${SH64_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"SH64\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"SH64\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"SH64\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${PA_LINUX_TRUE}" && test -z "${PA_LINUX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"PA_LINUX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"PA_LINUX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"PA_LINUX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${PA_HPUX_TRUE}" && test -z "${PA_HPUX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"PA_HPUX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"PA_HPUX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"PA_HPUX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${PA64_HPUX_TRUE}" && test -z "${PA64_HPUX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"PA64_HPUX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"PA64_HPUX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"PA64_HPUX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${FFI_DEBUG_TRUE}" && test -z "${FFI_DEBUG_FALSE}"; then + as_fn_error "conditional \"FFI_DEBUG\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -15014,17 +12799,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -15032,23 +12818,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -15056,7 +12834,13 @@ export as_nl as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -15067,7 +12851,7 @@ else as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -15090,13 +12874,6 @@ if test "${PATH_SEPARATOR+set}" != set; then } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -15106,15 +12883,15 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -15126,12 +12903,16 @@ if test "x$as_myself" = x; then fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -15143,7 +12924,89 @@ export LC_ALL LANGUAGE=C export LANGUAGE -# Required to use basename. +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + fi + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -15157,8 +13020,12 @@ else as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ @@ -15178,76 +13045,25 @@ $as_echo X/"$0" | } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -15276,8 +13092,56 @@ fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -15296,10 +13160,10 @@ else if test -d "$1"; then test -d "$1/."; else - case $1 in + case $1 in #( -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -15314,13 +13178,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" This file was extended by libffi $as_me 3.0.10rc0, which was -generated by GNU Autoconf 2.63. Invocation command line was +generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -15353,13 +13223,15 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTION]... [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit + --config print configuration, then exit -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files @@ -15381,16 +13253,17 @@ $config_links Configuration commands: $config_commands -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ libffi config.status 3.0.10rc0 -configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.65, + with options \\"\$ac_cs_config\\" -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -15426,6 +13299,8 @@ do ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) @@ -15433,20 +13308,19 @@ do case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" + as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - { $as_echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; + as_fn_error "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ @@ -15454,11 +13328,10 @@ Try \`$0 --help' for more information." >&2 ac_cs_silent=: ;; # This is an error. - -*) { $as_echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; + -*) as_fn_error "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" + *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -15778,9 +13651,7 @@ do "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; "libffi.pc") CONFIG_FILES="$CONFIG_FILES libffi.pc" ;; - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -15808,7 +13679,7 @@ $debug || trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap 'as_fn_exit 1' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. @@ -15819,11 +13690,7 @@ $debug || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || -{ - $as_echo "$as_me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -15831,10 +13698,16 @@ $debug || if test -n "$CONFIG_FILES"; then -ac_cr=' ' +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' + ac_cs_awk_cr='\r' else ac_cs_awk_cr=$ac_cr fi @@ -15848,24 +13721,18 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -15887,7 +13754,7 @@ s/'"$ac_delim"'$// t delim :nl h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p @@ -15901,7 +13768,7 @@ s/.\{148\}// t nl :delim h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p @@ -15954,9 +13821,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -$as_echo "$as_me: error: could not setup config files machinery" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error "could not setup config files machinery" "$LINENO" 5 _ACEOF # VPATH may cause trouble with some makes, so we remove $(srcdir), @@ -15997,9 +13862,7 @@ for ac_last_try in false false :; do if test -z "$ac_t"; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -16084,9 +13947,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 -$as_echo "$as_me: error: could not setup config headers machinery" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -16099,9 +13960,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} - { (exit 1); exit 1; }; };; + :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -16129,12 +13988,10 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;} [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - ac_file_inputs="$ac_file_inputs '$ac_f'" + as_fn_append ac_file_inputs " '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't @@ -16145,7 +14002,7 @@ $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. @@ -16158,9 +14015,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } ;; + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -16188,47 +14043,7 @@ $as_echo X"$ac_file" | q } s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in @@ -16285,7 +14100,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= - ac_sed_dataroot=' /datarootdir/ { p @@ -16295,12 +14109,11 @@ ac_sed_dataroot=' /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' +/@mandir@/p' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -16310,7 +14123,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF @@ -16339,14 +14152,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} @@ -16356,9 +14167,7 @@ which seems to be undefined. Please make sure it is defined." >&2;} -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -16369,25 +14178,19 @@ $as_echo "$as_me: error: could not create $ac_file" >&2;} $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 -$as_echo "$as_me: error: could not create -" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -16437,13 +14240,11 @@ $as_echo X"$_am_arg" | ac_source=$srcdir/$ac_source fi - { $as_echo "$as_me:$LINENO: linking $ac_source to $ac_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5 $as_echo "$as_me: linking $ac_source to $ac_file" >&6;} if test ! -r "$ac_source"; then - { { $as_echo "$as_me:$LINENO: error: $ac_source: file not found" >&5 -$as_echo "$as_me: error: $ac_source: file not found" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "$ac_source: file not found" "$LINENO" 5 fi rm -f "$ac_file" @@ -16455,12 +14256,10 @@ $as_echo "$as_me: error: $ac_source: file not found" >&2;} ln -s "$ac_rel_source" "$ac_file" 2>/dev/null || ln "$ac_source" "$ac_file" 2>/dev/null || cp -p "$ac_source" "$ac_file" || - { { $as_echo "$as_me:$LINENO: error: cannot link or copy $ac_source to $ac_file" >&5 -$as_echo "$as_me: error: cannot link or copy $ac_source to $ac_file" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot link or copy $ac_source to $ac_file" "$LINENO" 5 fi ;; - :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -16555,47 +14354,7 @@ $as_echo X"$file" | q } s/.*/./; q'` - { as_dir=$dirpart/$fdir - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir=$dirpart/$fdir; as_fn_mkdir_p # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done @@ -17247,15 +15006,12 @@ test -d src/$TARGETDIR || mkdir src/$TARGETDIR done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -17276,10 +15032,10 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + $ac_cs_success || as_fn_exit $? fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi diff --git a/js/src/ctypes/libffi/configure.ac b/js/src/ctypes/libffi/configure.ac index 83241cdca0dc..50f24bcdf493 100644 --- a/js/src/ctypes/libffi/configure.ac +++ b/js/src/ctypes/libffi/configure.ac @@ -16,10 +16,14 @@ AM_INIT_AUTOMAKE # We must force CC to /not/ be precious variables; otherwise # the wrong, non-multilib-adjusted value will be used in multilibs. # As a side effect, we have to subst CFLAGS ourselves. +# Also save and restore CFLAGS, since AC_PROG_CC will come up with +# defaults of its own if none are provided. m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) m4_define([_AC_ARG_VAR_PRECIOUS],[]) +save_CFLAGS=$CFLAGS AC_PROG_CC +CFLAGS=$save_CFLAGS m4_undefine([_AC_ARG_VAR_PRECIOUS]) m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) @@ -43,7 +47,7 @@ TARGETDIR="unknown" case "$host" in alpha*-*-*) TARGET=ALPHA; TARGETDIR=alpha; - # Support 128-bit long double, changable via command-line switch. + # Support 128-bit long double, changeable via command-line switch. HAVE_LONG_DOUBLE='defined(__LONG_DOUBLE_128__)' ;; @@ -120,6 +124,10 @@ case "$host" in TARGET=MIPS; TARGETDIR=mips ;; + moxie-*-*) + TARGET=MOXIE; TARGETDIR=moxie + ;; + powerpc*-*-linux* | powerpc-*-sysv*) TARGET=POWERPC; TARGETDIR=powerpc ;; @@ -185,6 +193,7 @@ AM_CONDITIONAL(ALPHA, test x$TARGET = xALPHA) AM_CONDITIONAL(IA64, test x$TARGET = xIA64) AM_CONDITIONAL(M32R, test x$TARGET = xM32R) AM_CONDITIONAL(M68K, test x$TARGET = xM68K) +AM_CONDITIONAL(MOXIE, test x$TARGET = xMOXIE) AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC) AM_CONDITIONAL(POWERPC_AIX, test x$TARGET = xPOWERPC_AIX) AM_CONDITIONAL(POWERPC_DARWIN, test x$TARGET = xPOWERPC_DARWIN) @@ -270,7 +279,7 @@ if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64 libffi_cv_as_x86_pcrel, [ libffi_cv_as_x86_pcrel=yes echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s - if $CC $CFLAGS -c conftest.s 2>&1 | grep -i warning > /dev/null; then + if $CC $CFLAGS -c conftest.s 2>&1 | $EGREP -i 'illegal|warning' > /dev/null; then libffi_cv_as_x86_pcrel=no fi ]) @@ -278,6 +287,32 @@ if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64 AC_DEFINE(HAVE_AS_X86_PCREL, 1, [Define if your assembler supports PC relative relocs.]) fi + + AC_CACHE_CHECK([assembler .ascii pseudo-op support], + libffi_cv_as_ascii_pseudo_op, [ + libffi_cv_as_ascii_pseudo_op=unknown + # Check if we have .ascii + AC_TRY_COMPILE([asm (".ascii \"string\"");],, + [libffi_cv_as_ascii_pseudo_op=yes], + [libffi_cv_as_ascii_pseudo_op=no]) + ]) + if test "x$libffi_cv_as_ascii_pseudo_op" = xyes; then + AC_DEFINE(HAVE_AS_ASCII_PSEUDO_OP, 1, + [Define if your assembler supports .ascii.]) + fi + + AC_CACHE_CHECK([assembler .string pseudo-op support], + libffi_cv_as_string_pseudo_op, [ + libffi_cv_as_string_pseudo_op=unknown + # Check if we have .string + AC_TRY_COMPILE([asm (".string \"string\"");],, + [libffi_cv_as_string_pseudo_op=yes], + [libffi_cv_as_string_pseudo_op=no]) + ]) + if test "x$libffi_cv_as_string_pseudo_op" = xyes; then + AC_DEFINE(HAVE_AS_STRING_PSEUDO_OP, 1, + [Define if your assembler supports .string.]) + fi fi case "$target" in @@ -288,6 +323,21 @@ case "$target" in ;; esac +if test x$TARGET = xX86_64; then + AC_CACHE_CHECK([assembler supports unwind section type], + libffi_cv_as_x86_64_unwind_section_type, [ + libffi_cv_as_x86_64_unwind_section_type=yes + echo '.section .eh_frame,"a",@unwind' > conftest.s + if $CC $CFLAGS -c conftest.s 2>&1 | grep -i warning > /dev/null; then + libffi_cv_as_x86_64_unwind_section_type=no + fi + ]) + if test "x$libffi_cv_as_x86_64_unwind_section_type" = xyes; then + AC_DEFINE(HAVE_AS_X86_64_UNWIND_SECTION_TYPE, 1, + [Define if your assembler supports unwind section type.]) + fi +fi + AC_CACHE_CHECK([whether .eh_frame section should be read-only], libffi_cv_ro_eh_frame, [ libffi_cv_ro_eh_frame=no @@ -354,6 +404,7 @@ AC_ARG_ENABLE(debug, if test "$enable_debug" = "yes"; then AC_DEFINE(FFI_DEBUG, 1, [Define this if you want extra debugging.]) fi) +AM_CONDITIONAL(FFI_DEBUG, test "$enable_debug" = "yes") AC_ARG_ENABLE(structs, [ --disable-structs omit code for struct support], diff --git a/js/src/ctypes/libffi/doc/libffi.info b/js/src/ctypes/libffi/doc/libffi.info index 7a8890e6b1d8..449320c0697c 100644 --- a/js/src/ctypes/libffi/doc/libffi.info +++ b/js/src/ctypes/libffi/doc/libffi.info @@ -4,7 +4,7 @@ from ../libffi/doc/libffi.texi. This manual is for Libffi, a portable foreign-function interface library. - Copyright (C) 2008 Red Hat, Inc. + Copyright (C) 2008, 2010 Red Hat, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License as @@ -27,7 +27,7 @@ libffi This manual is for Libffi, a portable foreign-function interface library. - Copyright (C) 2008 Red Hat, Inc. + Copyright (C) 2008, 2010 Red Hat, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License as @@ -89,6 +89,7 @@ File: libffi.info, Node: Using libffi, Next: Missing Features, Prev: Introduc * Types:: libffi type descriptions. * Multiple ABIs:: Different passing styles on one platform. * The Closure API:: Writing a generic function. +* Closure Example:: A closure example.  File: libffi.info, Node: The Basics, Next: Simple Example, Up: Using libffi @@ -146,7 +147,9 @@ To prepare a call interface object, use the function `ffi_prep_cif'. AVALUES is a vector of `void *' pointers that point to the memory locations holding the argument values for a call. If CIF declares that the function has no arguments (i.e., NARGS was 0), then - AVALUES is ignored. + AVALUES is ignored. Note that argument values may be modified by + the callee (for instance, structs passed by value); the burden of + copying pass-by-value arguments is placed on the caller.  File: libffi.info, Node: Simple Example, Next: Types, Prev: The Basics, Up: Using libffi @@ -368,7 +371,7 @@ instance, the x86 platform has both `stdcall' and `fastcall' functions. necessarily platform-specific.  -File: libffi.info, Node: The Closure API, Prev: Multiple ABIs, Up: Using libffi +File: libffi.info, Node: The Closure API, Next: Closure Example, Prev: Multiple ABIs, Up: Using libffi 2.5 The Closure API =================== @@ -443,6 +446,62 @@ closure function: is deprecated, as it cannot handle the need for separate writable and executable addresses. + +File: libffi.info, Node: Closure Example, Prev: The Closure API, Up: Using libffi + +2.6 Closure Example +=================== + +A trivial example that creates a new `puts' by binding `fputs' with +`stdin'. + + #include + #include + + /* Acts like puts with the file given at time of enclosure. */ + void puts_binding(ffi_cif *cif, unsigned int *ret, void* args[], + FILE *stream) + { + *ret = fputs(*(char **)args[0], stream); + } + + int main() + { + ffi_cif cif; + ffi_type *args[1]; + ffi_closure *closure; + + int (*bound_puts)(char *); + int rc; + + /* Allocate closure and bound_puts */ + closure = ffi_closure_alloc(sizeof(ffi_closure), &bound_puts); + + if (closure) + { + /* Initialize the argument info vectors */ + args[0] = &ffi_type_pointer; + + /* Initialize the cif */ + if (ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, + &ffi_type_uint, args) == FFI_OK) + { + /* Initialize the closure, setting stream to stdout */ + if (ffi_prep_closure_loc(closure, &cif, puts_binding, + stdout, bound_puts) == FFI_OK) + { + rc = bound_puts("Hello World!"); + /* rc now holds the result of the call to fputs */ + } + } + } + + /* Deallocate both closure, and bound_puts */ + ffi_closure_free(closure); + + return 0; + } +  File: libffi.info, Node: Missing Features, Next: Index, Prev: Using libffi, Up: Top @@ -480,7 +539,7 @@ Index * closures: The Closure API. (line 13) * FFI: Introduction. (line 31) * ffi_call: The Basics. (line 41) -* ffi_closure_alloca: The Closure API. (line 19) +* ffi_closure_alloc: The Closure API. (line 19) * ffi_closure_free: The Closure API. (line 26) * FFI_CLOSURES: The Closure API. (line 13) * ffi_prep_cif: The Basics. (line 16) @@ -516,18 +575,19 @@ Index  Tag Table: -Node: Top700 -Node: Introduction1436 -Node: Using libffi3072 -Node: The Basics3507 -Node: Simple Example6114 -Node: Types7141 -Node: Primitive Types7424 -Node: Structures9244 -Node: Type Example10104 -Node: Multiple ABIs11327 -Node: The Closure API11698 -Node: Missing Features14618 -Node: Index15111 +Node: Top706 +Node: Introduction1448 +Node: Using libffi3084 +Node: The Basics3570 +Node: Simple Example6356 +Node: Types7383 +Node: Primitive Types7666 +Node: Structures9486 +Node: Type Example10346 +Node: Multiple ABIs11569 +Node: The Closure API11940 +Node: Closure Example14884 +Node: Missing Features16443 +Node: Index16936  End Tag Table diff --git a/js/src/ctypes/libffi/doc/libffi.texi b/js/src/ctypes/libffi/doc/libffi.texi index 9fa5b17c4ecc..5cdd66797742 100644 --- a/js/src/ctypes/libffi/doc/libffi.texi +++ b/js/src/ctypes/libffi/doc/libffi.texi @@ -171,7 +171,9 @@ discarded. @var{avalues} is a vector of @code{void *} pointers that point to the memory locations holding the argument values for a call. If @var{cif} declares that the function has no arguments (i.e., @var{nargs} was 0), -then @var{avalues} is ignored. +then @var{avalues} is ignored. Note that argument values may be +modified by the callee (for instance, structs passed by value); the +burden of copying pass-by-value arguments is placed on the caller. @end defun @@ -438,7 +440,7 @@ require special allocation on platforms that have a non-executable heap. Memory management for closures is handled by a pair of functions: -@findex ffi_closure_alloca +@findex ffi_closure_alloc @defun void *ffi_closure_alloc (size_t @var{size}, void **@var{code}) Allocate a chunk of memory holding @var{size} bytes. This returns a pointer to the writable address, and sets *@var{code} to the diff --git a/js/src/ctypes/libffi/fficonfig.h.in b/js/src/ctypes/libffi/fficonfig.h.in index e03bbf90b275..e012ebba84b0 100644 --- a/js/src/ctypes/libffi/fficonfig.h.in +++ b/js/src/ctypes/libffi/fficonfig.h.in @@ -33,6 +33,9 @@ */ #undef HAVE_ALLOCA_H +/* Define if your assembler supports .ascii. */ +#undef HAVE_AS_ASCII_PSEUDO_OP + /* Define if your assembler supports .cfi_* directives. */ #undef HAVE_AS_CFI_PSEUDO_OP @@ -43,6 +46,12 @@ */ #undef HAVE_AS_SPARC_UA_PCREL +/* Define if your assembler supports .string. */ +#undef HAVE_AS_STRING_PSEUDO_OP + +/* Define if your assembler supports unwind section type. */ +#undef HAVE_AS_X86_64_UNWIND_SECTION_TYPE + /* Define if your assembler supports PC relative relocs. */ #undef HAVE_AS_X86_PCREL diff --git a/js/src/ctypes/libffi/include/Makefile.in b/js/src/ctypes/libffi/include/Makefile.in index 3a55fd41bed6..5e006642bdda 100644 --- a/js/src/ctypes/libffi/include/Makefile.in +++ b/js/src/ctypes/libffi/include/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -133,6 +133,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ diff --git a/js/src/ctypes/libffi/include/ffi.h.in b/js/src/ctypes/libffi/include/ffi.h.in index df7d2cd78b44..92e38c42f2d3 100644 --- a/js/src/ctypes/libffi/include/ffi.h.in +++ b/js/src/ctypes/libffi/include/ffi.h.in @@ -57,7 +57,9 @@ extern "C" { #endif /* Specify which architecture libffi is configured for. */ +#ifndef @TARGET@ #define @TARGET@ +#endif /* ---- System configuration information --------------------------------- */ diff --git a/js/src/ctypes/libffi/ltmain.sh b/js/src/ctypes/libffi/ltmain.sh index 6939dcc4a662..a72f2fd78bfc 100755 --- a/js/src/ctypes/libffi/ltmain.sh +++ b/js/src/ctypes/libffi/ltmain.sh @@ -1,6 +1,6 @@ # Generated from ltmain.m4sh. -# ltmain.sh (GNU libtool) 2.2.6 +# ltmain.sh (GNU libtool) 2.2.6b # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6 +# $progname: (GNU libtool) 2.2.6b # automake: $automake_version # autoconf: $autoconf_version # @@ -73,9 +73,9 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=2.2.6 +VERSION=2.2.6b TIMESTAMP="" -package_revision=1.3012 +package_revision=1.3017 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then diff --git a/js/src/ctypes/libffi/m4/ltversion.m4 b/js/src/ctypes/libffi/m4/ltversion.m4 index b8e154fe6e10..f3c530980244 100644 --- a/js/src/ctypes/libffi/m4/ltversion.m4 +++ b/js/src/ctypes/libffi/m4/ltversion.m4 @@ -9,15 +9,15 @@ # Generated from ltversion.in. -# serial 3012 ltversion.m4 +# serial 3017 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.6]) -m4_define([LT_PACKAGE_REVISION], [1.3012]) +m4_define([LT_PACKAGE_VERSION], [2.2.6b]) +m4_define([LT_PACKAGE_REVISION], [1.3017]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.6' -macro_revision='1.3012' +[macro_version='2.2.6b' +macro_revision='1.3017' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/js/src/ctypes/libffi/man/Makefile.in b/js/src/ctypes/libffi/man/Makefile.in index d50f19d3a53c..290372413930 100644 --- a/js/src/ctypes/libffi/man/Makefile.in +++ b/js/src/ctypes/libffi/man/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -131,6 +131,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ diff --git a/js/src/ctypes/libffi/msvcc.sh b/js/src/ctypes/libffi/msvcc.sh index c73cb15dffc0..dcdbeab16aea 100755 --- a/js/src/ctypes/libffi/msvcc.sh +++ b/js/src/ctypes/libffi/msvcc.sh @@ -42,7 +42,7 @@ # format and translated into something sensible for cl or ml. # -args="-nologo" +args="-nologo -W3" md=-MD cl="cl" ml="ml" @@ -67,13 +67,25 @@ do safeseh= shift 1 ;; + -O0) + args="$args -Od" + shift 1 + ;; -O*) - args="$args $1" + # If we're optimizing, make sure we explicitly turn on some optimizations + # that are implicitly disabled by debug symbols (-Zi). + args="$args $1 -OPT:REF -OPT:ICF -INCREMENTAL:NO" shift 1 ;; -g) - # Can't specify -RTC1 or -Zi in opt. -Gy is ok. Use -OPT:REF? - args="$args -D_DEBUG -RTC1 -Zi" + # Enable debug symbol generation. + args="$args -Zi -DEBUG" + shift 1 + ;; + -DFFI_DEBUG) + # Link against debug CRT and enable runtime error checks. + args="$args -RTC1" + defines="$defines $1" md=-MDd shift 1 ;; @@ -110,8 +122,8 @@ do shift 1 ;; -Wall) - # -Wall on MSVC is overzealous. Use -W3 instead. - args="$args -W3" + # -Wall on MSVC is overzealous, and we already build with -W3. Nothing + # to do here. shift 1 ;; -Werror) diff --git a/js/src/ctypes/libffi/src/arm/ffitarget.h b/js/src/ctypes/libffi/src/arm/ffitarget.h index a9574266954a..eede79f280ab 100644 --- a/js/src/ctypes/libffi/src/arm/ffitarget.h +++ b/js/src/ctypes/libffi/src/arm/ffitarget.h @@ -34,8 +34,8 @@ typedef signed long ffi_sarg; typedef enum ffi_abi { FFI_FIRST_ABI = 0, FFI_SYSV, - FFI_DEFAULT_ABI = FFI_SYSV, - FFI_LAST_ABI = FFI_DEFAULT_ABI + 1 + FFI_LAST_ABI, + FFI_DEFAULT_ABI = FFI_SYSV } ffi_abi; #endif diff --git a/js/src/ctypes/libffi/src/arm/sysv.S b/js/src/ctypes/libffi/src/arm/sysv.S index 4c289c697c75..90643185c7f9 100644 --- a/js/src/ctypes/libffi/src/arm/sysv.S +++ b/js/src/ctypes/libffi/src/arm/sysv.S @@ -74,7 +74,8 @@ #endif #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \ - || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) + || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \ + || defined(__ARM_ARCH_7EM__) # undef __ARM_ARCH__ # define __ARM_ARCH__ 7 #endif diff --git a/js/src/ctypes/libffi/src/avr32/ffitarget.h b/js/src/ctypes/libffi/src/avr32/ffitarget.h index 1c799b1de720..b85d0622575a 100644 --- a/js/src/ctypes/libffi/src/avr32/ffitarget.h +++ b/js/src/ctypes/libffi/src/avr32/ffitarget.h @@ -34,8 +34,8 @@ typedef signed long ffi_sarg; typedef enum ffi_abi { FFI_FIRST_ABI = 0, FFI_SYSV, - FFI_DEFAULT_ABI = FFI_SYSV, - FFI_LAST_ABI = FFI_DEFAULT_ABI + 1 + FFI_LAST_ABI, + FFI_DEFAULT_ABI = FFI_SYSV } ffi_abi; #endif diff --git a/js/src/ctypes/libffi/src/closures.c b/js/src/ctypes/libffi/src/closures.c index f032748bc4a9..8f295dddc3c2 100644 --- a/js/src/ctypes/libffi/src/closures.c +++ b/js/src/ctypes/libffi/src/closures.c @@ -146,7 +146,7 @@ selinux_enabled_check (void) p = strchr (p + 1, ' '); if (p == NULL) break; - if (strncmp (p + 1, "selinuxfs ", 10) != 0) + if (strncmp (p + 1, "selinuxfs ", 10) == 0) { free (buf); fclose (f); diff --git a/js/src/ctypes/libffi/src/cris/ffi.c b/js/src/ctypes/libffi/src/cris/ffi.c index e9c39530c221..f25d7b4c0c0c 100644 --- a/js/src/ctypes/libffi/src/cris/ffi.c +++ b/js/src/ctypes/libffi/src/cris/ffi.c @@ -163,7 +163,7 @@ ffi_prep_cif (ffi_cif * cif, ffi_type **ptr; FFI_ASSERT (cif != NULL); - FFI_ASSERT ((abi > FFI_FIRST_ABI) && (abi <= FFI_DEFAULT_ABI)); + FFI_ASSERT (abi > FFI_FIRST_ABI && abi < FFI_LAST_ABI); cif->abi = abi; cif->arg_types = atypes; diff --git a/js/src/ctypes/libffi/src/cris/ffitarget.h b/js/src/ctypes/libffi/src/cris/ffitarget.h index 4257f10a73cb..0e3705df3c1d 100644 --- a/js/src/ctypes/libffi/src/cris/ffitarget.h +++ b/js/src/ctypes/libffi/src/cris/ffitarget.h @@ -34,8 +34,8 @@ typedef signed long ffi_sarg; typedef enum ffi_abi { FFI_FIRST_ABI = 0, FFI_SYSV, - FFI_DEFAULT_ABI = FFI_SYSV, - FFI_LAST_ABI = FFI_DEFAULT_ABI + 1 + FFI_LAST_ABI, + FFI_DEFAULT_ABI = FFI_SYSV } ffi_abi; #endif diff --git a/js/src/ctypes/libffi/src/dlmalloc.c b/js/src/ctypes/libffi/src/dlmalloc.c index 6e374f947dd5..0fa235af22e3 100644 --- a/js/src/ctypes/libffi/src/dlmalloc.c +++ b/js/src/ctypes/libffi/src/dlmalloc.c @@ -4251,7 +4251,7 @@ void* dlmalloc(size_t bytes) { void dlfree(void* mem) { /* - Consolidate freed chunks with preceeding or succeeding bordering + Consolidate freed chunks with preceding or succeeding bordering free chunks, if they exist, and then place in a bin. Intermixed with special cases for top, dv, mmapped chunks, and usage errors. */ diff --git a/js/src/ctypes/libffi/src/frv/ffitarget.h b/js/src/ctypes/libffi/src/frv/ffitarget.h index 1c319ea94887..4839069dc3e7 100644 --- a/js/src/ctypes/libffi/src/frv/ffitarget.h +++ b/js/src/ctypes/libffi/src/frv/ffitarget.h @@ -35,13 +35,9 @@ typedef signed long ffi_sarg; typedef enum ffi_abi { FFI_FIRST_ABI = 0, - -#ifdef FRV FFI_EABI, - FFI_DEFAULT_ABI = FFI_EABI, -#endif - - FFI_LAST_ABI = FFI_DEFAULT_ABI + 1 + FFI_LAST_ABI, + FFI_DEFAULT_ABI = FFI_EABI } ffi_abi; #endif diff --git a/js/src/ctypes/libffi/src/ia64/ffi.c b/js/src/ctypes/libffi/src/ia64/ffi.c index 3f8fcc5318b6..84b144868ed5 100644 --- a/js/src/ctypes/libffi/src/ia64/ffi.c +++ b/js/src/ctypes/libffi/src/ia64/ffi.c @@ -225,7 +225,7 @@ ffi_prep_cif_machdep(ffi_cif *cif) int flags; /* Adjust cif->bytes to include space for the bits of the ia64_args frame - that preceeds the integer register portion. The estimate that the + that precedes the integer register portion. The estimate that the generic bits did for the argument space required is good enough for the integer component. */ cif->bytes += offsetof(struct ia64_args, gp_regs[0]); diff --git a/js/src/ctypes/libffi/src/ia64/ffitarget.h b/js/src/ctypes/libffi/src/ia64/ffitarget.h index d85c049ba39d..0d2001df716c 100644 --- a/js/src/ctypes/libffi/src/ia64/ffitarget.h +++ b/js/src/ctypes/libffi/src/ia64/ffitarget.h @@ -34,8 +34,8 @@ typedef signed long long ffi_sarg; typedef enum ffi_abi { FFI_FIRST_ABI = 0, FFI_UNIX, /* Linux and all Unix variants use the same conventions */ - FFI_DEFAULT_ABI = FFI_UNIX, - FFI_LAST_ABI = FFI_DEFAULT_ABI + 1 + FFI_LAST_ABI, + FFI_DEFAULT_ABI = FFI_UNIX } ffi_abi; #endif diff --git a/js/src/ctypes/libffi/src/m32r/ffitarget.h b/js/src/ctypes/libffi/src/m32r/ffitarget.h index 6a761f6593a0..2e2ea483334c 100644 --- a/js/src/ctypes/libffi/src/m32r/ffitarget.h +++ b/js/src/ctypes/libffi/src/m32r/ffitarget.h @@ -36,8 +36,8 @@ typedef enum ffi_abi { FFI_FIRST_ABI = 0, FFI_SYSV, - FFI_DEFAULT_ABI = FFI_SYSV, - FFI_LAST_ABI = FFI_DEFAULT_ABI + 1 + FFI_LAST_ABI, + FFI_DEFAULT_ABI = FFI_SYSV } ffi_abi; #endif diff --git a/js/src/ctypes/libffi/src/m68k/ffitarget.h b/js/src/ctypes/libffi/src/m68k/ffitarget.h index 633717bbfa85..3b777ed20b77 100644 --- a/js/src/ctypes/libffi/src/m68k/ffitarget.h +++ b/js/src/ctypes/libffi/src/m68k/ffitarget.h @@ -34,8 +34,8 @@ typedef signed long ffi_sarg; typedef enum ffi_abi { FFI_FIRST_ABI = 0, FFI_SYSV, - FFI_DEFAULT_ABI = FFI_SYSV, - FFI_LAST_ABI = FFI_DEFAULT_ABI + 1 + FFI_LAST_ABI, + FFI_DEFAULT_ABI = FFI_SYSV } ffi_abi; #endif diff --git a/js/src/ctypes/libffi/src/mips/ffitarget.h b/js/src/ctypes/libffi/src/mips/ffitarget.h index c5f4e0568416..d70197c76cb7 100644 --- a/js/src/ctypes/libffi/src/mips/ffitarget.h +++ b/js/src/ctypes/libffi/src/mips/ffitarget.h @@ -186,30 +186,29 @@ typedef enum ffi_abi { FFI_O32_SOFT_FLOAT, FFI_N32_SOFT_FLOAT, FFI_N64_SOFT_FLOAT, + FFI_LAST_ABI, #ifdef FFI_MIPS_O32 #ifdef __mips_soft_float - FFI_DEFAULT_ABI = FFI_O32_SOFT_FLOAT, + FFI_DEFAULT_ABI = FFI_O32_SOFT_FLOAT #else - FFI_DEFAULT_ABI = FFI_O32, + FFI_DEFAULT_ABI = FFI_O32 #endif #else # if _MIPS_SIM==_ABI64 # ifdef __mips_soft_float - FFI_DEFAULT_ABI = FFI_N64_SOFT_FLOAT, + FFI_DEFAULT_ABI = FFI_N64_SOFT_FLOAT # else - FFI_DEFAULT_ABI = FFI_N64, + FFI_DEFAULT_ABI = FFI_N64 # endif # else # ifdef __mips_soft_float - FFI_DEFAULT_ABI = FFI_N32_SOFT_FLOAT, + FFI_DEFAULT_ABI = FFI_N32_SOFT_FLOAT # else - FFI_DEFAULT_ABI = FFI_N32, + FFI_DEFAULT_ABI = FFI_N32 # endif # endif #endif - - FFI_LAST_ABI = FFI_DEFAULT_ABI + 1 } ffi_abi; #define FFI_EXTRA_CIF_FIELDS unsigned rstruct_flag diff --git a/js/src/ctypes/libffi/src/moxie/ffitarget.h b/js/src/ctypes/libffi/src/moxie/ffitarget.h index f5305d1a5f3f..2a9d954413c3 100644 --- a/js/src/ctypes/libffi/src/moxie/ffitarget.h +++ b/js/src/ctypes/libffi/src/moxie/ffitarget.h @@ -35,13 +35,9 @@ typedef signed long ffi_sarg; typedef enum ffi_abi { FFI_FIRST_ABI = 0, - -#ifdef MOXIE FFI_EABI, - FFI_DEFAULT_ABI = FFI_EABI, -#endif - - FFI_LAST_ABI = FFI_DEFAULT_ABI + 1 + FFI_LAST_ABI, + FFI_DEFAULT_ABI = FFI_EABI } ffi_abi; #endif diff --git a/js/src/ctypes/libffi/src/pa/ffitarget.h b/js/src/ctypes/libffi/src/pa/ffitarget.h index 001f8917d872..efa2f4e39daa 100644 --- a/js/src/ctypes/libffi/src/pa/ffitarget.h +++ b/js/src/ctypes/libffi/src/pa/ffitarget.h @@ -38,21 +38,22 @@ typedef enum ffi_abi { #ifdef PA_LINUX FFI_PA32, - FFI_DEFAULT_ABI = FFI_PA32, + FFI_LAST_ABI, + FFI_DEFAULT_ABI = FFI_PA32 #endif #ifdef PA_HPUX FFI_PA32, - FFI_DEFAULT_ABI = FFI_PA32, + FFI_LAST_ABI, + FFI_DEFAULT_ABI = FFI_PA32 #endif #ifdef PA64_HPUX #error "PA64_HPUX FFI is not yet implemented" FFI_PA64, - FFI_DEFAULT_ABI = FFI_PA64, + FFI_LAST_ABI, + FFI_DEFAULT_ABI = FFI_PA64 #endif - - FFI_LAST_ABI = FFI_DEFAULT_ABI + 1 } ffi_abi; #endif diff --git a/js/src/ctypes/libffi/src/powerpc/ffitarget.h b/js/src/ctypes/libffi/src/powerpc/ffitarget.h index b4f992e6df4b..45529eda59a5 100644 --- a/js/src/ctypes/libffi/src/powerpc/ffitarget.h +++ b/js/src/ctypes/libffi/src/powerpc/ffitarget.h @@ -31,12 +31,18 @@ /* ---- System specific configurations ----------------------------------- */ #if defined (POWERPC) && defined (__powerpc64__) /* linux64 */ +#ifndef POWERPC64 #define POWERPC64 +#endif #elif defined (POWERPC_DARWIN) && defined (__ppc64__) /* Darwin */ +#ifndef POWERPC64 #define POWERPC64 +#endif #elif defined (POWERPC_AIX) && defined (__64BIT__) /* AIX64 */ +#ifndef POWERPC64 #define POWERPC64 #endif +#endif #ifndef LIBFFI_ASM typedef unsigned long ffi_arg; diff --git a/js/src/ctypes/libffi/src/prep_cif.c b/js/src/ctypes/libffi/src/prep_cif.c index c1c3b9a6c864..761abdc66191 100644 --- a/js/src/ctypes/libffi/src/prep_cif.c +++ b/js/src/ctypes/libffi/src/prep_cif.c @@ -93,7 +93,7 @@ ffi_status ffi_prep_cif(ffi_cif *cif, ffi_abi abi, unsigned int nargs, ffi_type **ptr; FFI_ASSERT(cif != NULL); - FFI_ASSERT((abi > FFI_FIRST_ABI) && (abi <= FFI_DEFAULT_ABI)); + FFI_ASSERT(abi > FFI_FIRST_ABI && abi < FFI_LAST_ABI); cif->abi = abi; cif->arg_types = atypes; @@ -110,7 +110,7 @@ ffi_status ffi_prep_cif(ffi_cif *cif, ffi_abi abi, unsigned int nargs, FFI_ASSERT_VALID_TYPE(cif->rtype); /* x86, x86-64 and s390 stack space allocation is handled in prep_machdep. */ -#if !defined M68K && !defined __i386__ && !defined __x86_64__ && !defined S390 && !defined PA +#if !defined M68K && !defined X86_ANY && !defined S390 && !defined PA /* Make space for the return structure pointer */ if (cif->rtype->type == FFI_TYPE_STRUCT #ifdef SPARC @@ -131,7 +131,7 @@ ffi_status ffi_prep_cif(ffi_cif *cif, ffi_abi abi, unsigned int nargs, check after the initialization. */ FFI_ASSERT_VALID_TYPE(*ptr); -#if !defined __i386__ && !defined __x86_64__ && !defined S390 && !defined PA +#if !defined X86_ANY && !defined S390 && !defined PA #ifdef SPARC if (((*ptr)->type == FFI_TYPE_STRUCT && ((*ptr)->size > 16 || cif->abi != FFI_V9)) diff --git a/js/src/ctypes/libffi/src/s390/ffitarget.h b/js/src/ctypes/libffi/src/s390/ffitarget.h index 78f3c6537d07..a26269126b61 100644 --- a/js/src/ctypes/libffi/src/s390/ffitarget.h +++ b/js/src/ctypes/libffi/src/s390/ffitarget.h @@ -28,8 +28,10 @@ #define LIBFFI_TARGET_H #if defined (__s390x__) +#ifndef S390X #define S390X #endif +#endif /* ---- System specific configurations ----------------------------------- */ @@ -40,8 +42,8 @@ typedef signed long ffi_sarg; typedef enum ffi_abi { FFI_FIRST_ABI = 0, FFI_SYSV, - FFI_DEFAULT_ABI = FFI_SYSV, - FFI_LAST_ABI = FFI_DEFAULT_ABI + 1 + FFI_LAST_ABI, + FFI_DEFAULT_ABI = FFI_SYSV } ffi_abi; #endif diff --git a/js/src/ctypes/libffi/src/sh/ffitarget.h b/js/src/ctypes/libffi/src/sh/ffitarget.h index 218ae3d0a4ab..4f1f63960b3f 100644 --- a/js/src/ctypes/libffi/src/sh/ffitarget.h +++ b/js/src/ctypes/libffi/src/sh/ffitarget.h @@ -36,8 +36,8 @@ typedef signed long ffi_sarg; typedef enum ffi_abi { FFI_FIRST_ABI = 0, FFI_SYSV, - FFI_DEFAULT_ABI = FFI_SYSV, - FFI_LAST_ABI = FFI_DEFAULT_ABI + 1 + FFI_LAST_ABI, + FFI_DEFAULT_ABI = FFI_SYSV } ffi_abi; #endif diff --git a/js/src/ctypes/libffi/src/sh64/ffitarget.h b/js/src/ctypes/libffi/src/sh64/ffitarget.h index 4e922fc79f17..d935b8981c23 100644 --- a/js/src/ctypes/libffi/src/sh64/ffitarget.h +++ b/js/src/ctypes/libffi/src/sh64/ffitarget.h @@ -36,8 +36,8 @@ typedef signed long ffi_sarg; typedef enum ffi_abi { FFI_FIRST_ABI = 0, FFI_SYSV, - FFI_DEFAULT_ABI = FFI_SYSV, - FFI_LAST_ABI = FFI_DEFAULT_ABI + 1 + FFI_LAST_ABI, + FFI_DEFAULT_ABI = FFI_SYSV } ffi_abi; #define FFI_EXTRA_CIF_FIELDS long long flags2 diff --git a/js/src/ctypes/libffi/src/sparc/ffitarget.h b/js/src/ctypes/libffi/src/sparc/ffitarget.h index 1a1a1ac8d98e..51275cb721ba 100644 --- a/js/src/ctypes/libffi/src/sparc/ffitarget.h +++ b/js/src/ctypes/libffi/src/sparc/ffitarget.h @@ -30,8 +30,10 @@ /* ---- System specific configurations ----------------------------------- */ #if defined(__arch64__) || defined(__sparcv9) +#ifndef SPARC64 #define SPARC64 #endif +#endif #ifndef LIBFFI_ASM typedef unsigned long ffi_arg; @@ -42,12 +44,12 @@ typedef enum ffi_abi { FFI_V8, FFI_V8PLUS, FFI_V9, + FFI_LAST_ABI, #ifdef SPARC64 - FFI_DEFAULT_ABI = FFI_V9, + FFI_DEFAULT_ABI = FFI_V9 #else - FFI_DEFAULT_ABI = FFI_V8, + FFI_DEFAULT_ABI = FFI_V8 #endif - FFI_LAST_ABI = FFI_DEFAULT_ABI + 1 } ffi_abi; #endif diff --git a/js/src/ctypes/libffi/src/x86/ffi.c b/js/src/ctypes/libffi/src/x86/ffi.c index e3b66f610d24..5d053d8b79c8 100644 --- a/js/src/ctypes/libffi/src/x86/ffi.c +++ b/js/src/ctypes/libffi/src/x86/ffi.c @@ -155,12 +155,10 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif) switch (cif->rtype->type) { case FFI_TYPE_VOID: -#if defined(X86) || defined (X86_WIN32) || defined(X86_FREEBSD) || defined(X86_DARWIN) || defined(X86_WIN64) case FFI_TYPE_UINT8: case FFI_TYPE_UINT16: case FFI_TYPE_SINT8: case FFI_TYPE_SINT16: -#endif #ifdef X86_WIN64 case FFI_TYPE_UINT32: case FFI_TYPE_SINT32: @@ -291,27 +289,8 @@ void ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue) { #ifdef X86_WIN64 case FFI_WIN64: - { - /* Make copies of all struct arguments - NOTE: not sure if responsibility should be here or in caller */ - unsigned int i; - for (i=0; i < cif->nargs;i++) { - size_t size = cif->arg_types[i]->size; - if ((cif->arg_types[i]->type == FFI_TYPE_STRUCT - && (size != 1 && size != 2 && size != 4 && size != 8)) -#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE - || cif->arg_types[i]->type == FFI_TYPE_LONGDOUBLE -#endif - ) - { - void *local = alloca(size); - memcpy(local, avalue[i], size); - avalue[i] = local; - } - } - ffi_call_win64(ffi_prep_args, &ecif, cif->bytes, - cif->flags, ecif.rvalue, fn); - } + ffi_call_win64(ffi_prep_args, &ecif, cif->bytes, + cif->flags, ecif.rvalue, fn); break; #elif defined(X86_WIN32) case FFI_SYSV: @@ -586,9 +565,9 @@ ffi_prep_raw_closure_loc (ffi_raw_closure* closure, } /* we currently don't support certain kinds of arguments for raw - closures. This should be implemented by a separate assembly language - routine, since it would require argument processing, something we - don't do now for performance. */ + closures. This should be implemented by a separate assembly + language routine, since it would require argument processing, + something we don't do now for performance. */ for (i = cif->nargs-1; i >= 0; i--) { diff --git a/js/src/ctypes/libffi/src/x86/ffi64.c b/js/src/ctypes/libffi/src/x86/ffi64.c index 51ada0e879fa..07a2627b1f29 100644 --- a/js/src/ctypes/libffi/src/x86/ffi64.c +++ b/js/src/ctypes/libffi/src/x86/ffi64.c @@ -50,9 +50,10 @@ extern void ffi_call_unix64 (void *args, unsigned long bytes, unsigned flags, gcc/config/i386/i386.c. Do *not* change one without the other. */ /* Register class used for passing given 64bit part of the argument. - These represent classes as documented by the PS ABI, with the exception - of SSESF, SSEDF classes, that are basically SSE class, just gcc will - use SF or DFmode move instead of DImode to avoid reformating penalties. + These represent classes as documented by the PS ABI, with the + exception of SSESF, SSEDF classes, that are basically SSE class, + just gcc will use SF or DFmode move instead of DImode to avoid + reformatting penalties. Similary we play games with INTEGERSI_CLASS to use cheaper SImode moves whenever possible (upper half does contain padding). */ diff --git a/js/src/ctypes/libffi/src/x86/ffitarget.h b/js/src/ctypes/libffi/src/x86/ffitarget.h index b85016cc01b2..542e6d4709aa 100644 --- a/js/src/ctypes/libffi/src/x86/ffitarget.h +++ b/js/src/ctypes/libffi/src/x86/ffitarget.h @@ -31,6 +31,9 @@ /* ---- System specific configurations ----------------------------------- */ +/* For code common to all platforms on x86 and x86_64. */ +#define X86_ANY + #if defined (X86_64) && defined (__i386__) #undef X86_64 #define X86 @@ -64,28 +67,26 @@ typedef enum ffi_abi { #ifdef X86_WIN32 FFI_SYSV, FFI_STDCALL, + FFI_LAST_ABI, /* TODO: Add fastcall support for the sake of completeness */ - FFI_DEFAULT_ABI = FFI_SYSV, -#endif + FFI_DEFAULT_ABI = FFI_SYSV -#ifdef X86_WIN64 +#elif defined(X86_WIN64) FFI_WIN64, - FFI_DEFAULT_ABI = FFI_WIN64, -#else + FFI_LAST_ABI, + FFI_DEFAULT_ABI = FFI_WIN64 +#else /* ---- Intel x86 and AMD x86-64 - */ -#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__) || defined(__i386) || defined(__amd64)) FFI_SYSV, FFI_UNIX64, /* Unix variants all use the same ABI for x86-64 */ + FFI_LAST_ABI, #if defined(__i386__) || defined(__i386) - FFI_DEFAULT_ABI = FFI_SYSV, + FFI_DEFAULT_ABI = FFI_SYSV #else - FFI_DEFAULT_ABI = FFI_UNIX64, + FFI_DEFAULT_ABI = FFI_UNIX64 #endif #endif -#endif /* X86_WIN64 */ - - FFI_LAST_ABI = FFI_DEFAULT_ABI + 1 } ffi_abi; #endif diff --git a/js/src/ctypes/libffi/src/x86/sysv.S b/js/src/ctypes/libffi/src/x86/sysv.S index f4b6c1e44155..f3b0bd5ac52b 100644 --- a/js/src/ctypes/libffi/src/x86/sysv.S +++ b/js/src/ctypes/libffi/src/x86/sysv.S @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------- - sysv.S - Copyright (c) 1996, 1998, 2001-2003, 2005, 2008 Red Hat, Inc. + sysv.S - Copyright (c) 1996, 1998, 2001-2003, 2005, 2008, 2010 Red Hat, Inc. X86 Foreign Function Interface @@ -48,6 +48,9 @@ ffi_call_SYSV: movl 16(%ebp),%ecx subl %ecx,%esp + /* Align the stack pointer to 16-bytes */ + andl $0xfffffff0, %esp + movl %esp,%eax /* Place all of the ffi_prep_args in position */ @@ -331,10 +334,20 @@ ffi_closure_raw_SYSV: .LSCIE1: .long 0x0 /* CIE Identifier Tag */ .byte 0x1 /* CIE Version */ +#ifdef HAVE_AS_ASCII_PSEUDO_OP #ifdef __PIC__ .ascii "zR\0" /* CIE Augmentation */ #else .ascii "\0" /* CIE Augmentation */ +#endif +#elif defined HAVE_AS_STRING_PSEUDO_OP +#ifdef __PIC__ + .string "zR" /* CIE Augmentation */ +#else + .string "" /* CIE Augmentation */ +#endif +#else +#error missing .ascii/.string #endif .byte 0x1 /* .uleb128 0x1; CIE Code Alignment Factor */ .byte 0x7c /* .sleb128 -4; CIE Data Alignment Factor */ diff --git a/js/src/ctypes/libffi/src/x86/unix64.S b/js/src/ctypes/libffi/src/x86/unix64.S index fe3f4fd6223c..7a6619a54864 100644 --- a/js/src/ctypes/libffi/src/x86/unix64.S +++ b/js/src/ctypes/libffi/src/x86/unix64.S @@ -324,7 +324,11 @@ ffi_closure_unix64: .LUW9: .size ffi_closure_unix64,.-ffi_closure_unix64 +#ifdef HAVE_AS_X86_64_UNWIND_SECTION_TYPE + .section .eh_frame,"a",@unwind +#else .section .eh_frame,"a",@progbits +#endif .Lframe1: .long .LECIE1-.LSCIE1 /* CIE Length */ .LSCIE1: diff --git a/js/src/ctypes/libffi/stamp-h.in b/js/src/ctypes/libffi/stamp-h.in new file mode 100644 index 000000000000..9788f70238c9 --- /dev/null +++ b/js/src/ctypes/libffi/stamp-h.in @@ -0,0 +1 @@ +timestamp diff --git a/js/src/ctypes/libffi/testsuite/Makefile.in b/js/src/ctypes/libffi/testsuite/Makefile.in index a954696a9f82..5888c56523b6 100644 --- a/js/src/ctypes/libffi/testsuite/Makefile.in +++ b/js/src/ctypes/libffi/testsuite/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -108,6 +108,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ diff --git a/js/src/ctypes/libffi/testsuite/libffi.call/err_bad_abi.c b/js/src/ctypes/libffi/testsuite/libffi.call/err_bad_abi.c index a21a3fddd047..ce0f3bb27824 100644 --- a/js/src/ctypes/libffi/testsuite/libffi.call/err_bad_abi.c +++ b/js/src/ctypes/libffi/testsuite/libffi.call/err_bad_abi.c @@ -17,11 +17,9 @@ int main (void) ffi_cif cif; void *code; ffi_closure *pcl = ffi_closure_alloc(sizeof(ffi_closure), &code); - void* args[1]; ffi_type* arg_types[1]; arg_types[0] = NULL; - args[0] = NULL; CHECK(ffi_prep_cif(&cif, 255, 0, &ffi_type_void, arg_types) == FFI_BAD_ABI); diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp index 1084e6f0c6a9..6eb1b80d80c7 100644 --- a/js/src/jsapi.cpp +++ b/js/src/jsapi.cpp @@ -568,7 +568,8 @@ JSRuntime::init(uint32 maxbytes) #endif if (!(defaultCompartment = new JSCompartment(this)) || - !defaultCompartment->init()) { + !defaultCompartment->init() || + !compartments.append(defaultCompartment)) { return false; } @@ -657,8 +658,10 @@ JSRuntime::~JSRuntime() JS_DESTROY_LOCK(debuggerLock); #endif propertyTree.finish(); - if (defaultCompartment) - delete defaultCompartment; + /* Delete all remaining Compartments. Ideally only the defaultCompartment should be left. */ + for (JSCompartment **c = compartments.begin(); c != compartments.end(); ++c) + delete *c; + compartments.clear(); } JS_PUBLIC_API(JSRuntime *) @@ -1878,6 +1881,7 @@ JS_strdup(JSContext *cx, const char *s) JS_PUBLIC_API(JSBool) JS_NewNumberValue(JSContext *cx, jsdouble d, jsval *rval) { + d = JS_CANONICALIZE_NAN(d); Valueify(rval)->setNumber(d); return JS_TRUE; } diff --git a/js/src/jsapi.h b/js/src/jsapi.h index 162fefaeb157..41fb304a135d 100644 --- a/js/src/jsapi.h +++ b/js/src/jsapi.h @@ -153,6 +153,7 @@ JSVAL_TO_DOUBLE(jsval v) static JS_ALWAYS_INLINE jsval DOUBLE_TO_JSVAL(jsdouble d) { + d = JS_CANONICALIZE_NAN(d); return IMPL_TO_JSVAL(DOUBLE_TO_JSVAL_IMPL(d)); } diff --git a/js/src/jsatom.cpp b/js/src/jsatom.cpp index fbf92401347d..90e4f77649a2 100644 --- a/js/src/jsatom.cpp +++ b/js/src/jsatom.cpp @@ -637,7 +637,7 @@ js_DumpAtoms(JSContext *cx, FILE *fp) JSAtomState *state = &cx->runtime->atomState; fprintf(fp, "atoms table contents:\n"); - unsigned number; + unsigned number = 0; for (AtomSet::Range r = state->atoms.all(); !r.empty(); r.popFront()) { AtomEntryType entry = r.front(); fprintf(fp, "%3u ", number++); diff --git a/js/src/jsbuiltins.h b/js/src/jsbuiltins.h index ea4a5e53ac7c..381328721193 100644 --- a/js/src/jsbuiltins.h +++ b/js/src/jsbuiltins.h @@ -228,7 +228,6 @@ struct ClosureVarInfo; #define _JS_CTYPE_CLASS _JS_CTYPE(js::Class *, _JS_PTR, --, --, INFALLIBLE) #define _JS_CTYPE_DOUBLEPTR _JS_CTYPE(double *, _JS_PTR, --, --, INFALLIBLE) #define _JS_CTYPE_CHARPTR _JS_CTYPE(char *, _JS_PTR, --, --, INFALLIBLE) -#define _JS_CTYPE_APNPTR _JS_CTYPE(ArgsPrivateNative *, _JS_PTR, --, --, INFALLIBLE) #define _JS_CTYPE_CVIPTR _JS_CTYPE(const ClosureVarInfo *, _JS_PTR, --, --, INFALLIBLE) #define _JS_CTYPE_FRAMEINFO _JS_CTYPE(FrameInfo *, _JS_PTR, --, --, INFALLIBLE) @@ -624,12 +623,7 @@ JS_DECLARE_CALLINFO(js_String_tn) JS_DECLARE_CALLINFO(js_CompareStrings) JS_DECLARE_CALLINFO(js_ConcatStrings) JS_DECLARE_CALLINFO(js_EqualStrings) -JS_DECLARE_CALLINFO(js_String_getelem) -JS_DECLARE_CALLINFO(js_String_p_charCodeAt) -JS_DECLARE_CALLINFO(js_String_p_charCodeAt0) -JS_DECLARE_CALLINFO(js_String_p_charCodeAt0_int) -JS_DECLARE_CALLINFO(js_String_p_charCodeAt_double_int) -JS_DECLARE_CALLINFO(js_String_p_charCodeAt_int_int) +JS_DECLARE_CALLINFO(js_Flatten) /* Defined in jstypedarray.cpp. */ JS_DECLARE_CALLINFO(js_TypedArray_uint8_clamp_double) diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h index bf6190862217..f97863271536 100644 --- a/js/src/jscntxt.h +++ b/js/src/jscntxt.h @@ -1143,8 +1143,6 @@ typedef struct JSPropertyTreeEntry { namespace js { -typedef Vector GCChunks; - struct GCPtrHasher { typedef void *Lookup; @@ -1194,50 +1192,6 @@ typedef HashMap WrapperMap; class AutoValueVector; class AutoIdVector; -struct GCMarker : public JSTracer { - private: - /* The color is only applied to objects, functions and xml. */ - uint32 color; - - /* See comments before delayMarkingChildren is jsgc.cpp. */ - JSGCArena *unmarkedArenaStackTop; -#ifdef DEBUG - size_t markLaterCount; -#endif - - public: - js::Vector arraysToSlowify; - - public: - explicit GCMarker(JSContext *cx) - : color(0), unmarkedArenaStackTop(NULL) - { - JS_TRACER_INIT(this, cx, NULL); -#ifdef DEBUG - markLaterCount = 0; -#endif - } - - uint32 getMarkColor() const { - return color; - } - - void setMarkColor(uint32 newColor) { - /* - * We must process any delayed marking here, otherwise we confuse - * colors. - */ - markDelayedChildren(); - color = newColor; - } - - void delayMarkingChildren(void *thing); - - JS_FRIEND_API(void) markDelayedChildren(); - - void slowifyArrays(); -}; - } /* namespace js */ struct JSCompartment { @@ -1295,8 +1249,10 @@ struct JSRuntime { uint32 protoHazardShape; /* Garbage collector state, used by jsgc.c. */ - js::GCChunks gcChunks; - size_t gcChunkCursor; + js::GCChunkSet gcChunkSet; + + /* GC chunks with at least one free arena. */ + js::GCChunkInfoVector gcFreeArenaChunks; #ifdef DEBUG JSGCArena *gcEmptyArenaList; #endif diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp index 9495db6008e6..7ce488b0cc5d 100644 --- a/js/src/jsfun.cpp +++ b/js/src/jsfun.cpp @@ -87,14 +87,6 @@ using namespace js; -static inline void -SetArgsPrivateNative(JSObject *argsobj, ArgsPrivateNative *apn) -{ - JS_ASSERT(argsobj->isArguments()); - uintptr_t p = (uintptr_t) apn; - argsobj->setPrivate((void*) (p | 2)); -} - JSBool js_GetArgsValue(JSContext *cx, JSStackFrame *fp, Value *vp) { @@ -251,26 +243,24 @@ js_PutArgsObject(JSContext *cx, JSStackFrame *fp) #ifdef JS_TRACER JSObject * JS_FASTCALL -js_Arguments(JSContext *cx, JSObject *parent, uint32 argc, JSObject *callee, - double *argv, ArgsPrivateNative *apn) +js_Arguments(JSContext *cx, JSObject *parent, uint32 argc, JSObject *callee) { JSObject *argsobj = NewArguments(cx, parent, argc, callee); if (!argsobj) return NULL; - apn->argv = argv; - SetArgsPrivateNative(argsobj, apn); + argsobj->setPrivate(JS_ARGUMENT_OBJECT_ON_TRACE); return argsobj; } #endif -JS_DEFINE_CALLINFO_6(extern, OBJECT, js_Arguments, CONTEXT, OBJECT, UINT32, OBJECT, - DOUBLEPTR, APNPTR, 0, nanojit::ACCSET_STORE_ANY) +JS_DEFINE_CALLINFO_4(extern, OBJECT, js_Arguments, CONTEXT, OBJECT, UINT32, OBJECT, + 0, nanojit::ACCSET_STORE_ANY) /* FIXME change the return type to void. */ JSBool JS_FASTCALL js_PutArguments(JSContext *cx, JSObject *argsobj, Value *args) { - JS_ASSERT(GetArgsPrivateNative(argsobj)); + JS_ASSERT(argsobj->getPrivate() == JS_ARGUMENT_OBJECT_ON_TRACE); PutArguments(cx, argsobj, args); argsobj->setPrivate(NULL); return true; @@ -478,6 +468,8 @@ WrapEscapingClosure(JSContext *cx, JSStackFrame *fp, JSObject *funobj, JSFunctio static JSBool ArgGetter(JSContext *cx, JSObject *obj, jsid id, Value *vp) { + LeaveTrace(cx); + if (!InstanceOf(cx, obj, &js_ArgumentsClass, NULL)) return true; @@ -488,14 +480,6 @@ ArgGetter(JSContext *cx, JSObject *obj, jsid id, Value *vp) */ uintN arg = uintN(JSID_TO_INT(id)); if (arg < obj->getArgsLength()) { -#ifdef JS_TRACER - ArgsPrivateNative *argp = GetArgsPrivateNative(obj); - if (argp) { - ExternNativeToValue(cx, *vp, argp->typemap()[arg], &argp->argv[arg]); - return true; - } -#endif - JSStackFrame *fp = (JSStackFrame *) obj->getPrivate(); if (fp) { *vp = fp->argv[arg]; @@ -648,7 +632,7 @@ static void args_or_call_trace(JSTracer *trc, JSObject *obj) { if (obj->isArguments()) { - if (GetArgsPrivateNative(obj)) + if (obj->getPrivate() == JS_ARGUMENT_OBJECT_ON_TRACE) return; } else { JS_ASSERT(obj->getClass() == &js_CallClass); diff --git a/js/src/jsfun.h b/js/src/jsfun.h index e24b25651c20..649b23ce1f32 100644 --- a/js/src/jsfun.h +++ b/js/src/jsfun.h @@ -286,6 +286,8 @@ JSObject::isArguments() const return getClass() == &js_ArgumentsClass; } +#define JS_ARGUMENT_OBJECT_ON_TRACE ((void *)0xa126) + extern JS_PUBLIC_DATA(js::Class) js_CallClass; extern JS_PUBLIC_DATA(js::Class) js_FunctionClass; extern js::Class js_DeclEnvClass; @@ -350,16 +352,6 @@ IsInternalFunctionObject(JSObject *funobj) return funobj == fun && (fun->flags & JSFUN_LAMBDA) && !funobj->getParent(); } -struct ArgsPrivateNative; - -inline ArgsPrivateNative * -GetArgsPrivateNative(JSObject *argsobj) -{ - JS_ASSERT(argsobj->isArguments()); - uintptr_t p = (uintptr_t) argsobj->getPrivate(); - return p & 2 ? (ArgsPrivateNative *)(p & ~2) : NULL; -} - } /* namespace js */ extern JSObject * diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp index 03dfc2e1942b..480c176d5202 100644 --- a/js/src/jsgc.cpp +++ b/js/src/jsgc.cpp @@ -122,7 +122,7 @@ JS_STATIC_ASSERT(FINALIZE_EXTERNAL_STRING_LAST - FINALIZE_EXTERNAL_STRING0 == * GC memory is allocated in chunks. The size of each chunk is GC_CHUNK_SIZE. * The chunk contains an array of GC arenas holding GC things, an array of * the mark bitmaps for each arena, an array of JSGCArenaInfo arena - * descriptors, an array of JSGCMarkingDelay descriptors, the JSGCChunkInfo + * descriptors, an array of JSGCMarkingDelay descriptors, the GCChunkInfo * chunk descriptor and a bitmap indicating free arenas in the chunk. The * following picture demonstrates the layout: * @@ -135,7 +135,7 @@ JS_STATIC_ASSERT(FINALIZE_EXTERNAL_STRING_LAST - FINALIZE_EXTERNAL_STRING0 == * operation gives an arena index into the mark and JSGCArenaInfo arrays. * * All chunks that have at least one free arena are put on the doubly-linked - * list with the head stored in JSRuntime.gcChunkList. JSGCChunkInfo contains + * list with the head stored in JSRuntime.gcChunkList. GCChunkInfo contains * the head of the chunk's free arena list together with the link fields for * gcChunkList. * @@ -151,7 +151,7 @@ JS_STATIC_ASSERT(FINALIZE_EXTERNAL_STRING_LAST - FINALIZE_EXTERNAL_STRING0 == * * The number of arenas in the chunk is given by GC_ARENAS_PER_CHUNK. We find * that number as follows. Suppose chunk contains n arenas. Together with the - * word-aligned free arena bitmap and JSGCChunkInfo they should fit into the + * word-aligned free arena bitmap and GCChunkInfo they should fit into the * chunk. Hence GC_ARENAS_PER_CHUNK or n_max is the maximum value of n for * which the following holds: * @@ -162,7 +162,7 @@ JS_STATIC_ASSERT(FINALIZE_EXTERNAL_STRING_LAST - FINALIZE_EXTERNAL_STRING0 == * s is the number of words in the GC arena, arena's mark bitmap, * JSGCArenaInfo and JSGCMarkingDelay or GC_ARENA_ALL_WORDS. * B is number of bits per word or B == JS_BITS_PER_WORD - * M is the number of words in the chunk without JSGCChunkInfo or + * M is the number of words in the chunk without GCChunkInfo or * M == (GC_CHUNK_SIZE - sizeof(JSGCArenaInfo)) / sizeof(jsuword). * * We rewrite the inequality as @@ -208,11 +208,11 @@ JS_STATIC_ASSERT(FINALIZE_EXTERNAL_STRING_LAST - FINALIZE_EXTERNAL_STRING0 == * * For the final result we observe that in (4) * - * M*B == (GC_CHUNK_SIZE - sizeof(JSGCChunkInfo)) / sizeof(jsuword) * + * M*B == (GC_CHUNK_SIZE - sizeof(GCChunkInfo)) / sizeof(jsuword) * * JS_BITS_PER_WORD - * == (GC_CHUNK_SIZE - sizeof(JSGCChunkInfo)) * JS_BITS_PER_BYTE + * == (GC_CHUNK_SIZE - sizeof(GCChunkInfo)) * JS_BITS_PER_BYTE * - * since GC_CHUNK_SIZE and sizeof(JSGCChunkInfo) are at least word-aligned. + * since GC_CHUNK_SIZE and sizeof(GCChunkInfo) are at least word-aligned. */ const jsuword GC_ARENA_SHIFT = 12; @@ -250,7 +250,7 @@ struct JSGCArenaInfo { * Pointer to the previous arena in a linked list. The arena can either * belong to one of JSContext.gcArenaList lists or, when it does not have * any allocated GC things, to the list of free arenas in the chunk with - * head stored in JSGCChunkInfo.lastFreeArena. + * head stored in GCChunkInfo.lastFreeArena. */ JSGCArena *prev; @@ -296,7 +296,9 @@ struct JSGCArena { inline jsbitmap *getMarkBitmap(); }; -struct JSGCChunkInfo { +namespace js { + +struct GCChunkInfo { JSRuntime *runtime; size_t numFreeArenas; size_t gcChunkAge; @@ -309,9 +311,11 @@ struct JSGCChunkInfo { inline void clearMarkBitmap(); - static inline JSGCChunkInfo *fromChunk(jsuword chunk); + static inline GCChunkInfo *fromChunk(jsuword chunk); }; +} /* namespace js */ + /* Check that all chunk arrays at least word-aligned. */ JS_STATIC_ASSERT(sizeof(JSGCArena) == GC_ARENA_SIZE); JS_STATIC_ASSERT(GC_MARK_BITMAP_WORDS % sizeof(jsuword) == 0); @@ -324,7 +328,7 @@ const size_t GC_ARENA_ALL_WORDS = (GC_ARENA_SIZE + GC_MARK_BITMAP_SIZE + /* The value according (4) above. */ const size_t GC_ARENAS_PER_CHUNK = - (GC_CHUNK_SIZE - sizeof(JSGCChunkInfo)) * JS_BITS_PER_BYTE / + (GC_CHUNK_SIZE - sizeof(GCChunkInfo)) * JS_BITS_PER_BYTE / (JS_BITS_PER_WORD * GC_ARENA_ALL_WORDS + 1); const size_t GC_FREE_ARENA_BITMAP_WORDS = (GC_ARENAS_PER_CHUNK + @@ -337,12 +341,12 @@ const size_t GC_FREE_ARENA_BITMAP_SIZE = GC_FREE_ARENA_BITMAP_WORDS * /* Check that GC_ARENAS_PER_CHUNK indeed maximises (1). */ JS_STATIC_ASSERT(GC_ARENAS_PER_CHUNK * GC_ARENA_ALL_WORDS + GC_FREE_ARENA_BITMAP_WORDS <= - (GC_CHUNK_SIZE - sizeof(JSGCChunkInfo)) / sizeof(jsuword)); + (GC_CHUNK_SIZE - sizeof(GCChunkInfo)) / sizeof(jsuword)); JS_STATIC_ASSERT((GC_ARENAS_PER_CHUNK + 1) * GC_ARENA_ALL_WORDS + (GC_ARENAS_PER_CHUNK + 1 + JS_BITS_PER_WORD - 1) / JS_BITS_PER_WORD > - (GC_CHUNK_SIZE - sizeof(JSGCChunkInfo)) / sizeof(jsuword)); + (GC_CHUNK_SIZE - sizeof(GCChunkInfo)) / sizeof(jsuword)); const size_t GC_MARK_BITMAP_ARRAY_OFFSET = GC_ARENAS_PER_CHUNK @@ -355,10 +359,10 @@ const size_t GC_MARKING_DELAY_ARRAY_OFFSET = GC_ARENA_INFO_ARRAY_OFFSET + sizeof(JSGCArenaInfo) * GC_ARENAS_PER_CHUNK; const size_t GC_CHUNK_INFO_OFFSET = GC_CHUNK_SIZE - GC_FREE_ARENA_BITMAP_SIZE - - sizeof(JSGCChunkInfo); + sizeof(GCChunkInfo); inline jsuword -JSGCChunkInfo::getChunk() { +GCChunkInfo::getChunk() { jsuword addr = reinterpret_cast(this); JS_ASSERT((addr & GC_CHUNK_MASK) == GC_CHUNK_INFO_OFFSET); jsuword chunk = addr & ~GC_CHUNK_MASK; @@ -366,29 +370,29 @@ JSGCChunkInfo::getChunk() { } inline void -JSGCChunkInfo::clearMarkBitmap() +GCChunkInfo::clearMarkBitmap() { PodZero(reinterpret_cast(getChunk() + GC_MARK_BITMAP_ARRAY_OFFSET), GC_MARK_BITMAP_WORDS * GC_ARENAS_PER_CHUNK); } /* static */ -inline JSGCChunkInfo * -JSGCChunkInfo::fromChunk(jsuword chunk) { +inline GCChunkInfo * +GCChunkInfo::fromChunk(jsuword chunk) { JS_ASSERT(!(chunk & GC_CHUNK_MASK)); jsuword addr = chunk | GC_CHUNK_INFO_OFFSET; - return reinterpret_cast(addr); + return reinterpret_cast(addr); } inline jsbitmap * -JSGCChunkInfo::getFreeArenaBitmap() +GCChunkInfo::getFreeArenaBitmap() { jsuword addr = reinterpret_cast(this); - return reinterpret_cast(addr + sizeof(JSGCChunkInfo)); + return reinterpret_cast(addr + sizeof(GCChunkInfo)); } inline void -JSGCChunkInfo::init(JSRuntime *rt) +GCChunkInfo::init(JSRuntime *rt) { runtime = rt; numFreeArenas = GC_ARENAS_PER_CHUNK; @@ -607,7 +611,7 @@ static jsrefcount newChunkCount = 0; static jsrefcount destroyChunkCount = 0; #endif -inline void * +inline jsuword GetGCChunk(JSRuntime *rt) { void *p = rt->gcChunkAllocator->alloc(); @@ -617,7 +621,7 @@ GetGCChunk(JSRuntime *rt) #endif METER_IF(p, rt->gcStats.nchunks++); METER_UPDATE_MAX(rt->gcStats.maxnchunks, rt->gcStats.nchunks); - return p; + return reinterpret_cast(p); } inline void @@ -648,29 +652,41 @@ NewGCArena(JSContext *cx) js_TriggerGC(cx, true); } - size_t nchunks = rt->gcChunks.length(); - - JSGCChunkInfo *ci; - for (;; ++rt->gcChunkCursor) { - if (rt->gcChunkCursor == nchunks) { - ci = NULL; - break; - } - ci = rt->gcChunks[rt->gcChunkCursor]; - if (ci->numFreeArenas != 0) - break; - } - if (!ci) { - if (!rt->gcChunks.reserve(nchunks + 1)) + if (rt->gcFreeArenaChunks.empty()) { +#ifdef DEBUG + for (GCChunkSet::Range r(rt->gcChunkSet.all()); !r.empty(); r.popFront()) + JS_ASSERT(GCChunkInfo::fromChunk(r.front())->numFreeArenas == 0); +#endif + /* + * Make sure that after the GC we can append all allocated chunks to + * gcFreeArenaChunks. + * + * FIXME bug 583729 - use the same for the rt->gcChunkSet. + */ + if (!rt->gcFreeArenaChunks.reserve(rt->gcChunkSet.count() + 1)) return NULL; - void *chunkptr = GetGCChunk(rt); - if (!chunkptr) + jsuword chunk = GetGCChunk(rt); + if (!chunk) return NULL; - ci = JSGCChunkInfo::fromChunk(reinterpret_cast(chunkptr)); + GCChunkInfo *ci = GCChunkInfo::fromChunk(chunk); ci->init(rt); - JS_ALWAYS_TRUE(rt->gcChunks.append(ci)); + + /* + * FIXME bug 583732 - chunk is newly allocated and cannot present in + * the table so using ordinary lookupForAdd is suboptimal here. + */ + GCChunkSet::AddPtr p = rt->gcChunkSet.lookupForAdd(chunk); + JS_ASSERT(!p); + if (!rt->gcChunkSet.add(p, chunk)) { + ReleaseGCChunk(rt, chunk); + return NULL; + } + JS_ALWAYS_TRUE(rt->gcFreeArenaChunks.append(ci)); } + GCChunkInfo *ci = rt->gcFreeArenaChunks.back(); + JS_ASSERT(ci->numFreeArenas); + /* Scan the bitmap for the first non-zero bit. */ jsbitmap *freeArenas = ci->getFreeArenaBitmap(); size_t arenaIndex = 0; @@ -684,6 +700,10 @@ NewGCArena(JSContext *cx) JS_ASSERT(*freeArenas & (jsuword(1) << bit)); *freeArenas &= ~(jsuword(1) << bit); --ci->numFreeArenas; + if (ci->numFreeArenas == 0) { + JS_ASSERT(ci == rt->gcFreeArenaChunks.back()); + rt->gcFreeArenaChunks.popBack(); + } rt->gcBytes += GC_ARENA_SIZE; METER(rt->gcStats.nallarenas++); @@ -706,7 +726,7 @@ ReleaseGCArena(JSRuntime *rt, JSGCArena *a) METER(rt->gcStats.nallarenas--); jsuword chunk = a->getChunk(); - JSGCChunkInfo *ci = JSGCChunkInfo::fromChunk(chunk); + GCChunkInfo *ci = GCChunkInfo::fromChunk(chunk); JS_ASSERT(ci->numFreeArenas <= GC_ARENAS_PER_CHUNK - 1); jsbitmap *freeArenas = ci->getFreeArenaBitmap(); JS_ASSERT(!JS_TEST_BIT(freeArenas, a->getIndex())); @@ -732,22 +752,24 @@ FreeGCChunks(JSRuntime *rt) } #endif - /* Remove unused chunks. */ - size_t available = 0; - for (JSGCChunkInfo **i = rt->gcChunks.begin(); i != rt->gcChunks.end(); ++i) { - JSGCChunkInfo *ci = *i; + /* Remove unused chunks and rebuild gcFreeArenaChunks. */ + rt->gcFreeArenaChunks.clear(); + JS_ASSERT(rt->gcFreeArenaChunks.capacity() >= rt->gcChunkSet.count()); + for (GCChunkSet::Enum e(rt->gcChunkSet); !e.empty(); e.popFront()) { + GCChunkInfo *ci = GCChunkInfo::fromChunk(e.front()); JS_ASSERT(ci->runtime == rt); if (ci->numFreeArenas == GC_ARENAS_PER_CHUNK) { if (ci->gcChunkAge > GC_MAX_CHUNK_AGE) { + e.removeFront(); ReleaseGCChunk(rt, ci->getChunk()); continue; } ci->gcChunkAge++; } - rt->gcChunks[available++] = ci; + + if (ci->numFreeArenas) + JS_ALWAYS_TRUE(rt->gcFreeArenaChunks.append(ci)); } - rt->gcChunks.resize(available); - rt->gcChunkCursor = 0; } static inline size_t @@ -846,10 +868,10 @@ FinishGCArenaLists(JSRuntime *rt) rt->gcBytes = 0; - for (JSGCChunkInfo **i = rt->gcChunks.begin(); i != rt->gcChunks.end(); ++i) - ReleaseGCChunk(rt, (*i)->getChunk()); - rt->gcChunks.clear(); - rt->gcChunkCursor = 0; + for (GCChunkSet::Range r(rt->gcChunkSet.all()); !r.empty(); r.popFront()) + ReleaseGCChunk(rt, r.front()); + rt->gcChunkSet.clear(); + rt->gcFreeArenaChunks.clear(); } intN @@ -877,7 +899,7 @@ JSRuntime * js_GetGCThingRuntime(void *thing) { jsuword chunk = JSGCArena::fromGCThing(thing)->getChunk(); - return JSGCChunkInfo::fromChunk(chunk)->runtime; + return GCChunkInfo::fromChunk(chunk)->runtime; } JS_FRIEND_API(bool) @@ -900,6 +922,13 @@ js_InitGC(JSRuntime *rt, uint32 maxbytes) { InitGCArenaLists(rt); + /* + * Make room for at least 16 chunks so the table would not grow before + * the browser starts up. + */ + if (!rt->gcChunkSet.init(16)) + return false; + if (!rt->gcRootsHash.init(256)) return false; @@ -938,186 +967,12 @@ js_InitGC(JSRuntime *rt, uint32 maxbytes) namespace js { -struct GCChunkHasher -{ - typedef jsuword Lookup; - static HashNumber hash(jsuword chunk) { - /* - * Strip zeros for better distribution after multiplying by the golden - * ratio. - */ - JS_ASSERT(!(chunk & GC_CHUNK_MASK)); - return HashNumber(chunk >> GC_CHUNK_SHIFT); - } - static bool match(jsuword k, jsuword l) { - JS_ASSERT(!(k & GC_CHUNK_MASK)); - JS_ASSERT(!(l & GC_CHUNK_MASK)); - return k == l; - } -}; - -class ConservativeGCStackMarker { - public: - ConservativeGCStackMarker(JSTracer *trc); - - ~ConservativeGCStackMarker() { -#ifdef JS_DUMP_CONSERVATIVE_GC_ROOTS - dumpConservativeRoots(); -#endif -#ifdef JS_GCMETER - JSConservativeGCStats *total = &trc->context->runtime->gcStats.conservative; - total->words += stats.words; - total->lowbitset += stats.lowbitset; - total->notarena += stats.notarena; - total->notchunk += stats.notchunk; - total->freearena += stats.freearena; - total->wrongtag += stats.wrongtag; - total->notlive += stats.notlive; - total->gcthings += stats.gcthings; - total->unmarked += stats.unmarked; -#endif - } - - void markRoots(); - - private: - void markRange(jsuword *begin, jsuword *end); - void markWord(jsuword w); - - JSTracer *trc; - HashSet chunkSet; - -#if defined(JS_DUMP_CONSERVATIVE_GC_ROOTS) || defined(JS_GCMETER) - JSConservativeGCStats stats; - - public: - static void dumpStats(FILE *fp, JSConservativeGCStats *stats); - -# define CONSERVATIVE_METER(x) ((void) (x)) -# define CONSERVATIVE_METER_IF(condition, x) ((void) ((condition) && (x))) - -#else - -# define CONSERVATIVE_METER(x) ((void) 0) -# define CONSERVATIVE_METER_IF(condition, x) ((void) 0) - -#endif - -#ifdef JS_DUMP_CONSERVATIVE_GC_ROOTS - private: - struct ConservativeRoot { void *thing; uint32 traceKind; }; - Vector conservativeRoots; - const char *dumpFileName; - - void dumpConservativeRoots(); -#endif -}; - -ConservativeGCStackMarker::ConservativeGCStackMarker(JSTracer *trc) - : trc(trc) -{ - /* - * If initializing fails because we are out of memory, stack scanning - * slows down but is otherwise unaffected. - */ - JSRuntime *rt = trc->context->runtime; - if (chunkSet.init(rt->gcChunks.length())) { - for (JSGCChunkInfo **i = rt->gcChunks.begin(); i != rt->gcChunks.end(); ++i) { - jsuword chunk = (*i)->getChunk(); - JS_ASSERT(!chunkSet.has(chunk)); - JS_ALWAYS_TRUE(chunkSet.put(chunk)); - } - } - -#ifdef JS_DUMP_CONSERVATIVE_GC_ROOTS - dumpFileName = getenv("JS_DUMP_CONSERVATIVE_GC_ROOTS"); - memset(&stats, 0, sizeof(stats)); -#endif -} - -#if defined(JS_DUMP_CONSERVATIVE_GC_ROOTS) || defined(JS_GCMETER) -/* static */ -void -ConservativeGCStackMarker::dumpStats(FILE *fp, JSConservativeGCStats *stats) -{ -#define ULSTAT(x) ((unsigned long)(stats->x)) - fprintf(fp, "CONSERVATIVE STACK SCANNING:\n"); - fprintf(fp, " number of stack words: %lu\n", ULSTAT(words)); - fprintf(fp, " excluded, low bit set: %lu\n", ULSTAT(lowbitset)); - fprintf(fp, " not withing a chunk: %lu\n", ULSTAT(notchunk)); - fprintf(fp, " not within arena range: %lu\n", ULSTAT(notarena)); - fprintf(fp, " points to free arena: %lu\n", ULSTAT(freearena)); - fprintf(fp, " excluded, wrong tag: %lu\n", ULSTAT(wrongtag)); - fprintf(fp, " excluded, not live: %lu\n", ULSTAT(notlive)); - fprintf(fp, " things marked: %lu\n", ULSTAT(gcthings)); - fprintf(fp, " conservative roots: %lu\n", ULSTAT(unmarked)); -#undef ULSTAT -} -#endif - -#ifdef JS_DUMP_CONSERVATIVE_GC_ROOTS -void -ConservativeGCStackMarker::dumpConservativeRoots() -{ - if (!dumpFileName) - return; - - JS_ASSERT(stats.unmarked == conservativeRoots.length()); - - FILE *fp; - if (!strcmp(dumpFileName, "stdout")) { - fp = stdout; - } else if (!strcmp(dumpFileName, "stderr")) { - fp = stderr; - } else if (!(fp = fopen(dumpFileName, "aw"))) { - fprintf(stderr, - "Warning: cannot open %s to dump the conservative roots\n", - dumpFileName); - return; - } - - dumpStats(fp, &stats); - for (ConservativeRoot *i = conservativeRoots.begin(); - i != conservativeRoots.end(); - ++i) { - fprintf(fp, " %p: ", i->thing); - switch (i->traceKind) { - default: - JS_NOT_REACHED("Unknown trace kind"); - - case JSTRACE_OBJECT: { - JSObject *obj = (JSObject *) i->thing; - fprintf(fp, "object %s", obj->getClass()->name); - break; - } - case JSTRACE_STRING: { - JSString *str = (JSString *) i->thing; - char buf[50]; - js_PutEscapedString(buf, sizeof buf, str, '"'); - fprintf(fp, "string %s", buf); - break; - } -# if JS_HAS_XML_SUPPORT - case JSTRACE_XML: { - JSXML *xml = (JSXML *) i->thing; - fprintf(fp, "xml %u", (unsigned)xml->xml_class); - break; - } -# endif - } - fputc('\n', fp); - } - fputc('\n', fp); - - if (fp != stdout && fp != stderr) - fclose(fp); -} -#endif /* JS_DUMP_CONSERVATIVE_GC_ROOTS */ - -static const jsuword JSID_PAYLOAD_MASK = (jsuword)~(jsuword)JSID_TYPE_MASK; - -void -ConservativeGCStackMarker::markWord(jsuword w) +/* + * Returns CGCT_VALID if the w can be a live GC thing and sets thing and traceKind + * accordingly. Otherwise returns the reason for rejection. + */ +inline ConservativeGCTest +IsGCThingWord(JSRuntime *rt, jsuword w, void *&thing, uint32 &traceKind) { /* * The conservative scanner may access words that valgrind considers as @@ -1129,8 +984,6 @@ ConservativeGCStackMarker::markWord(jsuword w) VALGRIND_MAKE_MEM_DEFINED(&w, sizeof(w)); #endif -#define RETURN(x) do { CONSERVATIVE_METER(stats.x++); return; } while (0) - /* * We assume that the compiler never uses sub-word alignment to store * pointers and does not tag pointers on its own. Additionally, the value @@ -1140,12 +993,13 @@ ConservativeGCStackMarker::markWord(jsuword w) */ JS_STATIC_ASSERT(JSID_TYPE_STRING == 0 && JSID_TYPE_OBJECT == 4); if (w & 0x3) - RETURN(lowbitset); + return CGCT_LOWBITSET; /* * An object jsid has its low bits tagged. In the value representation on * 64-bit, the high bits are tagged. */ + const jsuword JSID_PAYLOAD_MASK = ~jsuword(JSID_TYPE_MASK); #if JS_BITS_PER_WORD == 32 jsuword payload = w & JSID_PAYLOAD_MASK; #elif JS_BITS_PER_WORD == 64 @@ -1153,33 +1007,21 @@ ConservativeGCStackMarker::markWord(jsuword w) #endif jsuword chunk = payload & ~GC_CHUNK_MASK; - JSGCChunkInfo *ci; - if (JS_LIKELY(chunkSet.initialized())) { - if (!chunkSet.has(chunk)) - RETURN(notchunk); - ci = JSGCChunkInfo::fromChunk(chunk); - } else { - ci = JSGCChunkInfo::fromChunk(chunk); - for (JSGCChunkInfo **i = trc->context->runtime->gcChunks.begin(); ; ++i) { - if (i == trc->context->runtime->gcChunks.end()) - RETURN(notchunk); - if (*i == ci) - break; - } - } + if (!rt->gcChunkSet.has(chunk)) + return CGCT_NOTCHUNK; + + GCChunkInfo *ci = GCChunkInfo::fromChunk(chunk); if ((payload & GC_CHUNK_MASK) >= GC_MARK_BITMAP_ARRAY_OFFSET) - RETURN(notarena); + return CGCT_NOTARENA; size_t arenaIndex = (payload & GC_CHUNK_MASK) >> GC_ARENA_SHIFT; if (JS_TEST_BIT(ci->getFreeArenaBitmap(), arenaIndex)) - RETURN(freearena); + return CGCT_FREEARENA; JSGCArena *a = JSGCArena::fromChunkAndIndex(chunk, arenaIndex); JSGCArenaInfo *ainfo = a->getInfo(); - JSGCThing *thing; - uint32 traceKind; traceKind = GetFinalizableArenaTraceKind(ainfo); /* @@ -1189,7 +1031,7 @@ ConservativeGCStackMarker::markWord(jsuword w) * * if ((traceKind == JSTRACE_STRING && tag > 0 && tag != JSVAL_TAG_SHIFT) || * (traceKind == JSTRACE_OBJECT && tag > 0 && tag != JSVAL_TAG_OBJECT)) - * RETURN(wrongtag); + * return CGCT_WRONGTAG; * * However, it seems like we should measure how often this actually avoids * false roots. @@ -1207,7 +1049,7 @@ ConservativeGCStackMarker::markWord(jsuword w) */ if (offset + thingSize > GC_ARENA_SIZE) { JS_ASSERT(thingSize & (thingSize - 1)); - RETURN(notarena); + return CGCT_NOTARENA; } thing = (JSGCThing *) (start + offset); @@ -1223,48 +1065,88 @@ ConservativeGCStackMarker::markWord(jsuword w) /* If we find it on the freelist, it's dead. */ if (thing == cursor) - RETURN(notlive); + return CGCT_NOTLIVE; JS_ASSERT_IF(cursor->link, cursor < cursor->link); cursor = cursor->link; } - CONSERVATIVE_METER(stats.gcthings++); - - /* - * We have now a valid pointer, that is either raw or tagged properly. - * Since we do not rely on the conservative scanning yet and assume that - * all the roots are precisely reported, any unmarked GC things here mean - * those things leaked. - */ - if (IS_GC_MARKING_TRACER(trc)) { - if (!js_IsAboutToBeFinalized(thing)) - return; - CONSERVATIVE_METER(stats.unmarked++); - } - -#ifdef JS_DUMP_CONSERVATIVE_GC_ROOTS - if (IS_GC_MARKING_TRACER(trc) && dumpFileName) { - ConservativeRoot root = {thing, traceKind}; - conservativeRoots.append(root); - } -#endif - Mark(trc, thing, traceKind, "machine stack"); - -#undef RETURN + return CGCT_VALID; } +inline ConservativeGCTest +IsGCThingWord(JSRuntime *rt, jsuword w) +{ + void *thing; + uint32 traceKind; + return IsGCThingWord(rt, w, thing, traceKind); +} + + +#if defined(JS_DUMP_CONSERVATIVE_GC_ROOTS) || defined(JS_GCMETER) + void -ConservativeGCStackMarker::markRange(jsuword *begin, jsuword *end) +ConservativeGCStats::dump(FILE *fp) +{ + size_t words = 0; + for (size_t i = 0; i != JS_ARRAY_LENGTH(counter); ++i) + words += counter[i]; + +#define ULSTAT(x) ((unsigned long)(x)) + fprintf(fp, "CONSERVATIVE STACK SCANNING:\n"); + fprintf(fp, " number of stack words: %lu\n", ULSTAT(words)); + fprintf(fp, " excluded, low bit set: %lu\n", ULSTAT(counter[CGCT_LOWBITSET])); + fprintf(fp, " not withing a chunk: %lu\n", ULSTAT(counter[CGCT_NOTCHUNK])); + fprintf(fp, " not within arena range: %lu\n", ULSTAT(counter[CGCT_NOTARENA])); + fprintf(fp, " points to free arena: %lu\n", ULSTAT(counter[CGCT_FREEARENA])); + fprintf(fp, " excluded, wrong tag: %lu\n", ULSTAT(counter[CGCT_WRONGTAG])); + fprintf(fp, " excluded, not live: %lu\n", ULSTAT(counter[CGCT_NOTLIVE])); + fprintf(fp, " valid GC things: %lu\n", ULSTAT(counter[CGCT_VALID])); +#undef ULSTAT +} +#endif + +static void +MarkWordConservatively(JSTracer *trc, jsuword w) +{ + /* + * The conservative scanner may access words that valgrind considers as + * undefined. To avoid false positives and not to alter valgrind view of + * the memory we make as memcheck-defined the argument, a copy of the + * original word. See bug 572678. + */ +#ifdef JS_VALGRIND + VALGRIND_MAKE_MEM_DEFINED(&w, sizeof(w)); +#endif + + void *thing; + uint32 traceKind; + ConservativeGCTest test = IsGCThingWord(trc->context->runtime, w, thing, traceKind); + if (test == CGCT_VALID) { + Mark(trc, thing, traceKind, "machine stack"); +#ifdef JS_DUMP_CONSERVATIVE_GC_ROOTS + if (IS_GC_MARKING_TRACER(trc) && static_cast(trc)->conservativeDumpFileName) { + GCMarker::ConservativeRoot root = {thing, traceKind}; + static_cast(trc)->conservativeRoots.append(root); + } +#endif + } + +#if defined JS_DUMP_CONSERVATIVE_GC_ROOTS || defined JS_GCMETER + if (IS_GC_MARKING_TRACER(trc)) + static_cast(trc)->conservativeStats.counter[test]++; +#endif +} + +static void +MarkRangeConservatively(JSTracer *trc, jsuword *begin, jsuword *end) { JS_ASSERT(begin <= end); - for (jsuword *i = begin; i != end; ++i) { - CONSERVATIVE_METER(stats.words++); - markWord(*i); - } + for (jsuword *i = begin; i != end; ++i) + MarkWordConservatively(trc, *i); } void -ConservativeGCStackMarker::markRoots() +MarkConservativeStackRoots(JSTracer *trc) { /* Do conservative scanning of the stack and registers. */ for (ThreadDataIter i(trc->context->runtime); !i.empty(); i.popFront()) { @@ -1280,14 +1162,13 @@ ConservativeGCStackMarker::markRoots() stackEnd = td->nativeStackBase; #endif JS_ASSERT(stackMin <= stackEnd); - markRange(stackMin, stackEnd); - markRange(ctd->registerSnapshot.words, - JS_ARRAY_END(ctd->registerSnapshot.words)); + MarkRangeConservatively(trc, stackMin, stackEnd); + MarkRangeConservatively(trc, ctd->registerSnapshot.words, + JS_ARRAY_END(ctd->registerSnapshot.words)); } } } -/* static */ JS_NEVER_INLINE JS_FRIEND_API(void) ConservativeGCThreadData::enable(bool knownStackBoundary) { @@ -1483,8 +1364,7 @@ js_DumpGCStats(JSRuntime *rt, FILE *fp) fprintf(fp, " max reachable closeable: %lu\n", ULSTAT(maxnclose)); fprintf(fp, " scheduled close hooks: %lu\n", ULSTAT(closelater)); fprintf(fp, " max scheduled close hooks: %lu\n", ULSTAT(maxcloselater)); - - ConservativeGCStackMarker::dumpStats(fp, &rt->gcStats.conservative); + rt->gcStats.conservative.dump(fp); #undef UL #undef ULSTAT @@ -1989,6 +1869,88 @@ ThingsPerUnmarkedBit(unsigned thingSize) return JS_HOWMANY(ThingsPerArena(thingSize), JS_BITS_PER_WORD); } +GCMarker::GCMarker(JSContext *cx) + : color(0), unmarkedArenaStackTop(NULL) +{ + JS_TRACER_INIT(this, cx, NULL); +#ifdef DEBUG + markLaterCount = 0; +#endif +#ifdef JS_DUMP_CONSERVATIVE_GC_ROOTS + conservativeDumpFileName = getenv("JS_DUMP_CONSERVATIVE_GC_ROOTS"); + memset(&conservativeStats, 0, sizeof(conservativeStats)); +#endif +} + +GCMarker::~GCMarker() +{ +#ifdef JS_DUMP_CONSERVATIVE_GC_ROOTS + dumpConservativeRoots(); +#endif +#ifdef JS_GCMETER + /* Update total stats. */ + context->runtime->gcStats.conservative.add(conservativeStats); +#endif +} + +#ifdef JS_DUMP_CONSERVATIVE_GC_ROOTS +void +GCMarker::dumpConservativeRoots() +{ + if (!conservativeDumpFileName) + return; + + FILE *fp; + if (!strcmp(conservativeDumpFileName, "stdout")) { + fp = stdout; + } else if (!strcmp(conservativeDumpFileName, "stderr")) { + fp = stderr; + } else if (!(fp = fopen(conservativeDumpFileName, "aw"))) { + fprintf(stderr, + "Warning: cannot open %s to dump the conservative roots\n", + conservativeDumpFileName); + return; + } + + conservativeStats.dump(fp); + + for (ConservativeRoot *i = conservativeRoots.begin(); + i != conservativeRoots.end(); + ++i) { + fprintf(fp, " %p: ", i->thing); + switch (i->traceKind) { + default: + JS_NOT_REACHED("Unknown trace kind"); + + case JSTRACE_OBJECT: { + JSObject *obj = (JSObject *) i->thing; + fprintf(fp, "object %s", obj->getClass()->name); + break; + } + case JSTRACE_STRING: { + JSString *str = (JSString *) i->thing; + char buf[50]; + js_PutEscapedString(buf, sizeof buf, str, '"'); + fprintf(fp, "string %s", buf); + break; + } +# if JS_HAS_XML_SUPPORT + case JSTRACE_XML: { + JSXML *xml = (JSXML *) i->thing; + fprintf(fp, "xml %u", (unsigned)xml->xml_class); + break; + } +# endif + } + fputc('\n', fp); + } + fputc('\n', fp); + + if (fp != stdout && fp != stderr) + fclose(fp); +} +#endif /* JS_DUMP_CONSERVATIVE_GC_ROOTS */ + void GCMarker::delayMarkingChildren(void *thing) { @@ -2485,7 +2447,7 @@ js_TraceRuntime(JSTracer *trc) JSRuntime *rt = trc->context->runtime; if (rt->state != JSRTS_LANDING) - ConservativeGCStackMarker(trc).markRoots(); + MarkConservativeStackRoots(trc); /* * Verify that we do not have at this point unmarked GC things stored in @@ -2532,9 +2494,10 @@ js_TraceRuntime(JSTracer *trc) continue; if (!IsMarkedGCThing(thing)) { + ConservativeGCTest test = IsGCThingWord(rt, reinterpret_cast(thing)); fprintf(stderr, - "Conservative GC scanner has missed the root %p with tag %lu" - " on the stack. Aborting.\n", thing, (unsigned long) gcr->tag); + "Conservative GC scanner has missed the root %p with tag %ld" + " on the stack due to %d. Aborting.\n", thing, (long) gcr->tag, int(test)); JS_ASSERT(false); abort(); } @@ -3002,6 +2965,10 @@ SweepCompartments(JSContext *cx) JSCompartment **read = rt->compartments.begin(); JSCompartment **end = rt->compartments.end(); JSCompartment **write = read; + + /* Delete defaultCompartment only during runtime shutdown */ + rt->defaultCompartment->marked = true; + while (read < end) { JSCompartment *compartment = (*read++); if (compartment->marked) { @@ -3088,9 +3055,10 @@ GC(JSContext *cx GCTIMER_PARAM) JS_ASSERT(IS_GC_MARKING_TRACER(&gcmarker)); JS_ASSERT(gcmarker.getMarkColor() == BLACK); rt->gcMarkingTracer = &gcmarker; - - for (JSGCChunkInfo **i = rt->gcChunks.begin(); i != rt->gcChunks.end(); ++i) - (*i)->clearMarkBitmap(); + + for (GCChunkSet::Range r(rt->gcChunkSet.all()); !r.empty(); r.popFront()) + GCChunkInfo::fromChunk(r.front())->clearMarkBitmap(); + js_TraceRuntime(&gcmarker); js_MarkScriptFilenames(rt); diff --git a/js/src/jsgc.h b/js/src/jsgc.h index 265db9391e56..ea3fd0c25898 100644 --- a/js/src/jsgc.h +++ b/js/src/jsgc.h @@ -49,11 +49,23 @@ #include "jspubtd.h" #include "jsdhash.h" #include "jsbit.h" +#include "jsgcchunk.h" #include "jsutil.h" #include "jstask.h" #include "jsvector.h" #include "jsversion.h" +#if !defined JS_DUMP_CONSERVATIVE_GC_ROOTS && defined DEBUG +# define JS_DUMP_CONSERVATIVE_GC_ROOTS 1 +#endif + +#if defined JS_GCMETER +const bool JS_WANT_GC_METER_PRINT = true; +#elif defined DEBUG +# define JS_GCMETER 1 +const bool JS_WANT_GC_METER_PRINT = false; +#endif + #define JSTRACE_XML 2 /* @@ -295,7 +307,6 @@ js_NewGCXML(JSContext *cx) #endif struct JSGCArena; -struct JSGCChunkInfo; struct JSGCArenaList { JSGCArena *head; /* list start */ @@ -388,6 +399,31 @@ class BackgroundSweepTask : public JSBackgroundTask { #endif /* JS_THREADSAFE */ + +struct GCChunkInfo; + +struct GCChunkHasher { + typedef jsuword Lookup; + + /* + * Strip zeros for better distribution after multiplying by the golden + * ratio. + */ + static HashNumber hash(jsuword chunk) { + JS_ASSERT(!(chunk & GC_CHUNK_MASK)); + return HashNumber(chunk >> GC_CHUNK_SHIFT); + } + + static bool match(jsuword k, jsuword l) { + JS_ASSERT(!(k & GC_CHUNK_MASK)); + JS_ASSERT(!(l & GC_CHUNK_MASK)); + return k == l; + } +}; + +typedef HashSet GCChunkSet; +typedef Vector GCChunkInfoVector; + struct ConservativeGCThreadData { /* @@ -408,37 +444,88 @@ struct ConservativeGCThreadData { bool isEnabled() const { return enableCount > 0; } }; -} /* namespace js */ +/* + * The conservative GC test for a word shows that it is either a valid GC + * thing or is not for one of the following reasons. + */ +enum ConservativeGCTest { + CGCT_VALID, + CGCT_LOWBITSET, /* excluded because one of the low bits was set */ + CGCT_NOTARENA, /* not within arena range in a chunk */ + CGCT_NOTCHUNK, /* not within a valid chunk */ + CGCT_FREEARENA, /* within arena containing only free things */ + CGCT_WRONGTAG, /* tagged pointer but wrong type */ + CGCT_NOTLIVE, /* gcthing is not allocated */ + CGCT_END +}; -#define JS_DUMP_CONSERVATIVE_GC_ROOTS 1 +struct ConservativeGCStats { + uint32 counter[CGCT_END]; /* ConservativeGCTest classification + counters */ + + void add(const ConservativeGCStats &another) { + for (size_t i = 0; i != JS_ARRAY_LENGTH(counter); ++i) + counter[i] += another.counter[i]; + } + + void dump(FILE *fp); +}; + +struct GCMarker : public JSTracer { + private: + /* The color is only applied to objects, functions and xml. */ + uint32 color; + + /* See comments before delayMarkingChildren is jsgc.cpp. */ + JSGCArena *unmarkedArenaStackTop; +#ifdef DEBUG + size_t markLaterCount; +#endif + + public: +#if defined(JS_DUMP_CONSERVATIVE_GC_ROOTS) || defined(JS_GCMETER) + ConservativeGCStats conservativeStats; +#endif + +#ifdef JS_DUMP_CONSERVATIVE_GC_ROOTS + struct ConservativeRoot { void *thing; uint32 traceKind; }; + Vector conservativeRoots; + const char *conservativeDumpFileName; + + void dumpConservativeRoots(); +#endif + + js::Vector arraysToSlowify; + + public: + explicit GCMarker(JSContext *cx); + ~GCMarker(); + + uint32 getMarkColor() const { + return color; + } + + void setMarkColor(uint32 newColor) { + /* + * We must process any delayed marking here, otherwise we confuse + * colors. + */ + markDelayedChildren(); + color = newColor; + } + + void delayMarkingChildren(void *thing); + + JS_FRIEND_API(void) markDelayedChildren(); + + void slowifyArrays(); +}; + +} /* namespace js */ extern void js_FinalizeStringRT(JSRuntime *rt, JSString *str); -#if defined JS_GCMETER -const bool JS_WANT_GC_METER_PRINT = true; -#elif defined DEBUG -# define JS_GCMETER 1 -const bool JS_WANT_GC_METER_PRINT = false; -#endif - -#if defined JS_GCMETER || defined JS_DUMP_CONSERVATIVE_GC_ROOTS - -struct JSConservativeGCStats { - uint32 words; /* number of words on native stacks */ - uint32 lowbitset; /* excluded because one of the low bits was set */ - uint32 notarena; /* not within arena range in a chunk */ - uint32 notchunk; /* not within a valid chunk */ - uint32 freearena; /* not within non-free arena */ - uint32 wrongtag; /* tagged pointer but wrong type */ - uint32 notlive; /* gcthing is not allocated */ - uint32 gcthings; /* number of live gcthings */ - uint32 unmarked; /* number of unmarked gc things discovered on the - stack */ -}; - -#endif - #ifdef JS_GCMETER struct JSGCArenaStats { @@ -487,7 +574,7 @@ struct JSGCStats { JSGCArenaStats arenaStats[FINALIZE_LIMIT]; - JSConservativeGCStats conservative; + js::ConservativeGCStats conservative; }; extern JS_FRIEND_API(void) diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp index c1c1bbadba48..f32b72366c0d 100644 --- a/js/src/jsinterp.cpp +++ b/js/src/jsinterp.cpp @@ -837,7 +837,7 @@ Execute(JSContext *cx, JSObject *chain, JSScript *script, if (down) { /* Propagate arg state for eval and the debugger API. */ fp->callobj = down->callobj; - fp->argsobj = down->argsobj; + fp->argsobj = NULL; fp->fun = (script->staticLevel > 0) ? down->fun : NULL; fp->thisv = down->thisv; fp->flags = flags | (down->flags & JSFRAME_COMPUTED_THIS); @@ -4412,11 +4412,7 @@ BEGIN_CASE(JSOP_GETELEM) /* Reload retval from the stack in the rare hole case. */ copyFrom = ®s.sp[-1]; } - } else if (obj->isArguments() -#ifdef JS_TRACER - && !GetArgsPrivateNative(obj) -#endif - ) { + } else if (obj->isArguments()) { uint32 arg = uint32(i); if (arg < obj->getArgsLength()) { diff --git a/js/src/jsregexp.cpp b/js/src/jsregexp.cpp index 4fb3ccde7064..8f7a0d0eb112 100644 --- a/js/src/jsregexp.cpp +++ b/js/src/jsregexp.cpp @@ -2329,7 +2329,7 @@ class RegExpNativeCompiler { Fragment* fragment; LirWriter* lir; #ifdef DEBUG - LirWriter* validate_writer; + ValidateWriter* validate_writer; #endif #ifdef NJ_VERBOSE LirWriter* verbose_filter; @@ -3243,6 +3243,15 @@ class RegExpNativeCompiler { lirbuf->state = state = addName(lirbuf, lir->insParam(0, 0), "state"); lirbuf->param1 = cpend = addName(lirbuf, lir->insParam(1, 0), "cpend"); +#ifdef DEBUG + // Do this before any REGlobalData loads/stores occur. 'extras' can + // be stack-allocated. + { + void* extras[] = { /* dummy */NULL, /* dummy */NULL }; + validate_writer->setCheckAccSetExtras(extras); + } +#endif + loopLabel = lir->ins0(LIR_label); // If profiling, record where the loop label is, so that the // assembler can insert a frag-entry-counter increment at that diff --git a/js/src/jsstr.cpp b/js/src/jsstr.cpp index 4a14e8c0ac34..f5279eeb5d64 100644 --- a/js/src/jsstr.cpp +++ b/js/src/jsstr.cpp @@ -176,6 +176,18 @@ JSString::flatten() topNode->initFlatMutable(chars, pos, capacity); } +#ifdef JS_TRACER + +int32 JS_FASTCALL +js_Flatten(JSString* str) +{ + str->flatten(); + return 0; +} +JS_DEFINE_CALLINFO_1(extern, INT32, js_Flatten, STRING, 0, nanojit::ACCSET_STORE_ANY) + +#endif /* !JS_TRACER */ + static JS_ALWAYS_INLINE size_t RopeAllocSize(const size_t length, size_t *capacity) { @@ -976,17 +988,6 @@ str_substring(JSContext *cx, uintN argc, Value *vp) return JS_TRUE; } -#ifdef JS_TRACER -static JSString* FASTCALL -String_p_toString(JSContext* cx, JSObject* obj) -{ - if (!InstanceOf(cx, obj, &js_StringClass, NULL)) - return NULL; - Value v = obj->getPrimitiveThis(); - return v.toString(); -} -#endif - JSString* JS_FASTCALL js_toLowerCase(JSContext *cx, JSString *str) { @@ -1110,8 +1111,8 @@ str_localeCompare(JSContext *cx, uintN argc, Value *vp) return JS_TRUE; } -static JSBool -str_charAt(JSContext *cx, uintN argc, Value *vp) +JSBool +js_str_charAt(JSContext *cx, uintN argc, Value *vp) { JSString *str; jsint i; @@ -1149,8 +1150,8 @@ out_of_range: return JS_TRUE; } -static JSBool -str_charCodeAt(JSContext *cx, uintN argc, Value *vp) +JSBool +js_str_charCodeAt(JSContext *cx, uintN argc, Value *vp) { JSString *str; jsint i; @@ -1185,60 +1186,6 @@ out_of_range: return JS_TRUE; } -#ifdef JS_TRACER - -jsdouble FASTCALL -js_String_p_charCodeAt(JSString* str, jsdouble d) -{ - d = js_DoubleToInteger(d); - if (d < 0 || (int32)str->length() <= d) - return js_NaN; - return jsdouble(str->chars()[jsuint(d)]); -} - -int32 FASTCALL -js_String_p_charCodeAt_int_int(JSString* str, jsint i) -{ - if (i < 0 || (int32)str->length() <= i) - return 0; - return str->chars()[i]; -} -JS_DEFINE_CALLINFO_2(extern, INT32, js_String_p_charCodeAt_int_int, STRING, INT32, - 1, nanojit::ACCSET_NONE) - -int32 FASTCALL -js_String_p_charCodeAt_double_int(JSString* str, double d) -{ - d = js_DoubleToInteger(d); - if (d < 0 || (int32)str->length() <= d) - return 0; - return str->chars()[jsuint(d)]; -} -JS_DEFINE_CALLINFO_2(extern, INT32, js_String_p_charCodeAt_double_int, STRING, DOUBLE, - 1, nanojit::ACCSET_NONE) - -jsdouble FASTCALL -js_String_p_charCodeAt0(JSString* str) -{ - if ((int32)str->length() == 0) - return js_NaN; - return jsdouble(str->chars()[0]); -} - -/* - * The FuncFilter replaces the generic double version of charCodeAt with the - * integer fast path if appropriate. - */ -int32 FASTCALL -js_String_p_charCodeAt0_int(JSString* str) -{ - if ((int32)str->length() == 0) - return 0; - return str->chars()[0]; -} -JS_DEFINE_CALLINFO_1(extern, INT32, js_String_p_charCodeAt0_int, STRING, 1, nanojit::ACCSET_NONE) -#endif - jsint js_BoyerMooreHorspool(const jschar *text, jsuint textlen, const jschar *pat, jsuint patlen) @@ -2851,19 +2798,8 @@ js_String_getelem(JSContext* cx, JSString* str, int32 i) } #endif -JS_DEFINE_TRCINFO_1(js_str_toString, - (2, (extern, STRING_RETRY, String_p_toString, CONTEXT, THIS, - 1, nanojit::ACCSET_NONE))) -JS_DEFINE_TRCINFO_1(str_charAt, - (3, (extern, STRING_RETRY, js_String_getelem, CONTEXT, THIS_STRING, INT32, - 1, nanojit::ACCSET_NONE))) -JS_DEFINE_TRCINFO_2(str_charCodeAt, - (1, (extern, DOUBLE, js_String_p_charCodeAt0, THIS_STRING, - 1, nanojit::ACCSET_NONE)), - (2, (extern, DOUBLE, js_String_p_charCodeAt, THIS_STRING, DOUBLE, - 1, nanojit::ACCSET_NONE))) JS_DEFINE_TRCINFO_1(str_concat, - (3, (extern, STRING_RETRY, js_ConcatStrings, CONTEXT, THIS_STRING, STRING, + (3, (extern, STRING_RETRY, js_ConcatStrings, CONTEXT, THIS_STRING, STRING, 1, nanojit::ACCSET_NONE))) #define GENERIC JSFUN_GENERIC_NATIVE @@ -2877,14 +2813,14 @@ static JSFunctionSpec string_methods[] = { #endif /* Java-like methods. */ - JS_TN(js_toString_str, js_str_toString, 0,JSFUN_THISP_STRING, &js_str_toString_trcinfo), + JS_FN(js_toString_str, js_str_toString, 0,JSFUN_THISP_STRING), JS_FN(js_valueOf_str, js_str_toString, 0,JSFUN_THISP_STRING), JS_FN(js_toJSON_str, js_str_toString, 0,JSFUN_THISP_STRING), JS_FN("substring", str_substring, 2,GENERIC_PRIMITIVE), JS_FN("toLowerCase", str_toLowerCase, 0,GENERIC_PRIMITIVE), JS_FN("toUpperCase", str_toUpperCase, 0,GENERIC_PRIMITIVE), - JS_TN("charAt", str_charAt, 1,GENERIC_PRIMITIVE, &str_charAt_trcinfo), - JS_TN("charCodeAt", str_charCodeAt, 1,GENERIC_PRIMITIVE, &str_charCodeAt_trcinfo), + JS_FN("charAt", js_str_charAt, 1,GENERIC_PRIMITIVE), + JS_FN("charCodeAt", js_str_charCodeAt, 1,GENERIC_PRIMITIVE), JS_FN("indexOf", str_indexOf, 1,GENERIC_PRIMITIVE), JS_FN("lastIndexOf", str_lastIndexOf, 1,GENERIC_PRIMITIVE), JS_FN("trim", str_trim, 0,GENERIC_PRIMITIVE), diff --git a/js/src/jsstr.h b/js/src/jsstr.h index 2c633c3479bd..c218bb75ece3 100644 --- a/js/src/jsstr.h +++ b/js/src/jsstr.h @@ -1111,6 +1111,12 @@ str_replace(JSContext *cx, uintN argc, js::Value *vp); extern JSBool js_str_toString(JSContext *cx, uintN argc, js::Value *vp); +extern JSBool +js_str_charAt(JSContext *cx, uintN argc, js::Value *vp); + +extern JSBool +js_str_charCodeAt(JSContext *cx, uintN argc, js::Value *vp); + /* * Convert one UCS-4 char and write it into a UTF-8 buffer, which must be at * least 6 bytes long. Return the number of UTF-8 bytes of data written. diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp index b1f924ca8f7b..aa997c5a1b6a 100644 --- a/js/src/jstracer.cpp +++ b/js/src/jstracer.cpp @@ -141,10 +141,10 @@ StackFilter::getTop(LIns* guard) } #ifdef DEBUG -void ValidateWriter::checkAccSet(LOpcode op, LIns* base, AccSet accSet) +void ValidateWriter::checkAccSet(LOpcode op, LIns* base, int32_t disp, AccSet accSet) { - LIns* sp = checkAccSetIns1; - LIns* rp = checkAccSetIns2; + LIns* sp = (LIns*)checkAccSetExtras[0]; + LIns* rp = (LIns*)checkAccSetExtras[1]; bool isRstack = base == rp; bool isStack = @@ -2357,6 +2357,16 @@ TraceRecorder::TraceRecorder(JSContext* cx, VMSideExit* anchor, VMFragment* frag fragment->loopLabel = entryLabel; }) +#ifdef DEBUG + // Need to set these up before any loads/stores occur. + // 'extras' is heap-allocated because its lifetime matches validate[12]'s. + void** extras = new (tempAlloc()) void*[2]; + extras[0] = 0; // we'll set it shortly + extras[1] = 0; // we'll set it shortly + validate1->setCheckAccSetExtras(extras); + validate2->setCheckAccSetExtras(extras); +#endif + lirbuf->sp = addName(lir->insLoad(LIR_ldp, lirbuf->state, offsetof(TracerState, sp), ACCSET_OTHER), "sp"); lirbuf->rp = @@ -2369,11 +2379,9 @@ TraceRecorder::TraceRecorder(JSContext* cx, VMSideExit* anchor, VMFragment* frag addName(lir->insLoad(LIR_ldp, lirbuf->state, offsetof(TracerState, eor), ACCSET_OTHER), "eor"); #ifdef DEBUG - // Need to set these up before any stack/rstack loads/stores occur. - validate1->setCheckAccSetIns1(lirbuf->sp); - validate2->setCheckAccSetIns1(lirbuf->sp); - validate1->setCheckAccSetIns2(lirbuf->rp); - validate2->setCheckAccSetIns2(lirbuf->rp); + // Need to update these before any stack/rstack loads/stores occur. + extras[0] = lirbuf->sp; + extras[1] = lirbuf->rp; #endif /* If we came from exit, we might not have enough global types. */ @@ -3439,7 +3447,7 @@ FlushNativeStackFrame(JSContext* cx, unsigned callDepth, const JSValueType* mp, for (; n != 0; fp = fp->down) { --n; if (fp->argv) { - if (fp->argsobj && GetArgsPrivateNative(fp->argsobj)) + if (fp->argsobj && fp->argsobj->getPrivate() == JS_ARGUMENT_OBJECT_ON_TRACE) fp->argsobj->setPrivate(fp); JS_ASSERT(fp->argv[-1].isObjectOrNull()); @@ -8556,20 +8564,6 @@ TraceRecorder::d2i(LIns* f, bool resultCanBeImpreciseIfFractional) LIns* args[] = { fcallarg(f, 1), fcallarg(f, 0) }; return lir->insCall(&js_StringToInt32_ci, args); } - if (ci == &js_String_p_charCodeAt0_ci) { - // Use a fast path builtin for a charCodeAt that converts to an int right away. - LIns* args[] = { fcallarg(f, 0) }; - return lir->insCall(&js_String_p_charCodeAt0_int_ci, args); - } - if (ci == &js_String_p_charCodeAt_ci) { - LIns* idx = fcallarg(f, 1); - if (isPromote(idx)) { - LIns* args[] = { demote(lir, idx), fcallarg(f, 0) }; - return lir->insCall(&js_String_p_charCodeAt_int_int_ci, args); - } - LIns* args[] = { idx, fcallarg(f, 0) }; - return lir->insCall(&js_String_p_charCodeAt_double_int_ci, args); - } } return resultCanBeImpreciseIfFractional ? lir->ins1(LIR_d2i, f) @@ -8684,9 +8678,7 @@ TraceRecorder::ifop() lir->insEqI_0(lir->ins2(LIR_eqd, v_ins, lir->insImmD(0)))); } else if (v.isString()) { cond = v.toString()->length() != 0; - x = lir->ins2ImmI(LIR_rshup, lir->insLoad(LIR_ldp, v_ins, - offsetof(JSString, mLengthAndFlags), ACCSET_OTHER), - JSString::FLAGS_LENGTH_SHIFT); + x = getStringLength(v_ins); } else { JS_NOT_REACHED("ifop"); return ARECORD_STOP; @@ -9007,9 +8999,20 @@ TraceRecorder::equalityHelper(Value& l, Value& r, LIns* l_ins, LIns* r_ins, JS_ASSERT(r.isBoolean()); cond = (l == r); } else if (l.isString()) { - args[0] = r_ins, args[1] = l_ins; - l_ins = lir->insCall(&js_EqualStrings_ci, args); - r_ins = lir->insImmI(1); + JSString *l_str = l.toString(); + JSString *r_str = r.toString(); + if (!l_str->isRope() && !r_str->isRope() && l_str->length() == 1 && r_str->length() == 1) { + VMSideExit *exit = snapshot(BRANCH_EXIT); + LIns *c = INS_CONSTWORD(1); + guard(true, lir->ins2(LIR_eqp, getStringLength(l_ins), c), exit); + guard(true, lir->ins2(LIR_eqp, getStringLength(r_ins), c), exit); + l_ins = lir->insLoad(LIR_ldus2ui, getStringChars(l_ins), 0, ACCSET_OTHER, LOAD_CONST); + r_ins = lir->insLoad(LIR_ldus2ui, getStringChars(r_ins), 0, ACCSET_OTHER, LOAD_CONST); + } else { + args[0] = r_ins, args[1] = l_ins; + l_ins = lir->insCall(&js_EqualStrings_ci, args); + r_ins = lir->insImmI(1); + } cond = !!js_EqualStrings(l.toString(), r.toString()); } else { JS_ASSERT(l.isNumber() && r.isNumber()); @@ -9440,7 +9443,12 @@ TraceRecorder::test_property_cache(JSObject* obj, LIns* obj_ins, JSObject*& obj2 JS_PROPERTY_CACHE(cx).test(cx, pc, aobj, obj2, entry, atom); if (atom) { // Miss: pre-fill the cache for the interpreter, as well as for our needs. + // FIXME: bug 458271. jsid id = ATOM_TO_JSID(atom); + + // The lookup below may change object shapes. + forgetGuardedShapes(); + JSProperty* prop; if (JOF_OPMODE(*pc) == JOF_NAME) { JS_ASSERT(aobj == obj); @@ -10605,16 +10613,8 @@ TraceRecorder::newArguments(LIns* callee_ins) { LIns* global_ins = INS_CONSTOBJ(globalObj); LIns* argc_ins = INS_CONST(cx->fp->argc); - LIns* argv_ins = cx->fp->argc - ? lir->ins2(LIR_addp, lirbuf->sp, - lir->insImmWord(nativespOffset(&cx->fp->argv[0]))) - : INS_CONSTPTR((void *) 2); - ArgsPrivateNative *apn = ArgsPrivateNative::create(traceAlloc(), cx->fp->argc); - for (uintN i = 0; i < cx->fp->argc; ++i) { - apn->typemap()[i] = determineSlotType(&cx->fp->argv[i]); - } - LIns* args[] = { INS_CONSTPTR(apn), argv_ins, callee_ins, argc_ins, global_ins, cx_ins }; + LIns* args[] = { callee_ins, argc_ins, global_ins, cx_ins }; LIns* call_ins = lir->insCall(&js_Arguments_ci, args); guard(false, lir->insEqP_0(call_ins), OOM_EXIT); return call_ins; @@ -10623,6 +10623,9 @@ TraceRecorder::newArguments(LIns* callee_ins) JS_REQUIRES_STACK AbortableRecordingStatus TraceRecorder::record_JSOP_ARGUMENTS() { + /* In an eval, 'arguments' will be a BINDNAME, which we don't trace. */ + JS_ASSERT(!(cx->fp->flags & JSFRAME_EVAL)); + if (cx->fp->flags & JSFRAME_OVERRIDE_ARGS) RETURN_STOP_A("Can't trace |arguments| if |arguments| is assigned to"); @@ -10849,9 +10852,7 @@ TraceRecorder::record_JSOP_NOT() return ARECORD_CONTINUE; } JS_ASSERT(v.isString()); - set(&v, lir->insEqP_0(lir->ins2ImmI(LIR_rshup, lir->insLoad(LIR_ldp, get(&v), - offsetof(JSString, mLengthAndFlags), ACCSET_OTHER), - JSString::FLAGS_LENGTH_SHIFT))); + set(&v, lir->insEqP_0(getStringLength(get(&v)))); return ARECORD_CONTINUE; } @@ -11335,19 +11336,39 @@ TraceRecorder::callNative(uintN argc, JSOp mode) switch (argc) { case 1: - if (vp[2].isNumber() && - (native == js_math_ceil || native == js_math_floor || native == js_math_round)) { - LIns* a = get(&vp[2]); - if (isPromote(a)) { - set(&vp[0], a); - pendingSpecializedNative = IGNORE_NATIVE_CALL_COMPLETE_CALLBACK; - return RECORD_CONTINUE; + if (vp[2].isNumber() && mode == JSOP_CALL) { + if (native == js_math_ceil || native == js_math_floor || native == js_math_round) { + LIns* a = get(&vp[2]); + if (isPromote(a)) { + set(&vp[0], a); + pendingSpecializedNative = IGNORE_NATIVE_CALL_COMPLETE_CALLBACK; + return RECORD_CONTINUE; + } + } + if (vp[1].isString()) { + JSString *str = vp[1].toString(); + if (native == (FastNative)js_str_charAt) { + LIns* str_ins = get(&vp[1]); + LIns* idx_ins = get(&vp[2]); + set(&vp[0], getCharAt(str, str_ins, idx_ins)); + pendingSpecializedNative = IGNORE_NATIVE_CALL_COMPLETE_CALLBACK; + return RECORD_CONTINUE; + } else if (native == (FastNative)js_str_charCodeAt) { + jsdouble i = vp[2].toNumber(); + if (i < 0 || i >= str->length()) + RETURN_STOP("charCodeAt out of bounds"); + LIns* str_ins = get(&vp[1]); + LIns* idx_ins = get(&vp[2]); + set(&vp[0], getCharCodeAt(str, str_ins, idx_ins)); + pendingSpecializedNative = IGNORE_NATIVE_CALL_COMPLETE_CALLBACK; + return RECORD_CONTINUE; + } } } break; case 2: - if (vp[2].isNumber() && vp[3].isNumber() && + if (vp[2].isNumber() && vp[3].isNumber() && mode == JSOP_CALL && (native == js_math_min || native == js_math_max)) { LIns* a = get(&vp[2]); LIns* b = get(&vp[3]); @@ -12443,6 +12464,85 @@ TraceRecorder::getPropertyWithScriptGetter(JSObject *obj, LIns* obj_ins, JSScope } } +JS_REQUIRES_STACK LIns* +TraceRecorder::getStringLength(LIns* str_ins) +{ + return addName(lir->ins2ImmI(LIR_rshup, + addName(lir->insLoad(LIR_ldp, str_ins, + offsetof(JSString, mLengthAndFlags), + ACCSET_OTHER, LOAD_CONST), "mLengthAndFlags"), + JSString::FLAGS_LENGTH_SHIFT), "length"); +} + +JS_REQUIRES_STACK LIns* +TraceRecorder::getStringChars(LIns* str_ins) +{ + return addName(lir->insLoad(LIR_ldp, str_ins, + offsetof(JSString, mChars), + ACCSET_OTHER, LOAD_CONST), "chars"); +} + +JS_REQUIRES_STACK LIns* +TraceRecorder::getCharCodeAt(JSString *str, LIns* str_ins, LIns* idx_ins) +{ + idx_ins = lir->insUI2P(makeNumberInt32(idx_ins)); + LIns *length_ins = lir->insLoad(LIR_ldp, str_ins, offsetof(JSString, mLengthAndFlags), + ACCSET_OTHER, LOAD_CONST); + LIns *br = lir->insBranch(LIR_jt, + lir->insEqP_0(lir->ins2(LIR_andp, + length_ins, + INS_CONSTWORD(JSString::ROPE_BIT))), + NULL); + lir->insCall(&js_Flatten_ci, &str_ins); + br->setTarget(lir->ins0(LIR_label)); + + guard(true, + lir->ins2(LIR_ltup, idx_ins, lir->ins2ImmI(LIR_rshup, length_ins, JSString::FLAGS_LENGTH_SHIFT)), + snapshot(MISMATCH_EXIT)); + LIns *chars_ins = getStringChars(str_ins); + return i2d(lir->insLoad(LIR_ldus2ui, + lir->ins2(LIR_addp, chars_ins, lir->ins2ImmI(LIR_lshp, idx_ins, 1)), 0, + ACCSET_OTHER, LOAD_CONST)); +} + +JS_STATIC_ASSERT(sizeof(JSString) == 16 || sizeof(JSString) == 32); + +JS_REQUIRES_STACK LIns* +TraceRecorder::getCharAt(JSString *str, LIns* str_ins, LIns* idx_ins) +{ + idx_ins = lir->insUI2P(makeNumberInt32(idx_ins)); + LIns *length_ins = lir->insLoad(LIR_ldp, str_ins, offsetof(JSString, mLengthAndFlags), + ACCSET_OTHER, LOAD_CONST); + LIns *br = lir->insBranch(LIR_jt, + lir->insEqP_0(lir->ins2(LIR_andp, + length_ins, + INS_CONSTWORD(JSString::ROPE_BIT))), + NULL); + lir->insCall(&js_Flatten_ci, &str_ins); + br->setTarget(lir->ins0(LIR_label)); + + LIns *phi_ins = lir->insAlloc(sizeof(JSString *)); + lir->insStore(LIR_stp, INS_CONSTSTR(cx->runtime->emptyString), phi_ins, 0, ACCSET_OTHER); + + br = lir->insBranch(LIR_jf, + lir->ins2(LIR_ltup, idx_ins, lir->ins2ImmI(LIR_rshup, length_ins, JSString::FLAGS_LENGTH_SHIFT)), + NULL); + LIns *chars_ins = getStringChars(str_ins); + LIns *ch_ins = lir->insLoad(LIR_ldus2ui, + lir->ins2(LIR_addp, chars_ins, lir->ins2ImmI(LIR_lshp, idx_ins, 1)), 0, + ACCSET_OTHER, LOAD_CONST); + guard(true, lir->ins2ImmI(LIR_ltui, ch_ins, UNIT_STRING_LIMIT), snapshot(MISMATCH_EXIT)); + LIns *unitstr_ins = lir->ins2(LIR_addp, + INS_CONSTPTR(JSString::unitStringTable), + lir->ins2ImmI(LIR_lshp, + lir->insUI2P(ch_ins), + (sizeof(JSString) == 16) ? 4 : 5)); + lir->insStore(LIR_stp, unitstr_ins, phi_ins, 0, ACCSET_OTHER); + br->setTarget(lir->ins0(LIR_label)); + + return lir->insLoad(LIR_ldp, phi_ins, 0, ACCSET_OTHER); +} + // Typed array tracing depends on EXPANDED_LOADSTORE and F2I #if NJ_EXPANDED_LOADSTORE_SUPPORTED && NJ_F2I_SUPPORTED static bool OkToTraceTypedArrays = true; @@ -12468,11 +12568,7 @@ TraceRecorder::record_JSOP_GETELEM() int i = asInt32(idx); if (size_t(i) >= lval.toString()->length()) RETURN_STOP_A("Invalid string index in JSOP_GETELEM"); - idx_ins = makeNumberInt32(idx_ins); - LIns* args[] = { idx_ins, obj_ins, cx_ins }; - LIns* unitstr_ins = lir->insCall(&js_String_getelem_ci, args); - guard(false, lir->insEqP_0(unitstr_ins), MISMATCH_EXIT); - set(&lval, unitstr_ins); + set(&lval, getCharAt(lval.toString(), obj_ins, idx_ins)); return ARECORD_CONTINUE; } @@ -12511,14 +12607,15 @@ TraceRecorder::record_JSOP_GETELEM() if (int_idx < 0 || int_idx >= afp->argc) RETURN_STOP_A("cannot trace arguments with out of range index"); - guard(true, + VMSideExit *exit = snapshot(MISMATCH_EXIT); + guard(true, addName(lir->ins2(LIR_gei, idx_ins, INS_CONST(0)), "guard(upvar index >= 0)"), - MISMATCH_EXIT); + exit); guard(true, addName(lir->ins2(LIR_lti, idx_ins, INS_CONST(afp->argc)), "guard(upvar index in range)"), - MISMATCH_EXIT); + exit); JSValueType type = getCoercedType(*vp); @@ -15849,10 +15946,7 @@ TraceRecorder::record_JSOP_LENGTH() if (l.isPrimitive()) { if (!l.isString()) RETURN_STOP_A("non-string primitive JSOP_LENGTH unsupported"); - set(&l, lir->ins1(LIR_i2d, - p2i(lir->ins2ImmI(LIR_rshup, lir->insLoad(LIR_ldp, get(&l), - offsetof(JSString, mLengthAndFlags), ACCSET_OTHER), - JSString::FLAGS_LENGTH_SHIFT)))); + set(&l, lir->ins1(LIR_i2d, p2i(getStringLength(get(&l))))); return ARECORD_CONTINUE; } diff --git a/js/src/jstracer.h b/js/src/jstracer.h index 724d96de1d07..5e448ed7b827 100644 --- a/js/src/jstracer.h +++ b/js/src/jstracer.h @@ -723,23 +723,6 @@ typedef enum BuiltinStatus { BUILTIN_ERROR = 2 } BuiltinStatus; -// Arguments objects created on trace have a private value that points to an -// instance of this struct. The struct includes a typemap that is allocated -// as part of the object. -struct ArgsPrivateNative { - double *argv; - - static ArgsPrivateNative *create(VMAllocator &alloc, unsigned argc) - { - return (ArgsPrivateNative*) new (alloc) char[sizeof(ArgsPrivateNative) + argc]; - } - - JSValueType *typemap() - { - return (JSValueType*) (this+1); - } -}; - static JS_INLINE void SetBuiltinError(JSContext *cx) { @@ -1283,6 +1266,13 @@ class TraceRecorder nanojit::LIns* obj_ins, JSScopeProperty* sprop); + JS_REQUIRES_STACK nanojit::LIns* getStringLength(nanojit::LIns* str_ins); + JS_REQUIRES_STACK nanojit::LIns* getStringChars(nanojit::LIns* str_ins); + JS_REQUIRES_STACK nanojit::LIns* getCharCodeAt(JSString *str, + nanojit::LIns* str_ins, nanojit::LIns* idx_ins); + JS_REQUIRES_STACK nanojit::LIns* getCharAt(JSString *str, + nanojit::LIns* str_ins, nanojit::LIns* idx_ins); + JS_REQUIRES_STACK RecordingStatus nativeSet(JSObject* obj, nanojit::LIns* obj_ins, JSScopeProperty* sprop, const Value &v, nanojit::LIns* v_ins); diff --git a/js/src/jsval.h b/js/src/jsval.h index a3a4c3a99401..540d1e9e6ce5 100644 --- a/js/src/jsval.h +++ b/js/src/jsval.h @@ -74,7 +74,7 @@ JS_BEGIN_EXTERN_C * nice symbolic type tags, however we can only do this when we can force the * underlying type of the enum to be the desired size. */ -#ifdef __cplusplus +#if defined(__cplusplus) && !defined(__SUNPRO_CC) #if defined(_MSC_VER) # define JS_ENUM_HEADER(id, type) enum id : type @@ -179,8 +179,6 @@ typedef uint8 JSValueType; #define JSVAL_TYPE_FUNOBJ ((uint8)0x67) #define JSVAL_TYPE_STRORNULL ((uint8)0x97) #define JSVAL_TYPE_OBJORNULL ((uint8)0x98) -#define JSVAL_TYPE_STRORNULL ((uint8)0x97) -#define JSVAL_TYPE_OBJORNULL ((uint8)0x98) #define JSVAL_TYPE_BOXED ((uint8)0x99) #define JSVAL_TYPE_UNINITIALIZED ((uint8)0xcd) @@ -219,7 +217,7 @@ typedef uint64 JSValueShiftedTag; #define JSVAL_SHIFTED_TAG_OBJECT (((uint64)JSVAL_TAG_OBJECT) << JSVAL_TAG_SHIFT) #endif /* JS_BITS_PER_WORD */ -#endif /* defined(__cplusplus) */ +#endif /* defined(__cplusplus) && !defined(__SUNPRO_CC) */ #define JSVAL_LOWER_INCL_TYPE_OF_OBJ_OR_NULL_SET JSVAL_TYPE_NULL #define JSVAL_UPPER_EXCL_TYPE_OF_PRIMITIVE_SET JSVAL_TYPE_OBJECT @@ -699,6 +697,17 @@ JSVAL_TO_PRIVATE_PTR_IMPL(jsval_layout l) #endif +static JS_ALWAYS_INLINE double +JS_CANONICALIZE_NAN(double d) +{ + if (JS_UNLIKELY(d != d)) { + jsval_layout l; + l.asBits = 0x7FF8000000000000LL; + return l.asDouble; + } + return d; +} + /* See JS_USE_JSVAL_JSID_STRUCT_TYPES comment in jsapi.h. */ #if defined(DEBUG) && !defined(JS_NO_JSVAL_JSID_STRUCT_TYPES) # define JS_USE_JSVAL_JSID_STRUCT_TYPES diff --git a/js/src/jsvector.h b/js/src/jsvector.h index 6c9486954e75..ef6d75fb2ee8 100644 --- a/js/src/jsvector.h +++ b/js/src/jsvector.h @@ -367,7 +367,7 @@ class Vector : AllocPolicy /* mutators */ - /* If reserve(N) succeeds, the N next appends are guaranteed to succeed. */ + /* If reserve(length() + N) succeeds, the N next appends are guaranteed to succeed. */ bool reserve(size_t capacity); /* Destroy elements in the range [begin() + incr, end()). */ diff --git a/js/src/lirasm/lirasm.cpp b/js/src/lirasm/lirasm.cpp index eaabcba0c8ba..915b899818f7 100644 --- a/js/src/lirasm/lirasm.cpp +++ b/js/src/lirasm/lirasm.cpp @@ -140,10 +140,11 @@ nanojit::LInsPrinter::accNames[] = { #endif #ifdef DEBUG -void ValidateWriter::checkAccSet(LOpcode op, LIns* base, AccSet accSet) +void ValidateWriter::checkAccSet(LOpcode op, LIns* base, int32_t disp, AccSet accSet) { (void)op; (void)base; + (void)disp; NanoAssert(accSet == ACCSET_OTHER); } #endif diff --git a/js/src/nanojit-import-rev b/js/src/nanojit-import-rev index c0c65a7cdd74..3961b3be0dd6 100644 --- a/js/src/nanojit-import-rev +++ b/js/src/nanojit-import-rev @@ -1 +1 @@ -186f3f376d662375ff9182cf0b470468335ef442 +982cd218ddb049bdbbcdda4fa3a9d7e40e45e0be diff --git a/js/src/nanojit/LIR.cpp b/js/src/nanojit/LIR.cpp index a91619ae792f..f84addd0f175 100644 --- a/js/src/nanojit/LIR.cpp +++ b/js/src/nanojit/LIR.cpp @@ -2035,13 +2035,17 @@ namespace nanojit } void CseFilter::clearNL(NLKind nlkind) { - VMPI_memset(m_listNL[nlkind], 0, sizeof(LIns*)*m_capNL[nlkind]); - m_usedNL[nlkind] = 0; + if (m_usedNL[nlkind] > 0) { + VMPI_memset(m_listNL[nlkind], 0, sizeof(LIns*)*m_capNL[nlkind]); + m_usedNL[nlkind] = 0; + } } void CseFilter::clearL(CseAcc a) { - VMPI_memset(m_listL[a], 0, sizeof(LIns*)*m_capL[a]); - m_usedL[a] = 0; + if (m_usedL[a] > 0) { + VMPI_memset(m_listL[a], 0, sizeof(LIns*)*m_capL[a]); + m_usedL[a] = 0; + } } void CseFilter::clearAll() { @@ -2478,9 +2482,12 @@ namespace nanojit // Clear all normal (excludes CONST and MULTIPLE) loads // aliased by stores and calls since the last time we were in // this function. - for (CseAcc a = 0; a < EMB_NUM_USED_ACCS; a++) - if (storesSinceLastLoad & (1 << a)) - clearL(a); + AccSet a = storesSinceLastLoad & ((1 << EMB_NUM_USED_ACCS) - 1); + while (a) { + int acc = msbSet(a); + clearL((CseAcc)acc); + a &= ~(1 << acc); + } // No need to clear CONST loads (those in the CSE_ACC_CONST table). @@ -2877,13 +2884,13 @@ namespace nanojit ValidateWriter::ValidateWriter(LirWriter *out, LInsPrinter* printer, const char* where) : LirWriter(out), printer(printer), whereInPipeline(where), - checkAccSetIns1(0), checkAccSetIns2(0) + checkAccSetExtras(0) {} LIns* ValidateWriter::insLoad(LOpcode op, LIns* base, int32_t d, AccSet accSet, LoadQual loadQual) { - checkAccSet(op, base, accSet); + checkAccSet(op, base, d, accSet); switch (loadQual) { case LOAD_CONST: @@ -2921,7 +2928,7 @@ namespace nanojit LIns* ValidateWriter::insStore(LOpcode op, LIns* value, LIns* base, int32_t d, AccSet accSet) { - checkAccSet(op, base, accSet); + checkAccSet(op, base, d, accSet); int nArgs = 2; LTy formals[2] = { LTy_V, LTy_P }; // LTy_V is overwritten shortly diff --git a/js/src/nanojit/LIR.h b/js/src/nanojit/LIR.h index f7c08216e6c7..6f98822c5d34 100644 --- a/js/src/nanojit/LIR.h +++ b/js/src/nanojit/LIR.h @@ -262,6 +262,11 @@ namespace nanojit static const AccSet ACCSET_LOAD_ANY = ACCSET_ALL; // synonym static const AccSet ACCSET_STORE_ANY = ACCSET_ALL; // synonym + inline bool isSingletonAccSet(AccSet accSet) { + // This is a neat way of testing if a value has only one bit set. + return (accSet & (accSet - 1)) == 0; + } + // Full AccSets don't fit into load and store instructions. But // load/store AccSets almost always contain a single access region. We // take advantage of this to create a compressed AccSet, MiniAccSet, that @@ -284,23 +289,35 @@ namespace nanojit struct MiniAccSet { MiniAccSetVal val; }; static const MiniAccSet MINI_ACCSET_MULTIPLE = { 99 }; +#if defined(_WIN32) && (_MSC_VER >= 1300) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64)) + extern "C" unsigned char _BitScanReverse(unsigned long * Index, unsigned long Mask); + # pragma intrinsic(_BitScanReverse) + + // Returns the index of the most significant bit that is set. + static int msbSet(uint32_t x) { + unsigned long idx; + _BitScanReverse(&idx, (unsigned long)(x | 1)); // the '| 1' ensures a 0 result when x==0 + return idx; + } +#elif (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + static int msbSet(uint32_t x) { + return 31 - __builtin_clz(x | 1); + } +#else + static int msbSet(uint32_t x) { // slow fallback version + for (int i = 31; i >= 0; i--) + if ((1 << i) & x) + return i; + return 0; + } +#endif + static MiniAccSet compressAccSet(AccSet accSet) { - // As the number of regions increase, this may become a bottleneck. - // If it does we can first count the number of bits using Kernighan's - // technique - // (http://graphics.stanford.edu/~seander/bithacks.html#CountBitsSetKernighan) - // and if it's a single-region set, use a bit-scanning instruction to - // work out which single-region set it is. That would require - // factoring out the bit-scanning code currently in - // nRegisterAllocFromSet(). - // - // Try all the single-region AccSets first. - for (int i = 0; i < NUM_ACCS; i++) { - if (accSet == (1U << i)) { - MiniAccSet ret = { uint8_t(i) }; - return ret; - } + if (isSingletonAccSet(accSet)) { + MiniAccSet ret = { uint8_t(msbSet(accSet)) }; + return ret; } + // If we got here, it must be a multi-region AccSet. return MINI_ACCSET_MULTIPLE; } @@ -2234,15 +2251,14 @@ namespace nanojit void checkLInsHasOpcode(LOpcode op, int argN, LIns* ins, LOpcode op2); void checkLInsIsACondOrConst(LOpcode op, int argN, LIns* ins); void checkLInsIsNull(LOpcode op, int argN, LIns* ins); - void checkAccSet(LOpcode op, LIns* base, AccSet accSet); // defined by the embedder + void checkAccSet(LOpcode op, LIns* base, int32_t disp, AccSet accSet); // defined by the embedder // These can be set by the embedder and used in checkAccSet(). - LIns *checkAccSetIns1, *checkAccSetIns2; + void** checkAccSetExtras; public: ValidateWriter(LirWriter* out, LInsPrinter* printer, const char* where); - void setCheckAccSetIns1(LIns* ins) { checkAccSetIns1 = ins; } - void setCheckAccSetIns2(LIns* ins) { checkAccSetIns2 = ins; } + void setCheckAccSetExtras(void** extras) { checkAccSetExtras = extras; } LIns* insLoad(LOpcode op, LIns* base, int32_t d, AccSet accSet, LoadQual loadQual); LIns* insStore(LOpcode op, LIns* value, LIns* base, int32_t d, AccSet accSet); diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp index a39dd0bc2289..9ff1be62370a 100644 --- a/js/src/shell/js.cpp +++ b/js/src/shell/js.cpp @@ -1058,6 +1058,14 @@ PutStr(JSContext *cx, uintN argc, jsval *vp) return JS_TRUE; } +static JSBool +Now(JSContext *cx, uintN argc, jsval *vp) +{ + jsdouble now = PRMJ_Now() / double(PRMJ_USEC_PER_MSEC); + JS_SET_RVAL(cx, vp, DOUBLE_TO_JSVAL(now)); + return true; +} + static JSBool Print(JSContext *cx, uintN argc, jsval *vp) { @@ -2187,6 +2195,18 @@ DumpHeap(JSContext *cx, uintN argc, jsval *vp) return JS_FALSE; } +JSBool +DumpObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + JSObject *arg0 = NULL; + if (!JS_ConvertArguments(cx, argc, argv, "o", &arg0)) + return JS_FALSE; + + js_DumpObject(arg0); + + return JS_TRUE; +} + #endif /* DEBUG */ #ifdef TEST_CVTARGS @@ -3897,6 +3917,7 @@ static JSFunctionSpec shell_functions[] = { JS_FN("readline", ReadLine, 0,0), JS_FN("print", Print, 0,0), JS_FN("putstr", PutStr, 0,0), + JS_FN("now", Now, 0,0), JS_FS("help", Help, 0,0,0), JS_FS("quit", Quit, 0,0,0), JS_FN("assertEq", AssertEq, 2,0), @@ -3922,6 +3943,7 @@ static JSFunctionSpec shell_functions[] = { JS_FS("disfile", DisassFile, 1,0,0), JS_FS("dissrc", DisassWithSrc, 1,0,0), JS_FN("dumpHeap", DumpHeap, 0,0), + JS_FS("dumpObject", DumpObject, 1,0,0), JS_FS("notes", Notes, 1,0,0), JS_FS("tracing", Tracing, 0,0,0), JS_FS("stats", DumpStats, 1,0,0), @@ -3989,6 +4011,7 @@ static const char *const shell_help_messages[] = { "readline() Read a single line from stdin", "print([exp ...]) Evaluate and print expressions", "putstr([exp]) Evaluate and print expression without newline", +"now() Return the current time with sub-ms precision", "help([name ...]) Display usage and help messages", "quit() Quit the shell", "assertEq(actual, expected[, msg])\n" @@ -4024,6 +4047,7 @@ static const char *const shell_help_messages[] = { "dissrc([fun]) Disassemble functions with source lines", "dumpHeap([fileName[, start[, toFind[, maxDepth[, toIgnore]]]]])\n" " Interface to JS_DumpHeap with output sent to file", +"dumpObject() Dump an internal representation of an object", "notes([fun]) Show source notes for functions", "tracing([true|false|filename]) Turn bytecode execution tracing on/off.\n" " With filename, send to file.\n", @@ -5061,7 +5085,7 @@ main(int argc, char **argv, char **envp) CALIBRATION_DELAY_COUNT = 0; #endif - rt = JS_NewRuntime(64L * 1024L * 1024L); + rt = JS_NewRuntime(128L * 1024L * 1024L); if (!rt) return 1; diff --git a/js/src/shell/njs b/js/src/shell/njs index d92c01691ea2..5c9175060810 100755 --- a/js/src/shell/njs +++ b/js/src/shell/njs @@ -25,10 +25,18 @@ if __name__ == '__main__': help='JS file to load', metavar='FILE') op.add_option('-e', '--expression', dest='js_exps', action='append', help='JS expression to evaluate') + op.add_option('-i', '--interactive', dest='js_interactive', action='store_true', + help='enable interactive shell') + op.add_option('-H', '--harmony', dest='js_harmony', action='store_true', + help='enable ECMAScript Harmony mode') (options, args) = op.parse_args() cmd = "" + + if options.js_harmony: + cmd += 'Narcissus.options={version:"harmony"}; ' + if options.js_exps: for exp in options.js_exps: cmd += 'Narcissus.jsexec.evaluate("%s"); ' % exp.replace('"', '\\"') @@ -37,5 +45,11 @@ if __name__ == '__main__': for file in options.js_files: cmd += 'Narcissus.jsexec.evaluate(snarf("%(file)s"), "%(file)s", 1); ' % { 'file':file } + if (not options.js_exps) and (not options.js_files): + options.js_interactive = True + + if options.js_interactive: + cmd += 'Narcissus.jsexec.repl();' + Popen([js_cmd, '-f', narc_jsdefs, '-f', narc_jslex, '-f', narc_jsparse, '-f', narc_jsexec, '-e', cmd]).wait() diff --git a/js/src/tests/browser.js b/js/src/tests/browser.js index 14da51e1fca6..ec6e76c9d621 100644 --- a/js/src/tests/browser.js +++ b/js/src/tests/browser.js @@ -126,7 +126,7 @@ window.onerror = function (msg, page, line) EXPECTED = 'Unknown'; } - var testcase = new TestCase(gTestfile, DESCRIPTION, EXPECTED, "error"); + var testcase = new TestCase("unknown-test-name", DESCRIPTION, EXPECTED, "error"); if (document.location.href.indexOf('-n.js') != -1) { diff --git a/js/src/tests/e4x/Expressions/11.1.1.js b/js/src/tests/e4x/Expressions/11.1.1.js index 785da72e4862..50d613487e46 100644 --- a/js/src/tests/e4x/Expressions/11.1.1.js +++ b/js/src/tests/e4x/Expressions/11.1.1.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.1.1.js'; START("11.1.1 - Attribute Identifiers"); diff --git a/js/src/tests/e4x/Expressions/11.1.2.js b/js/src/tests/e4x/Expressions/11.1.2.js index 9a91cc11efb6..dc8599c18fbe 100644 --- a/js/src/tests/e4x/Expressions/11.1.2.js +++ b/js/src/tests/e4x/Expressions/11.1.2.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.1.2.js'; START("11.1.2 - Qualified Identifiers"); diff --git a/js/src/tests/e4x/Expressions/11.1.3.js b/js/src/tests/e4x/Expressions/11.1.3.js index a6416ebdbe76..1e676c2fc7f8 100644 --- a/js/src/tests/e4x/Expressions/11.1.3.js +++ b/js/src/tests/e4x/Expressions/11.1.3.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.1.3.js'; START("11.1.3 - Wildcard Identifiers"); diff --git a/js/src/tests/e4x/Expressions/11.1.4-01.js b/js/src/tests/e4x/Expressions/11.1.4-01.js index 633b2087588c..c9f0b7ddc832 100644 --- a/js/src/tests/e4x/Expressions/11.1.4-01.js +++ b/js/src/tests/e4x/Expressions/11.1.4-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.1.4-01.js'; var summary = '11.1.4 - XML Initializer should accept single processing ' + 'instruction'; diff --git a/js/src/tests/e4x/Expressions/11.1.4-02.js b/js/src/tests/e4x/Expressions/11.1.4-02.js index 0d63a452fb83..e7585dfc4b5b 100644 --- a/js/src/tests/e4x/Expressions/11.1.4-02.js +++ b/js/src/tests/e4x/Expressions/11.1.4-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.1.4-02.js'; var summary = "11.1.4 - XML Initializer should accept single CDATA Section"; var BUGNUMBER = 257679; diff --git a/js/src/tests/e4x/Expressions/11.1.4-03.js b/js/src/tests/e4x/Expressions/11.1.4-03.js index 0a8e288808a4..f40cddf2d63e 100644 --- a/js/src/tests/e4x/Expressions/11.1.4-03.js +++ b/js/src/tests/e4x/Expressions/11.1.4-03.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.1.4-03.js'; var summary = '11.1.4 - XML Initializer should accept single comment'; var BUGNUMBER = 257679; diff --git a/js/src/tests/e4x/Expressions/11.1.4-04.js b/js/src/tests/e4x/Expressions/11.1.4-04.js index 5cb1ba757dcb..62869fc8e1b3 100644 --- a/js/src/tests/e4x/Expressions/11.1.4-04.js +++ b/js/src/tests/e4x/Expressions/11.1.4-04.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.1.4-04.js'; var summary = "11.1.4 - XML Initializer - Comment hiding parsing/scanning"; var BUGNUMBER = 311157; diff --git a/js/src/tests/e4x/Expressions/11.1.4-05.js b/js/src/tests/e4x/Expressions/11.1.4-05.js index e8689947691c..f70975e8290d 100644 --- a/js/src/tests/e4x/Expressions/11.1.4-05.js +++ b/js/src/tests/e4x/Expressions/11.1.4-05.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.1.4-05.js'; var summary = "11.1.4 - XML Initializer - Comment hiding parsing/scanning"; var BUGNUMBER = 311157; diff --git a/js/src/tests/e4x/Expressions/11.1.4-06.js b/js/src/tests/e4x/Expressions/11.1.4-06.js index 8b81c8980ac3..7aec695a1ff6 100644 --- a/js/src/tests/e4x/Expressions/11.1.4-06.js +++ b/js/src/tests/e4x/Expressions/11.1.4-06.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.1.4-06.js'; var summary = "11.1.4 - ]] should be allowed in CDATA Section"; var BUGNUMBER = 313929; diff --git a/js/src/tests/e4x/Expressions/11.1.4-07.js b/js/src/tests/e4x/Expressions/11.1.4-07.js index b339aac3274d..984910f54d9b 100644 --- a/js/src/tests/e4x/Expressions/11.1.4-07.js +++ b/js/src/tests/e4x/Expressions/11.1.4-07.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.1.4-07.js'; var summary = "11.1.4 - XML Initializer - x"; var BUGNUMBER = 321549; diff --git a/js/src/tests/e4x/Expressions/11.1.4-08.js b/js/src/tests/e4x/Expressions/11.1.4-08.js index c48aaadeade3..c2b706835e97 100644 --- a/js/src/tests/e4x/Expressions/11.1.4-08.js +++ b/js/src/tests/e4x/Expressions/11.1.4-08.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.1.4-08.js'; var summary = "11.1.4 - XML Initializer - {} Expressions - 08"; diff --git a/js/src/tests/e4x/Expressions/11.1.4.js b/js/src/tests/e4x/Expressions/11.1.4.js index 59dccae70361..6ff90422c1a5 100644 --- a/js/src/tests/e4x/Expressions/11.1.4.js +++ b/js/src/tests/e4x/Expressions/11.1.4.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.1.4.js'; START("11.1.4 - XML Initializer"); diff --git a/js/src/tests/e4x/Expressions/11.1.5.js b/js/src/tests/e4x/Expressions/11.1.5.js index b943b9512e93..73f362332fb9 100644 --- a/js/src/tests/e4x/Expressions/11.1.5.js +++ b/js/src/tests/e4x/Expressions/11.1.5.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.1.5.js'; START("11.1.5 - XMLList Initializer"); diff --git a/js/src/tests/e4x/Expressions/11.2.1.js b/js/src/tests/e4x/Expressions/11.2.1.js index 18e077736e03..5b3964f0b0ea 100644 --- a/js/src/tests/e4x/Expressions/11.2.1.js +++ b/js/src/tests/e4x/Expressions/11.2.1.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.1.js'; START("11.2.1 - Property Accessors"); diff --git a/js/src/tests/e4x/Expressions/11.2.2.js b/js/src/tests/e4x/Expressions/11.2.2.js index 6565b9008de3..517cedc0c03d 100644 --- a/js/src/tests/e4x/Expressions/11.2.2.js +++ b/js/src/tests/e4x/Expressions/11.2.2.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.2.js'; START("11.2.2 - Function Calls"); diff --git a/js/src/tests/e4x/Expressions/11.2.3.js b/js/src/tests/e4x/Expressions/11.2.3.js index 0d502724428f..e9dd632ee060 100644 --- a/js/src/tests/e4x/Expressions/11.2.3.js +++ b/js/src/tests/e4x/Expressions/11.2.3.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.3.js'; START("11.2.3 - XML Descendant Accessor"); @@ -58,4 +57,4 @@ correct = TEST(1, correct, names); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/Expressions/11.2.4.js b/js/src/tests/e4x/Expressions/11.2.4.js index 03535db7afd7..7d58a2d9911a 100644 --- a/js/src/tests/e4x/Expressions/11.2.4.js +++ b/js/src/tests/e4x/Expressions/11.2.4.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.4.js'; START("11.2.4 - XML Filtering Predicate Operator"); diff --git a/js/src/tests/e4x/Expressions/11.3.1.js b/js/src/tests/e4x/Expressions/11.3.1.js index bd062d286029..4b4d002de6e9 100644 --- a/js/src/tests/e4x/Expressions/11.3.1.js +++ b/js/src/tests/e4x/Expressions/11.3.1.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.3.1.js'; START("11.3.1 - Delete Operator"); diff --git a/js/src/tests/e4x/Expressions/11.3.2.js b/js/src/tests/e4x/Expressions/11.3.2.js index 4e00ede95230..f41e8c99d027 100644 --- a/js/src/tests/e4x/Expressions/11.3.2.js +++ b/js/src/tests/e4x/Expressions/11.3.2.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.3.2.js'; START("11.3.2 - Typeof Operator"); @@ -49,4 +48,4 @@ TEST(1, "xml", typeof(x)); x = new XMLList(); TEST(2, "xml", typeof(x)); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/Expressions/11.4.1.js b/js/src/tests/e4x/Expressions/11.4.1.js index 2b8fe1b89968..015d25607b75 100644 --- a/js/src/tests/e4x/Expressions/11.4.1.js +++ b/js/src/tests/e4x/Expressions/11.4.1.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.4.1.js'; START("11.4.1 - Addition Operator"); diff --git a/js/src/tests/e4x/Expressions/11.5.1.js b/js/src/tests/e4x/Expressions/11.5.1.js index 3af8b42f9a2e..7aec2e30c46b 100644 --- a/js/src/tests/e4x/Expressions/11.5.1.js +++ b/js/src/tests/e4x/Expressions/11.5.1.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.5.1.js'; START("11.5.1 - Equality Operators"); @@ -98,4 +97,4 @@ TEST(16, false, p == q); q = new QName(null, "a"); TEST(16, false, p == q); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/Expressions/11.6.1.js b/js/src/tests/e4x/Expressions/11.6.1.js index ce4da8edd027..ecdd8d2a5ff0 100644 --- a/js/src/tests/e4x/Expressions/11.6.1.js +++ b/js/src/tests/e4x/Expressions/11.6.1.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.6.1.js'; START("11.6.1 - XML Assignment"); diff --git a/js/src/tests/e4x/Expressions/11.6.2.js b/js/src/tests/e4x/Expressions/11.6.2.js index 8504f464c074..713d3a499575 100644 --- a/js/src/tests/e4x/Expressions/11.6.2.js +++ b/js/src/tests/e4x/Expressions/11.6.2.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.6.2.js'; START("11.6.2 - XMLList Assignment"); diff --git a/js/src/tests/e4x/Expressions/11.6.3.js b/js/src/tests/e4x/Expressions/11.6.3.js index 554d26506567..fb4f2012432a 100644 --- a/js/src/tests/e4x/Expressions/11.6.3.js +++ b/js/src/tests/e4x/Expressions/11.6.3.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.6.3.js'; START("11.6.3 - Compound Assignment"); @@ -116,4 +115,4 @@ e.employee[1] += Fred + TEST(2, correct, e); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/Expressions/regress-301545.js b/js/src/tests/e4x/Expressions/regress-301545.js index e7fa80d419dc..6cb27a4b3cef 100644 --- a/js/src/tests/e4x/Expressions/regress-301545.js +++ b/js/src/tests/e4x/Expressions/regress-301545.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-301545.js'; var summary = "11.1.1 - Attribute Identifiers Do not crash when " + "attribute-op name collides with local var"; diff --git a/js/src/tests/e4x/Expressions/regress-302531.js b/js/src/tests/e4x/Expressions/regress-302531.js index b3dcedbd2f0b..8dce3259cf4c 100644 --- a/js/src/tests/e4x/Expressions/regress-302531.js +++ b/js/src/tests/e4x/Expressions/regress-302531.js @@ -5,7 +5,6 @@ * Contributor: Blake Kaplan */ -gTestfile = 'regress-302531.js'; var summary = "E4X QuoteString should deal with empty string"; var BUGNUMBER = 302531; diff --git a/js/src/tests/e4x/Expressions/regress-340024.js b/js/src/tests/e4x/Expressions/regress-340024.js index d688361f4621..f0407ce9ca6c 100644 --- a/js/src/tests/e4x/Expressions/regress-340024.js +++ b/js/src/tests/e4x/Expressions/regress-340024.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-340024.js'; var BUGNUMBER = 340024; var summary = '11.1.4 - XML Initializer'; diff --git a/js/src/tests/e4x/Expressions/regress-366123.js b/js/src/tests/e4x/Expressions/regress-366123.js index 007278856b89..6a6f2b256920 100644 --- a/js/src/tests/e4x/Expressions/regress-366123.js +++ b/js/src/tests/e4x/Expressions/regress-366123.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-366123.js'; var BUGNUMBER = 366123; var summary = 'Compiling long XML filtering predicate'; diff --git a/js/src/tests/e4x/Expressions/regress-496113.js b/js/src/tests/e4x/Expressions/regress-496113.js index 0729ee19ad11..c298f40de6ce 100644 --- a/js/src/tests/e4x/Expressions/regress-496113.js +++ b/js/src/tests/e4x/Expressions/regress-496113.js @@ -40,7 +40,6 @@ // See https://developer.mozilla.org/en/Core_JavaScript_1.5_Guide/Processing_XML_with_E4X#section_7 -gTestfile = 'regress-496113.js'; var summary = 'simple filter'; var BUGNUMBER = 496113; diff --git a/js/src/tests/e4x/Expressions/shell.js b/js/src/tests/e4x/Expressions/shell.js index 8f5d1129d56e..e69de29bb2d1 100644 --- a/js/src/tests/e4x/Expressions/shell.js +++ b/js/src/tests/e4x/Expressions/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Expressions'; diff --git a/js/src/tests/e4x/GC/regress-280844-1.js b/js/src/tests/e4x/GC/regress-280844-1.js index 1ade541110b1..1a51c8ec8a83 100644 --- a/js/src/tests/e4x/GC/regress-280844-1.js +++ b/js/src/tests/e4x/GC/regress-280844-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-280844-1.js'; var summary = 'Uncontrolled recursion in js_MarkXML during GC'; var BUGNUMBER = 280844; diff --git a/js/src/tests/e4x/GC/regress-280844-2.js b/js/src/tests/e4x/GC/regress-280844-2.js index 877161a3c673..2f1fc0a2e98a 100644 --- a/js/src/tests/e4x/GC/regress-280844-2.js +++ b/js/src/tests/e4x/GC/regress-280844-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-280844-2.js'; var summary = 'Uncontrolled recursion in js_MarkXML during GC'; var BUGNUMBER = 280844; diff --git a/js/src/tests/e4x/GC/regress-292455.js b/js/src/tests/e4x/GC/regress-292455.js index 4239aedaf985..8ed68259d752 100644 --- a/js/src/tests/e4x/GC/regress-292455.js +++ b/js/src/tests/e4x/GC/regress-292455.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-292455.js'; var summary = "Regress - Do not crash on gc"; var BUGNUMBER = 292455; diff --git a/js/src/tests/e4x/GC/regress-313952-01.js b/js/src/tests/e4x/GC/regress-313952-01.js index 940939836b5d..23ffcc023ef5 100644 --- a/js/src/tests/e4x/GC/regress-313952-01.js +++ b/js/src/tests/e4x/GC/regress-313952-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-313952-01.js'; var summary = "13.3.5.2 - root QName.uri"; var BUGNUMBER = 313952; diff --git a/js/src/tests/e4x/GC/regress-313952-02.js b/js/src/tests/e4x/GC/regress-313952-02.js index d02a1721140a..ebaf9277d1a0 100644 --- a/js/src/tests/e4x/GC/regress-313952-02.js +++ b/js/src/tests/e4x/GC/regress-313952-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-313952-02.js'; var summary = "13.3.5.2 - root QName.uri"; var BUGNUMBER = 313952; diff --git a/js/src/tests/e4x/GC/regress-324117.js b/js/src/tests/e4x/GC/regress-324117.js index de51b0a7709e..67b4ee997a30 100644 --- a/js/src/tests/e4x/GC/regress-324117.js +++ b/js/src/tests/e4x/GC/regress-324117.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-324117.js'; var summary = "GC hazard during namespace scanning"; var BUGNUMBER = 324117; diff --git a/js/src/tests/e4x/GC/regress-324278.js b/js/src/tests/e4x/GC/regress-324278.js index 338bc485cfa4..185cf31db855 100644 --- a/js/src/tests/e4x/GC/regress-324278.js +++ b/js/src/tests/e4x/GC/regress-324278.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-324278.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 324278; diff --git a/js/src/tests/e4x/GC/regress-339785.js b/js/src/tests/e4x/GC/regress-339785.js index 8488b0deb36e..393d6cc58030 100644 --- a/js/src/tests/e4x/GC/regress-339785.js +++ b/js/src/tests/e4x/GC/regress-339785.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-339785.js'; var summary = "scanner: memory exposure to scripts"; var BUGNUMBER = 339785; diff --git a/js/src/tests/e4x/GC/regress-357063-01.js b/js/src/tests/e4x/GC/regress-357063-01.js index 93ffb03e3928..34ed7f3272ed 100644 --- a/js/src/tests/e4x/GC/regress-357063-01.js +++ b/js/src/tests/e4x/GC/regress-357063-01.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-357063-01.js'; var BUGNUMBER = 357063; var summary = 'GC hazard in XMLEquality'; diff --git a/js/src/tests/e4x/GC/regress-357063-02.js b/js/src/tests/e4x/GC/regress-357063-02.js index 495cacc47436..62a62be56f33 100644 --- a/js/src/tests/e4x/GC/regress-357063-02.js +++ b/js/src/tests/e4x/GC/regress-357063-02.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-357063-02.js'; var BUGNUMBER = 357063; var summary = 'GC hazard in XMLEquality'; diff --git a/js/src/tests/e4x/GC/shell.js b/js/src/tests/e4x/GC/shell.js index 123ca9efed3b..e69de29bb2d1 100644 --- a/js/src/tests/e4x/GC/shell.js +++ b/js/src/tests/e4x/GC/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'GC'; diff --git a/js/src/tests/e4x/Global/13.1.2.1.js b/js/src/tests/e4x/Global/13.1.2.1.js index 553b7a505a4f..c14ff5190319 100644 --- a/js/src/tests/e4x/Global/13.1.2.1.js +++ b/js/src/tests/e4x/Global/13.1.2.1.js @@ -39,7 +39,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.1.2.1.js'; START("13.1.2.1 - isXMLName()"); diff --git a/js/src/tests/e4x/Global/shell.js b/js/src/tests/e4x/Global/shell.js index a4f58ecf002f..e69de29bb2d1 100644 --- a/js/src/tests/e4x/Global/shell.js +++ b/js/src/tests/e4x/Global/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Global'; diff --git a/js/src/tests/e4x/Namespace/13.2.1.js b/js/src/tests/e4x/Namespace/13.2.1.js index 2c13b4a1d334..01d479b6afb1 100644 --- a/js/src/tests/e4x/Namespace/13.2.1.js +++ b/js/src/tests/e4x/Namespace/13.2.1.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.2.1.js'; START("13.2.1 - Namespace Constructor as Function"); @@ -65,4 +64,4 @@ TEST(9, m.uri, n.uri); n = Namespace(m); TEST(10, m, n); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/Namespace/13.2.2.js b/js/src/tests/e4x/Namespace/13.2.2.js index 93751f53e092..0635f1ba8df8 100644 --- a/js/src/tests/e4x/Namespace/13.2.2.js +++ b/js/src/tests/e4x/Namespace/13.2.2.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.2.2.js'; START("13.2.2 - Namespace Constructor"); @@ -83,4 +82,4 @@ try { TEST(19, "TypeError", ex.name); } -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/Namespace/13.2.5.js b/js/src/tests/e4x/Namespace/13.2.5.js index 8186db800281..3a8ebf3ee14d 100644 --- a/js/src/tests/e4x/Namespace/13.2.5.js +++ b/js/src/tests/e4x/Namespace/13.2.5.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.2.5.js'; START("13.2.5 - Properties of Namespace Instances"); @@ -64,4 +63,4 @@ TEST(6, 1, uriCount); TEST(7, "ns", n.prefix); TEST(8, "http://someuri", n.uri); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/Namespace/regress-283972.js b/js/src/tests/e4x/Namespace/regress-283972.js index 5d5e3c0a1404..ed419a7598a7 100644 --- a/js/src/tests/e4x/Namespace/regress-283972.js +++ b/js/src/tests/e4x/Namespace/regress-283972.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-283972.js'; var summary = 'throw error when two attributes with the same local name and ' + 'the same namespace'; diff --git a/js/src/tests/e4x/Namespace/regress-292863.js b/js/src/tests/e4x/Namespace/regress-292863.js index dbf20b26912e..5a2b82dea3ad 100644 --- a/js/src/tests/e4x/Namespace/regress-292863.js +++ b/js/src/tests/e4x/Namespace/regress-292863.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-292863.js'; var summary = "Undeclaring namespace prefix should cause parse error"; var BUGNUMBER = 292863; diff --git a/js/src/tests/e4x/Namespace/regress-350442.js b/js/src/tests/e4x/Namespace/regress-350442.js index 699b0c9da1a3..8b7254a70499 100644 --- a/js/src/tests/e4x/Namespace/regress-350442.js +++ b/js/src/tests/e4x/Namespace/regress-350442.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-350442.js'; var BUGNUMBER = 350442; var summary = 'toXMLString with namespace definitions'; diff --git a/js/src/tests/e4x/Namespace/regress-444608-02.js b/js/src/tests/e4x/Namespace/regress-444608-02.js index e64095d1fbe8..7dfe5d8b1798 100644 --- a/js/src/tests/e4x/Namespace/regress-444608-02.js +++ b/js/src/tests/e4x/Namespace/regress-444608-02.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-444608-02.js'; var summary = '13.2 Namespaces - call constructors directly'; var BUGNUMBER = 444608; diff --git a/js/src/tests/e4x/Namespace/regress-444608.js b/js/src/tests/e4x/Namespace/regress-444608.js index 32b058acf4ae..d6641a5976a9 100644 --- a/js/src/tests/e4x/Namespace/regress-444608.js +++ b/js/src/tests/e4x/Namespace/regress-444608.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-444608.js'; var summary = '13.2 Namespaces - call constructors directly'; var BUGNUMBER = 444608; diff --git a/js/src/tests/e4x/Namespace/shell.js b/js/src/tests/e4x/Namespace/shell.js index 67a778666c05..e69de29bb2d1 100644 --- a/js/src/tests/e4x/Namespace/shell.js +++ b/js/src/tests/e4x/Namespace/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Namespace'; diff --git a/js/src/tests/e4x/QName/13.3.1.js b/js/src/tests/e4x/QName/13.3.1.js index 1e97ae1653b5..1ce49656876e 100644 --- a/js/src/tests/e4x/QName/13.3.1.js +++ b/js/src/tests/e4x/QName/13.3.1.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.3.1.js'; START("13.3.1 - QName Constructor as a Function"); @@ -72,4 +71,4 @@ TEST(12, p.uri, q.uri); p = QName(q); TEST(13, p, q); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/QName/13.3.2.js b/js/src/tests/e4x/QName/13.3.2.js index ec02910817e6..2be86d7d546a 100644 --- a/js/src/tests/e4x/QName/13.3.2.js +++ b/js/src/tests/e4x/QName/13.3.2.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.3.2.js'; START("13.3.2 - QName Constructor"); @@ -84,4 +83,4 @@ TEST(22, "null", q.localName); TEST(23, null, q.uri); TEST(24, "*::null", q.toString()); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/QName/13.3.5.js b/js/src/tests/e4x/QName/13.3.5.js index 73408e84d95c..30964af6782f 100644 --- a/js/src/tests/e4x/QName/13.3.5.js +++ b/js/src/tests/e4x/QName/13.3.5.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.3.5.js'; START("13.3.5 - Properties of QName Instances"); diff --git a/js/src/tests/e4x/QName/regress-373595-01.js b/js/src/tests/e4x/QName/regress-373595-01.js index 51304d5a3f3f..b8f0df72886b 100644 --- a/js/src/tests/e4x/QName/regress-373595-01.js +++ b/js/src/tests/e4x/QName/regress-373595-01.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-373595-01.js'; var summary = '13.3 QName Objects - Do not assert: op == JSOP_ADD'; var BUGNUMBER = 373595; diff --git a/js/src/tests/e4x/QName/regress-373595-02.js b/js/src/tests/e4x/QName/regress-373595-02.js index bb04f3cbce3f..f8b1d80c7d8c 100644 --- a/js/src/tests/e4x/QName/regress-373595-02.js +++ b/js/src/tests/e4x/QName/regress-373595-02.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-373595-02.js'; var summary = '13.3 QName Objects - Do not assert: op == JSOP_ADD'; var BUGNUMBER = 373595; diff --git a/js/src/tests/e4x/QName/regress-373595-03.js b/js/src/tests/e4x/QName/regress-373595-03.js index 723448831e90..0cb24d1424ad 100644 --- a/js/src/tests/e4x/QName/regress-373595-03.js +++ b/js/src/tests/e4x/QName/regress-373595-03.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-373595-03.js'; var summary = '13.3 QName Objects - Do not assert: op == JSOP_ADD'; var BUGNUMBER = 373595; diff --git a/js/src/tests/e4x/QName/regress-444608.js b/js/src/tests/e4x/QName/regress-444608.js index 8818c2816518..6db8b2306808 100644 --- a/js/src/tests/e4x/QName/regress-444608.js +++ b/js/src/tests/e4x/QName/regress-444608.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-444608.js'; var summary = '13.3 QNames - call constructors directly'; var BUGNUMBER = 444608; diff --git a/js/src/tests/e4x/QName/shell.js b/js/src/tests/e4x/QName/shell.js index 6bcad1f24430..e69de29bb2d1 100644 --- a/js/src/tests/e4x/QName/shell.js +++ b/js/src/tests/e4x/QName/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'QName'; diff --git a/js/src/tests/e4x/Regress/regress-257679.js b/js/src/tests/e4x/Regress/regress-257679.js index 12074f0ebfa1..5fc54a86a612 100644 --- a/js/src/tests/e4x/Regress/regress-257679.js +++ b/js/src/tests/e4x/Regress/regress-257679.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-257679.js'; START("Standalone should be allowed"); printBugNumber(257679); diff --git a/js/src/tests/e4x/Regress/regress-263934.js b/js/src/tests/e4x/Regress/regress-263934.js index 0904c3a70d02..4c46b81edbe3 100644 --- a/js/src/tests/e4x/Regress/regress-263934.js +++ b/js/src/tests/e4x/Regress/regress-263934.js @@ -39,7 +39,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-263934.js'; START("Testing that replacing a list item with a new list that contains that item works"); printBugNumber(263934); @@ -63,4 +62,4 @@ var expected = TEST(1, expected, x); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/Regress/regress-263935.js b/js/src/tests/e4x/Regress/regress-263935.js index e1df8c6edacf..df62546c6f90 100644 --- a/js/src/tests/e4x/Regress/regress-263935.js +++ b/js/src/tests/e4x/Regress/regress-263935.js @@ -39,7 +39,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-263935.js'; START("Qualified names specifying all names in no namespace should only match names without namespaces"); printBugNumber(263935); @@ -64,4 +63,4 @@ var expected = TEST(1, expected, actual); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/Regress/regress-263936.js b/js/src/tests/e4x/Regress/regress-263936.js index 59a0bf7facab..9bcd62c320a7 100644 --- a/js/src/tests/e4x/Regress/regress-263936.js +++ b/js/src/tests/e4x/Regress/regress-263936.js @@ -39,7 +39,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-263936.js'; START("Testing replacing an element with a list that contains a text node"); printBugNumber(263936); @@ -62,4 +61,4 @@ var expected = TEST(1, expected, x); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/Regress/regress-264369.js b/js/src/tests/e4x/Regress/regress-264369.js index 541a643d2bde..ce7ac67b3b8a 100644 --- a/js/src/tests/e4x/Regress/regress-264369.js +++ b/js/src/tests/e4x/Regress/regress-264369.js @@ -39,7 +39,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-264369.js'; START("toXMLString() should escape '>'"); printBugNumber(264369); diff --git a/js/src/tests/e4x/Regress/regress-271545.js b/js/src/tests/e4x/Regress/regress-271545.js index ba48dc84ea9f..4970c38e82ca 100644 --- a/js/src/tests/e4x/Regress/regress-271545.js +++ b/js/src/tests/e4x/Regress/regress-271545.js @@ -39,7 +39,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-271545.js'; START('XML("") should create empty text node'); printBugNumber(271545); diff --git a/js/src/tests/e4x/Regress/regress-277650.js b/js/src/tests/e4x/Regress/regress-277650.js index 407cce087a31..febff237e2b5 100644 --- a/js/src/tests/e4x/Regress/regress-277650.js +++ b/js/src/tests/e4x/Regress/regress-277650.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-277650.js'; // testcase from Martin.Honnen@arcor.de diff --git a/js/src/tests/e4x/Regress/regress-277664.js b/js/src/tests/e4x/Regress/regress-277664.js index 607efddee7f9..bfe6d02eab37 100644 --- a/js/src/tests/e4x/Regress/regress-277664.js +++ b/js/src/tests/e4x/Regress/regress-277664.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-277664.js'; // testcase from Martin.Honnen@arcor.de diff --git a/js/src/tests/e4x/Regress/regress-277683.js b/js/src/tests/e4x/Regress/regress-277683.js index cbf7c10ce39b..bb47c8eb99d3 100644 --- a/js/src/tests/e4x/Regress/regress-277683.js +++ b/js/src/tests/e4x/Regress/regress-277683.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-277683.js'; // testcase from Martin.Honnen@arcor.de diff --git a/js/src/tests/e4x/Regress/regress-277779.js b/js/src/tests/e4x/Regress/regress-277779.js index f0c716cbc308..ab7318a62345 100644 --- a/js/src/tests/e4x/Regress/regress-277779.js +++ b/js/src/tests/e4x/Regress/regress-277779.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-277779.js'; // testcase from Martin.Honnen@arcor.de diff --git a/js/src/tests/e4x/Regress/regress-277935.js b/js/src/tests/e4x/Regress/regress-277935.js index 60389f4e4788..4db94a4eaf4c 100644 --- a/js/src/tests/e4x/Regress/regress-277935.js +++ b/js/src/tests/e4x/Regress/regress-277935.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-277935.js'; START('XML("") should create empty text node'); printBugNumber(277935); diff --git a/js/src/tests/e4x/Regress/regress-278112.js b/js/src/tests/e4x/Regress/regress-278112.js index 913efe72325f..add7ef60c7db 100644 --- a/js/src/tests/e4x/Regress/regress-278112.js +++ b/js/src/tests/e4x/Regress/regress-278112.js @@ -39,7 +39,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-278112.js'; START('setNamespace() should not affect namespaceDeclarations()'); printBugNumber('278112'); diff --git a/js/src/tests/e4x/Regress/regress-283349.js b/js/src/tests/e4x/Regress/regress-283349.js index 39a88731d6b0..e1bc351b0d28 100644 --- a/js/src/tests/e4x/Regress/regress-283349.js +++ b/js/src/tests/e4x/Regress/regress-283349.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-283349.js'; var summary = "13.3.5.4 - [[GetNamespace]]"; var BUGNUMBER = 283349; diff --git a/js/src/tests/e4x/Regress/regress-290056.js b/js/src/tests/e4x/Regress/regress-290056.js index c36e05a55cac..f81946cff9b0 100644 --- a/js/src/tests/e4x/Regress/regress-290056.js +++ b/js/src/tests/e4x/Regress/regress-290056.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-290056.js'; var summary = 'Dont crash when serializing an XML object where the name ' + 'of an attribute was changed with setName'; diff --git a/js/src/tests/e4x/Regress/regress-290499.js b/js/src/tests/e4x/Regress/regress-290499.js index dacba02c9b7f..6a3e2e9624af 100644 --- a/js/src/tests/e4x/Regress/regress-290499.js +++ b/js/src/tests/e4x/Regress/regress-290499.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-290499.js'; var summary = "11.1.5 XMLList Initialiser Don't Crash with empty Initializer"; var BUGNUMBER = 290499; diff --git a/js/src/tests/e4x/Regress/regress-301553.js b/js/src/tests/e4x/Regress/regress-301553.js index b3761626412e..6f39785d2e47 100644 --- a/js/src/tests/e4x/Regress/regress-301553.js +++ b/js/src/tests/e4x/Regress/regress-301553.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-301553.js'; var summary = "E4X - Should not repress exceptions"; var BUGNUMBER = 301553; diff --git a/js/src/tests/e4x/Regress/regress-301573.js b/js/src/tests/e4x/Regress/regress-301573.js index 30ca98c01ba8..d92b40b0a2e1 100644 --- a/js/src/tests/e4x/Regress/regress-301573.js +++ b/js/src/tests/e4x/Regress/regress-301573.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-301573.js'; var summary = "E4X - Entities"; var BUGNUMBER = 301573; diff --git a/js/src/tests/e4x/Regress/regress-301596.js b/js/src/tests/e4x/Regress/regress-301596.js index 70f0b3f319a6..2b525d23046d 100644 --- a/js/src/tests/e4x/Regress/regress-301596.js +++ b/js/src/tests/e4x/Regress/regress-301596.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-301596.js'; var summary = "E4X - Do not crash with XMLList filters"; var BUGNUMBER = 301596; diff --git a/js/src/tests/e4x/Regress/regress-301692.js b/js/src/tests/e4x/Regress/regress-301692.js index ad4c89e43570..6ee7b23879e7 100644 --- a/js/src/tests/e4x/Regress/regress-301692.js +++ b/js/src/tests/e4x/Regress/regress-301692.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-301692.js'; var summary = "Function.prototype.toString should not quote XML literals"; var BUGNUMBER = 301692; diff --git a/js/src/tests/e4x/Regress/regress-308111.js b/js/src/tests/e4x/Regress/regress-308111.js index 4a1e89d60bdc..36c87cb243c2 100644 --- a/js/src/tests/e4x/Regress/regress-308111.js +++ b/js/src/tests/e4x/Regress/regress-308111.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-308111.js'; var summary = "Regression - Do not crash when searching large e4x tree"; var BUGNUMBER = 308111; diff --git a/js/src/tests/e4x/Regress/regress-309897.js b/js/src/tests/e4x/Regress/regress-309897.js index 43b7204d60eb..6ddcd707012a 100644 --- a/js/src/tests/e4x/Regress/regress-309897.js +++ b/js/src/tests/e4x/Regress/regress-309897.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-309897.js'; var summary = "Regression - appending elements crashes mozilla"; var BUGNUMBER = 309897; diff --git a/js/src/tests/e4x/Regress/regress-311580.js b/js/src/tests/e4x/Regress/regress-311580.js index 1d34289ae8c3..c04d6c884b07 100644 --- a/js/src/tests/e4x/Regress/regress-311580.js +++ b/js/src/tests/e4x/Regress/regress-311580.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-311580.js'; var summary = "Regression - properly root stack in toXMLString"; var BUGNUMBER = 311580; diff --git a/js/src/tests/e4x/Regress/regress-313799.js b/js/src/tests/e4x/Regress/regress-313799.js index 5d847c1601b5..dea1fee2d690 100644 --- a/js/src/tests/e4x/Regress/regress-313799.js +++ b/js/src/tests/e4x/Regress/regress-313799.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-313799.js'; var summary = 'Do not crash on XMLListInitializer.child(0)'; var BUGNUMBER = 313799; diff --git a/js/src/tests/e4x/Regress/regress-318922.js b/js/src/tests/e4x/Regress/regress-318922.js index e359339e823f..e4209cf431cb 100644 --- a/js/src/tests/e4x/Regress/regress-318922.js +++ b/js/src/tests/e4x/Regress/regress-318922.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-318922.js'; var summary = 'E4X - Do not crash on XML initializer '; var BUGNUMBER = 318922; diff --git a/js/src/tests/e4x/Regress/regress-319872.js b/js/src/tests/e4x/Regress/regress-319872.js index cce5428a30dc..f197f64b8e1e 100644 --- a/js/src/tests/e4x/Regress/regress-319872.js +++ b/js/src/tests/e4x/Regress/regress-319872.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-319872.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 319872; diff --git a/js/src/tests/e4x/Regress/regress-321547.js b/js/src/tests/e4x/Regress/regress-321547.js index 910a320b7271..4ab40496a3be 100644 --- a/js/src/tests/e4x/Regress/regress-321547.js +++ b/js/src/tests/e4x/Regress/regress-321547.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-321547.js'; var summary = "Operator .. should not implicitly quote its right operand"; var BUGNUMBER = 321547; diff --git a/js/src/tests/e4x/Regress/regress-322499.js b/js/src/tests/e4x/Regress/regress-322499.js index 9d94c092c80f..9d0d2386cd60 100644 --- a/js/src/tests/e4x/Regress/regress-322499.js +++ b/js/src/tests/e4x/Regress/regress-322499.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-322499.js'; var summary = "Do not define AnyName"; var BUGNUMBER = 322499; diff --git a/js/src/tests/e4x/Regress/regress-323338-1.js b/js/src/tests/e4x/Regress/regress-323338-1.js index bc25b1ff6e63..8d76b4c3aa5d 100644 --- a/js/src/tests/e4x/Regress/regress-323338-1.js +++ b/js/src/tests/e4x/Regress/regress-323338-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-323338-1.js'; var summary = "Do not crash when qn->uri is null"; var BUGNUMBER = 323338; diff --git a/js/src/tests/e4x/Regress/regress-323338-2.js b/js/src/tests/e4x/Regress/regress-323338-2.js index d880e6fc26b1..8db1785bb68c 100644 --- a/js/src/tests/e4x/Regress/regress-323338-2.js +++ b/js/src/tests/e4x/Regress/regress-323338-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-323338-2.js'; var summary = "Do not crash when qn->uri is null"; var BUGNUMBER = 323338; diff --git a/js/src/tests/e4x/Regress/regress-325425.js b/js/src/tests/e4x/Regress/regress-325425.js index 9dabc40182f6..392d92aacb70 100644 --- a/js/src/tests/e4x/Regress/regress-325425.js +++ b/js/src/tests/e4x/Regress/regress-325425.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-325425.js'; var BUGNUMBER = 325425; var summary = 'jsxml.c: Bad assumptions about js_ConstructObject'; diff --git a/js/src/tests/e4x/Regress/regress-327564.js b/js/src/tests/e4x/Regress/regress-327564.js index 46f5e70094f6..6a9f24b1b95d 100644 --- a/js/src/tests/e4x/Regress/regress-327564.js +++ b/js/src/tests/e4x/Regress/regress-327564.js @@ -37,8 +37,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-327564.js'; - var summary = "Hang due to cycle in XML object"; var BUGNUMBER = 327564; diff --git a/js/src/tests/e4x/Regress/regress-327691-01.js b/js/src/tests/e4x/Regress/regress-327691-01.js index 5511f70a99f8..6fb3503b3dda 100644 --- a/js/src/tests/e4x/Regress/regress-327691-01.js +++ b/js/src/tests/e4x/Regress/regress-327691-01.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-327691-01.js'; var summary = "Do not crash in js_IsXMLName"; var BUGNUMBER = 327691; diff --git a/js/src/tests/e4x/Regress/regress-327691-02.js b/js/src/tests/e4x/Regress/regress-327691-02.js index 0a6bc27c55c0..6773338a1420 100644 --- a/js/src/tests/e4x/Regress/regress-327691-02.js +++ b/js/src/tests/e4x/Regress/regress-327691-02.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-327691-02.js'; var summary = "Do not crash during gc()"; var BUGNUMBER = 327691; diff --git a/js/src/tests/e4x/Regress/regress-327697.js b/js/src/tests/e4x/Regress/regress-327697.js index c03496beb0e6..81bbf9f86236 100644 --- a/js/src/tests/e4x/Regress/regress-327697.js +++ b/js/src/tests/e4x/Regress/regress-327697.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-327697.js'; var summary = "Make XPConnect refuse to wrap e4x"; var BUGNUMBER = 327697; diff --git a/js/src/tests/e4x/Regress/regress-328249.js b/js/src/tests/e4x/Regress/regress-328249.js index 7a8a1749a3d1..caf8347e537c 100644 --- a/js/src/tests/e4x/Regress/regress-328249.js +++ b/js/src/tests/e4x/Regress/regress-328249.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-328249.js'; var summary = "Crash due to infinite recursion in js_IsXMLName"; var BUGNUMBER = 328249; diff --git a/js/src/tests/e4x/Regress/regress-329257.js b/js/src/tests/e4x/Regress/regress-329257.js index f50d113a94ba..89d7bb2d7e9a 100644 --- a/js/src/tests/e4x/Regress/regress-329257.js +++ b/js/src/tests/e4x/Regress/regress-329257.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-329257.js'; var BUGNUMBER = 329257; var summary = "namespace prefix in E4X dot query"; diff --git a/js/src/tests/e4x/Regress/regress-331558.js b/js/src/tests/e4x/Regress/regress-331558.js index c40953948b57..0435de7bb315 100644 --- a/js/src/tests/e4x/Regress/regress-331558.js +++ b/js/src/tests/e4x/Regress/regress-331558.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-331558.js'; var BUGNUMBER = 331558; var summary = 'Decompiler: Missing = in default xml namespace statement'; diff --git a/js/src/tests/e4x/Regress/regress-331664.js b/js/src/tests/e4x/Regress/regress-331664.js index a9529653a1f4..e2d2b3da16ae 100644 --- a/js/src/tests/e4x/Regress/regress-331664.js +++ b/js/src/tests/e4x/Regress/regress-331664.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-331664.js'; var summary = "Null pointer deref crash deleting XML methods"; var BUGNUMBER = 331664; diff --git a/js/src/tests/e4x/Regress/regress-344455.js b/js/src/tests/e4x/Regress/regress-344455.js index db812b94c214..66cbdbb47f08 100644 --- a/js/src/tests/e4x/Regress/regress-344455.js +++ b/js/src/tests/e4x/Regress/regress-344455.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-344455.js'; var summary = "Error - tag name mismatch error message should include tag name"; var BUGNUMBER = 344455; diff --git a/js/src/tests/e4x/Regress/regress-347155.js b/js/src/tests/e4x/Regress/regress-347155.js index e97c9bcd2253..63cfe22d2dc6 100644 --- a/js/src/tests/e4x/Regress/regress-347155.js +++ b/js/src/tests/e4x/Regress/regress-347155.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-347155.js'; var BUGNUMBER = 347155; var summary = 'Do not crash with deeply nested e4x literal'; diff --git a/js/src/tests/e4x/Regress/regress-350206-1.js b/js/src/tests/e4x/Regress/regress-350206-1.js index 7a4c131cc999..10780f78a281 100644 --- a/js/src/tests/e4x/Regress/regress-350206-1.js +++ b/js/src/tests/e4x/Regress/regress-350206-1.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-350206-1.js'; //----------------------------------------------------------------------------- var BUGNUMBER = "350206"; diff --git a/js/src/tests/e4x/Regress/regress-350206.js b/js/src/tests/e4x/Regress/regress-350206.js index ce137a4df30a..3e1f2773bbfa 100644 --- a/js/src/tests/e4x/Regress/regress-350206.js +++ b/js/src/tests/e4x/Regress/regress-350206.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-350206.js'; var BUGNUMBER = 350206; var summary = 'Do not assert: serial <= n in jsxml.c'; diff --git a/js/src/tests/e4x/Regress/regress-350238.js b/js/src/tests/e4x/Regress/regress-350238.js index 3c6c4461afc9..aea288f1c7fb 100644 --- a/js/src/tests/e4x/Regress/regress-350238.js +++ b/js/src/tests/e4x/Regress/regress-350238.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-350238.js'; var BUGNUMBER = 350238; var summary = 'Do not assert .@*++'; diff --git a/js/src/tests/e4x/Regress/regress-350629.js b/js/src/tests/e4x/Regress/regress-350629.js index e720de2a6f7b..f6f755d6a7d9 100644 --- a/js/src/tests/e4x/Regress/regress-350629.js +++ b/js/src/tests/e4x/Regress/regress-350629.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-350629.js'; //----------------------------------------------------------------------------- var BUGNUMBER = "350629"; diff --git a/js/src/tests/e4x/Regress/regress-352097.js b/js/src/tests/e4x/Regress/regress-352097.js index 7494ed23f595..3608efa076c2 100644 --- a/js/src/tests/e4x/Regress/regress-352097.js +++ b/js/src/tests/e4x/Regress/regress-352097.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-352097.js'; //----------------------------------------------------------------------------- var BUGNUMBER = "352097"; diff --git a/js/src/tests/e4x/Regress/regress-352103.js b/js/src/tests/e4x/Regress/regress-352103.js index 56ab45f4fdf9..89676a7df84a 100644 --- a/js/src/tests/e4x/Regress/regress-352103.js +++ b/js/src/tests/e4x/Regress/regress-352103.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-352103.js'; //----------------------------------------------------------------------------- var BUGNUMBER = "352103"; diff --git a/js/src/tests/e4x/Regress/regress-352223.js b/js/src/tests/e4x/Regress/regress-352223.js index e7eb9adab4ed..3a21b4d9f6cf 100644 --- a/js/src/tests/e4x/Regress/regress-352223.js +++ b/js/src/tests/e4x/Regress/regress-352223.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-352223.js'; var BUGNUMBER = 352223; var summary = 'Reject invalid spaces in tags'; diff --git a/js/src/tests/e4x/Regress/regress-354145-01.js b/js/src/tests/e4x/Regress/regress-354145-01.js index 0f1566f23828..81456f813ee3 100644 --- a/js/src/tests/e4x/Regress/regress-354145-01.js +++ b/js/src/tests/e4x/Regress/regress-354145-01.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-354145-01.js'; var BUGNUMBER = 354145; var summary = 'Immutable XML'; diff --git a/js/src/tests/e4x/Regress/regress-354145-02.js b/js/src/tests/e4x/Regress/regress-354145-02.js index babe1e6142ec..9faf73982baa 100644 --- a/js/src/tests/e4x/Regress/regress-354145-02.js +++ b/js/src/tests/e4x/Regress/regress-354145-02.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-354145-02.js'; var BUGNUMBER = 354145; var summary = 'Immutable XML'; diff --git a/js/src/tests/e4x/Regress/regress-354145-03.js b/js/src/tests/e4x/Regress/regress-354145-03.js index a41a46de57e5..a06436170024 100644 --- a/js/src/tests/e4x/Regress/regress-354145-03.js +++ b/js/src/tests/e4x/Regress/regress-354145-03.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-354145-03.js'; var BUGNUMBER = 354145; var summary = 'Immutable XML'; diff --git a/js/src/tests/e4x/Regress/regress-354145-04.js b/js/src/tests/e4x/Regress/regress-354145-04.js index e09854b593ce..e5d19c55d3c2 100644 --- a/js/src/tests/e4x/Regress/regress-354145-04.js +++ b/js/src/tests/e4x/Regress/regress-354145-04.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-354145-04.js'; var BUGNUMBER = 354145; var summary = 'Immutable XML'; diff --git a/js/src/tests/e4x/Regress/regress-354145-05.js b/js/src/tests/e4x/Regress/regress-354145-05.js index 662c9f117935..1a519654f989 100644 --- a/js/src/tests/e4x/Regress/regress-354145-05.js +++ b/js/src/tests/e4x/Regress/regress-354145-05.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-354145-05.js'; var BUGNUMBER = 354145; var summary = 'Immutable XML'; diff --git a/js/src/tests/e4x/Regress/regress-354145-07.js b/js/src/tests/e4x/Regress/regress-354145-07.js index a7b9a535fc9c..24d732ba08f2 100644 --- a/js/src/tests/e4x/Regress/regress-354145-07.js +++ b/js/src/tests/e4x/Regress/regress-354145-07.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-354145-07.js'; var BUGNUMBER = 354145; var summary = 'Immutable XML'; diff --git a/js/src/tests/e4x/Regress/regress-354998.js b/js/src/tests/e4x/Regress/regress-354998.js index 08f152cce63f..a710003e3109 100644 --- a/js/src/tests/e4x/Regress/regress-354998.js +++ b/js/src/tests/e4x/Regress/regress-354998.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-354998.js'; var BUGNUMBER = 354998; var summary = 'prototype should not be enumerated for XML objects.'; diff --git a/js/src/tests/e4x/Regress/regress-355474-02.js b/js/src/tests/e4x/Regress/regress-355474-02.js index 4f660efba841..a941eaa37ab4 100644 --- a/js/src/tests/e4x/Regress/regress-355474-02.js +++ b/js/src/tests/e4x/Regress/regress-355474-02.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-355474-02.js'; var BUGNUMBER = 355474; var summary = 'Iterating over XML with WAY_TOO_MUCH_GC'; diff --git a/js/src/tests/e4x/Regress/regress-355478.js b/js/src/tests/e4x/Regress/regress-355478.js index 272667d262a1..83b4a5b2b068 100644 --- a/js/src/tests/e4x/Regress/regress-355478.js +++ b/js/src/tests/e4x/Regress/regress-355478.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-355478.js'; var BUGNUMBER = 355478; var summary = 'Do not crash with hasOwnProperty'; diff --git a/js/src/tests/e4x/Regress/regress-355569.js b/js/src/tests/e4x/Regress/regress-355569.js index a3a5f80fa3bf..1453c3ea28da 100644 --- a/js/src/tests/e4x/Regress/regress-355569.js +++ b/js/src/tests/e4x/Regress/regress-355569.js @@ -35,7 +35,6 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-355569.js'; var bug = 355569; var actual = ''; diff --git a/js/src/tests/e4x/Regress/regress-356238-01.js b/js/src/tests/e4x/Regress/regress-356238-01.js index 22b36e0c0312..a3225bdbe5f1 100644 --- a/js/src/tests/e4x/Regress/regress-356238-01.js +++ b/js/src/tests/e4x/Regress/regress-356238-01.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-356238-01.js'; var BUGNUMBER = 356238; var summary = 'bug 356238'; diff --git a/js/src/tests/e4x/Regress/regress-356238-02.js b/js/src/tests/e4x/Regress/regress-356238-02.js index 4d1db332443b..2c8a21661b0c 100644 --- a/js/src/tests/e4x/Regress/regress-356238-02.js +++ b/js/src/tests/e4x/Regress/regress-356238-02.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-356238-02.js'; var BUGNUMBER = 356238; var summary = 'bug 356238'; diff --git a/js/src/tests/e4x/Regress/regress-356238-03.js b/js/src/tests/e4x/Regress/regress-356238-03.js index 119b9b68eb2a..ad41c6e174c4 100644 --- a/js/src/tests/e4x/Regress/regress-356238-03.js +++ b/js/src/tests/e4x/Regress/regress-356238-03.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-356238-03.js'; var BUGNUMBER = 356238; var summary = 'bug 356238'; diff --git a/js/src/tests/e4x/Regress/regress-361451.js b/js/src/tests/e4x/Regress/regress-361451.js index 48166dc584f7..6d964cebe496 100644 --- a/js/src/tests/e4x/Regress/regress-361451.js +++ b/js/src/tests/e4x/Regress/regress-361451.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-361451.js'; var BUGNUMBER = 361451; var summary = 'Do not crash with E4X, watch, import'; diff --git a/js/src/tests/e4x/Regress/regress-364017.js b/js/src/tests/e4x/Regress/regress-364017.js index 73eb38fa4788..d21740a49e83 100644 --- a/js/src/tests/e4x/Regress/regress-364017.js +++ b/js/src/tests/e4x/Regress/regress-364017.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-364017.js'; var BUGNUMBER = 364017; var summary = 'Do not assert map->vector && i < map->length'; diff --git a/js/src/tests/e4x/Regress/regress-369032.js b/js/src/tests/e4x/Regress/regress-369032.js index 1d73bc019675..a5490aad446c 100644 --- a/js/src/tests/e4x/Regress/regress-369032.js +++ b/js/src/tests/e4x/Regress/regress-369032.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-369032.js'; var summary = 'Do not assert: kid2->parent == xml || !kid2->parent'; var BUGNUMBER = 369032; diff --git a/js/src/tests/e4x/Regress/regress-369536.js b/js/src/tests/e4x/Regress/regress-369536.js index 6568eb7b315f..17053e6d6197 100644 --- a/js/src/tests/e4x/Regress/regress-369536.js +++ b/js/src/tests/e4x/Regress/regress-369536.js @@ -37,7 +37,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-369536.js'; START("Assignment to XML property removes attributes"); printBugNumber(369536); diff --git a/js/src/tests/e4x/Regress/regress-369740.js b/js/src/tests/e4x/Regress/regress-369740.js index c65a51592b82..bb0e42870ddd 100644 --- a/js/src/tests/e4x/Regress/regress-369740.js +++ b/js/src/tests/e4x/Regress/regress-369740.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-369740.js'; var BUGNUMBER = 369740; var summary = 'generic code for function::'; diff --git a/js/src/tests/e4x/Regress/regress-370016.js b/js/src/tests/e4x/Regress/regress-370016.js index 072986b657df..037828aeeb59 100644 --- a/js/src/tests/e4x/Regress/regress-370016.js +++ b/js/src/tests/e4x/Regress/regress-370016.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-370016.js'; var BUGNUMBER = 370016; var summary = 'with (nonxmlobj) function::'; diff --git a/js/src/tests/e4x/Regress/regress-370048-01.js b/js/src/tests/e4x/Regress/regress-370048-01.js index 2b891481b2c0..f729ad069c2c 100644 --- a/js/src/tests/e4x/Regress/regress-370048-01.js +++ b/js/src/tests/e4x/Regress/regress-370048-01.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-370048-01.js'; var BUGNUMBER = 370048; var summary = 'with (obj) function:: with xml lists'; diff --git a/js/src/tests/e4x/Regress/regress-370048-02.js b/js/src/tests/e4x/Regress/regress-370048-02.js index c9a207f2699d..a2ee728717fd 100644 --- a/js/src/tests/e4x/Regress/regress-370048-02.js +++ b/js/src/tests/e4x/Regress/regress-370048-02.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-370048-02.js'; var BUGNUMBER = 370048; var summary = 'with (obj) function:: with xml lists'; diff --git a/js/src/tests/e4x/Regress/regress-370372.js b/js/src/tests/e4x/Regress/regress-370372.js index 5df111838337..7952f859170c 100644 --- a/js/src/tests/e4x/Regress/regress-370372.js +++ b/js/src/tests/e4x/Regress/regress-370372.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-370372.js'; var BUGNUMBER = 370372; var summary = 'with (xmllist) function::name assignments'; diff --git a/js/src/tests/e4x/Regress/regress-371369.js b/js/src/tests/e4x/Regress/regress-371369.js index d87afd63db51..69e52090b1d7 100644 --- a/js/src/tests/e4x/Regress/regress-371369.js +++ b/js/src/tests/e4x/Regress/regress-371369.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-371369.js'; var BUGNUMBER = 371369; var summary = 'delete xml.function::name does not work'; diff --git a/js/src/tests/e4x/Regress/regress-372563.js b/js/src/tests/e4x/Regress/regress-372563.js index 74353b6931bf..c1da9177586b 100644 --- a/js/src/tests/e4x/Regress/regress-372563.js +++ b/js/src/tests/e4x/Regress/regress-372563.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-372563.js'; var BUGNUMBER = 372563; var summary = 'Do not assert: ss->top >= 2'; diff --git a/js/src/tests/e4x/Regress/regress-372564.js b/js/src/tests/e4x/Regress/regress-372564.js index 4e3a5dfd6a13..3b8dd6c2b882 100644 --- a/js/src/tests/e4x/Regress/regress-372564.js +++ b/js/src/tests/e4x/Regress/regress-372564.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-372564.js'; var BUGNUMBER = 372564; var summary = 'Do not assert: op == JSOP_ADD'; diff --git a/js/src/tests/e4x/Regress/regress-373082.js b/js/src/tests/e4x/Regress/regress-373082.js index 24e118f5a770..9a3cade4a1b3 100644 --- a/js/src/tests/e4x/Regress/regress-373082.js +++ b/js/src/tests/e4x/Regress/regress-373082.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-373082.js'; var BUGNUMBER = 373082; var summary = 'Simpler sharing of XML and XMLList functions'; diff --git a/js/src/tests/e4x/Regress/regress-374106.js b/js/src/tests/e4x/Regress/regress-374106.js index 5086455f3fd1..7269771c21fc 100644 --- a/js/src/tests/e4x/Regress/regress-374106.js +++ b/js/src/tests/e4x/Regress/regress-374106.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-374106.js'; var BUGNUMBER = 374106; var summary = 'e4x XMLList.contains execution halts with complex match'; diff --git a/js/src/tests/e4x/Regress/regress-374112.js b/js/src/tests/e4x/Regress/regress-374112.js index fe88d894b7af..30034bd02a83 100644 --- a/js/src/tests/e4x/Regress/regress-374112.js +++ b/js/src/tests/e4x/Regress/regress-374112.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-374112.js'; var BUGNUMBER = 374112; var summary = 'E4X Do not assert with xml.setName(...)'; diff --git a/js/src/tests/e4x/Regress/regress-374116.js b/js/src/tests/e4x/Regress/regress-374116.js index 1989baa73e5f..5bb694f56e81 100644 --- a/js/src/tests/e4x/Regress/regress-374116.js +++ b/js/src/tests/e4x/Regress/regress-374116.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-374116.js'; var BUGNUMBER = 374116; var summary = 'Crash with .@b[1] = 2;'; diff --git a/js/src/tests/e4x/Regress/regress-374160.js b/js/src/tests/e4x/Regress/regress-374160.js index afcaa9c646a2..587fa623f7f6 100644 --- a/js/src/tests/e4x/Regress/regress-374160.js +++ b/js/src/tests/e4x/Regress/regress-374160.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-374160.js'; var BUGNUMBER = 374160; var summary = 'Do not assert with ..@c[0]=3'; diff --git a/js/src/tests/e4x/Regress/regress-375406.js b/js/src/tests/e4x/Regress/regress-375406.js index 7d1ce259e136..30ef00446042 100644 --- a/js/src/tests/e4x/Regress/regress-375406.js +++ b/js/src/tests/e4x/Regress/regress-375406.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-375406.js'; var summary = 'Do not crash @ PutProperty setting .attribute("")[0]'; var BUGNUMBER = 375406; diff --git a/js/src/tests/e4x/Regress/regress-378492.js b/js/src/tests/e4x/Regress/regress-378492.js index 00439ea44db0..7d2f9a7133e9 100644 --- a/js/src/tests/e4x/Regress/regress-378492.js +++ b/js/src/tests/e4x/Regress/regress-378492.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-378492.js'; var BUGNUMBER = 378492; var summary = 'namespace_trace/qname_trace should check for null private, ' + diff --git a/js/src/tests/e4x/Regress/regress-380833.js b/js/src/tests/e4x/Regress/regress-380833.js index 90a10c645728..a2d184f515c1 100644 --- a/js/src/tests/e4x/Regress/regress-380833.js +++ b/js/src/tests/e4x/Regress/regress-380833.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-380833.js'; var summary = "Crash during GC after uneval"; var BUGNUMBER = 380833; diff --git a/js/src/tests/e4x/Regress/regress-383255.js b/js/src/tests/e4x/Regress/regress-383255.js index 6046bd9642c4..23e76d4c75b8 100644 --- a/js/src/tests/e4x/Regress/regress-383255.js +++ b/js/src/tests/e4x/Regress/regress-383255.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-383255.js'; var summary = 'Do not assert: JS_UPTRDIFF(fp->sp, fp->spbase) <= depthdiff'; var BUGNUMBER = 383255; diff --git a/js/src/tests/e4x/Regress/regress-394941.js b/js/src/tests/e4x/Regress/regress-394941.js index d073ade25948..e26cbc441e24 100644 --- a/js/src/tests/e4x/Regress/regress-394941.js +++ b/js/src/tests/e4x/Regress/regress-394941.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-394941.js'; var summary = 'Infinite recursion should throw catchable exception'; var BUGNUMBER = 394941; diff --git a/js/src/tests/e4x/Regress/regress-407323.js b/js/src/tests/e4x/Regress/regress-407323.js index 5591da27bf86..c1224aaadae4 100644 --- a/js/src/tests/e4x/Regress/regress-407323.js +++ b/js/src/tests/e4x/Regress/regress-407323.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-407323.js'; var summary = 'XML, XMLList, QName are mutable, Namespace is not.'; var BUGNUMBER = 407323; diff --git a/js/src/tests/e4x/Regress/regress-426520.js b/js/src/tests/e4x/Regress/regress-426520.js index 1118a538a03a..d381068064a9 100755 --- a/js/src/tests/e4x/Regress/regress-426520.js +++ b/js/src/tests/e4x/Regress/regress-426520.js @@ -37,7 +37,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-426520.js'; var summary = 'Do not crash @ ParseXMLSource'; var BUGNUMBER = 426520; diff --git a/js/src/tests/e4x/Regress/regress-453915.js b/js/src/tests/e4x/Regress/regress-453915.js index 1d44102b74a1..ba3b4f3a1648 100644 --- a/js/src/tests/e4x/Regress/regress-453915.js +++ b/js/src/tests/e4x/Regress/regress-453915.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-453915.js'; var summary = 'XML Injection possible via default xml namespace'; var BUGNUMBER = 453915; diff --git a/js/src/tests/e4x/Regress/regress-458679-01.js b/js/src/tests/e4x/Regress/regress-458679-01.js index 695ff53934f2..71b1bb992ce5 100644 --- a/js/src/tests/e4x/Regress/regress-458679-01.js +++ b/js/src/tests/e4x/Regress/regress-458679-01.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-458679-01.js'; var summary = 'GetXMLEntity should not assume FastAppendChar is infallible'; var BUGNUMBER = 458679; diff --git a/js/src/tests/e4x/Regress/regress-458679-02.js b/js/src/tests/e4x/Regress/regress-458679-02.js index f947cfce5d0d..135223f8bada 100644 --- a/js/src/tests/e4x/Regress/regress-458679-02.js +++ b/js/src/tests/e4x/Regress/regress-458679-02.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-458679-02.js'; var summary = 'GetXMLEntity should not assume FastAppendChar is infallible'; var BUGNUMBER = 458679; diff --git a/js/src/tests/e4x/Regress/regress-460180.js b/js/src/tests/e4x/Regress/regress-460180.js index 0dec561198a7..66ab916d6576 100644 --- a/js/src/tests/e4x/Regress/regress-460180.js +++ b/js/src/tests/e4x/Regress/regress-460180.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-460180.js'; var summary = 'Do not crash with if (false || false || ) {}'; var BUGNUMBER = 460180; diff --git a/js/src/tests/e4x/Regress/regress-465063.js b/js/src/tests/e4x/Regress/regress-465063.js index 3f0dfc14e37f..e2d9ceee0f62 100755 --- a/js/src/tests/e4x/Regress/regress-465063.js +++ b/js/src/tests/e4x/Regress/regress-465063.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-465063.js'; var summary = 'Do not crash @ TraceRecorder::hasMethod'; var BUGNUMBER = 465063; diff --git a/js/src/tests/e4x/Regress/regress-470619.js b/js/src/tests/e4x/Regress/regress-470619.js index 768811e6aaf1..52bcb1c587d1 100755 --- a/js/src/tests/e4x/Regress/regress-470619.js +++ b/js/src/tests/e4x/Regress/regress-470619.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-470619.js'; var summary = 'Do not assert: regs.sp - 2 >= StackBase(fp)'; var BUGNUMBER = 470619; diff --git a/js/src/tests/e4x/Regress/regress-473709.js b/js/src/tests/e4x/Regress/regress-473709.js index 6d554b7e4f4c..872bd0407e16 100755 --- a/js/src/tests/e4x/Regress/regress-473709.js +++ b/js/src/tests/e4x/Regress/regress-473709.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-473709.js'; var summary = 'Do not assert: cursor == (uint8 *)copy->messageArgs[0] + argsCopySize'; var BUGNUMBER = 473709; diff --git a/js/src/tests/e4x/Regress/regress-474319.js b/js/src/tests/e4x/Regress/regress-474319.js index a39622140fbe..d25699f0bdd7 100755 --- a/js/src/tests/e4x/Regress/regress-474319.js +++ b/js/src/tests/e4x/Regress/regress-474319.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-474319.js'; var summary = 'Do not crash with e4x, map and concat'; var BUGNUMBER = 474319; diff --git a/js/src/tests/e4x/Regress/regress-477053.js b/js/src/tests/e4x/Regress/regress-477053.js index b797c8993ace..7df62c6ed526 100644 --- a/js/src/tests/e4x/Regress/regress-477053.js +++ b/js/src/tests/e4x/Regress/regress-477053.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-477053.js'; var summary = 'Do not assert: JSVAL_IS_STRING(v)'; var BUGNUMBER = 477053; diff --git a/js/src/tests/e4x/Regress/shell.js b/js/src/tests/e4x/Regress/shell.js index 8c8336902000..e69de29bb2d1 100644 --- a/js/src/tests/e4x/Regress/shell.js +++ b/js/src/tests/e4x/Regress/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Regress'; diff --git a/js/src/tests/e4x/Statements/12.1.js b/js/src/tests/e4x/Statements/12.1.js index 35c76da5e9af..0ec0df2f2d35 100644 --- a/js/src/tests/e4x/Statements/12.1.js +++ b/js/src/tests/e4x/Statements/12.1.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.1.js'; START("12.1 - Default XML Namespace"); diff --git a/js/src/tests/e4x/Statements/12.2.js b/js/src/tests/e4x/Statements/12.2.js index 970d69bb8e73..954af212bc6e 100644 --- a/js/src/tests/e4x/Statements/12.2.js +++ b/js/src/tests/e4x/Statements/12.2.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.2.js'; START("12.2 - For-in statement"); diff --git a/js/src/tests/e4x/Statements/12.3-01.js b/js/src/tests/e4x/Statements/12.3-01.js index b7d17e6d617e..c48b4b167345 100644 --- a/js/src/tests/e4x/Statements/12.3-01.js +++ b/js/src/tests/e4x/Statements/12.3-01.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.3-01.js'; var summary = '12.3 - for-each-in should not affect for-in'; var BUGNUMBER = 292020; diff --git a/js/src/tests/e4x/Statements/shell.js b/js/src/tests/e4x/Statements/shell.js index 7346f697a5ba..e69de29bb2d1 100644 --- a/js/src/tests/e4x/Statements/shell.js +++ b/js/src/tests/e4x/Statements/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Statements'; diff --git a/js/src/tests/e4x/TypeConversion/10.1.1.js b/js/src/tests/e4x/TypeConversion/10.1.1.js index 494217c2cb6d..f1ca4892a164 100644 --- a/js/src/tests/e4x/TypeConversion/10.1.1.js +++ b/js/src/tests/e4x/TypeConversion/10.1.1.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.1.js'; START("10.1.1 - XML.toString"); diff --git a/js/src/tests/e4x/TypeConversion/10.1.2.js b/js/src/tests/e4x/TypeConversion/10.1.2.js index 177c019a3764..93df78e9c2b2 100644 --- a/js/src/tests/e4x/TypeConversion/10.1.2.js +++ b/js/src/tests/e4x/TypeConversion/10.1.2.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.2.js'; START("10.1.2 - XMLList.toString"); diff --git a/js/src/tests/e4x/TypeConversion/10.2.1.js b/js/src/tests/e4x/TypeConversion/10.2.1.js index aef7bcf7b158..a95b47370c22 100644 --- a/js/src/tests/e4x/TypeConversion/10.2.1.js +++ b/js/src/tests/e4x/TypeConversion/10.2.1.js @@ -39,7 +39,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.2.1.js'; START("10.2.1 - XML.toXMLString"); diff --git a/js/src/tests/e4x/TypeConversion/10.3.1.js b/js/src/tests/e4x/TypeConversion/10.3.1.js index 49d45e19609f..d989fb74be72 100644 --- a/js/src/tests/e4x/TypeConversion/10.3.1.js +++ b/js/src/tests/e4x/TypeConversion/10.3.1.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.3.1.js'; START("10.3.1 - toXML applied to String type"); @@ -57,4 +56,4 @@ correct = TEST(1, correct, employees); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/TypeConversion/10.3.js b/js/src/tests/e4x/TypeConversion/10.3.js index 612dff690a63..e5b5f9c0dc70 100644 --- a/js/src/tests/e4x/TypeConversion/10.3.js +++ b/js/src/tests/e4x/TypeConversion/10.3.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.3.js'; START("10.3 - toXML"); diff --git a/js/src/tests/e4x/TypeConversion/10.4.1.js b/js/src/tests/e4x/TypeConversion/10.4.1.js index 4e07387c5dd3..5eebee6870f3 100644 --- a/js/src/tests/e4x/TypeConversion/10.4.1.js +++ b/js/src/tests/e4x/TypeConversion/10.4.1.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.4.1.js'; START("10.4.1 - toXMLList Applied to String type"); @@ -92,4 +91,4 @@ var1 = new XMLList(John + Sue); TEST(8, correct, var1); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/TypeConversion/10.4.js b/js/src/tests/e4x/TypeConversion/10.4.js index 3fbbaeec96b0..d5852448f749 100644 --- a/js/src/tests/e4x/TypeConversion/10.4.js +++ b/js/src/tests/e4x/TypeConversion/10.4.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.4.js'; START("10.4 - toXMLList"); @@ -82,4 +81,4 @@ x = new XMLList(<>onetwo); TEST(8, "one\ntwo", new XMLList(x).toXMLString()); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/TypeConversion/10.5.1.js b/js/src/tests/e4x/TypeConversion/10.5.1.js index c4919372179a..ebd1cb58aa85 100644 --- a/js/src/tests/e4x/TypeConversion/10.5.1.js +++ b/js/src/tests/e4x/TypeConversion/10.5.1.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.5.1.js'; START("10.5.1 - ToAttributeName applied to the String type"); diff --git a/js/src/tests/e4x/TypeConversion/10.5.js b/js/src/tests/e4x/TypeConversion/10.5.js index 2682f12a0f29..68bcb8853b05 100644 --- a/js/src/tests/e4x/TypeConversion/10.5.js +++ b/js/src/tests/e4x/TypeConversion/10.5.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.5.js'; START("10.5 ToAttributeName"); diff --git a/js/src/tests/e4x/TypeConversion/10.6.1.js b/js/src/tests/e4x/TypeConversion/10.6.1.js index 227810afe1c5..362a292946e3 100644 --- a/js/src/tests/e4x/TypeConversion/10.6.1.js +++ b/js/src/tests/e4x/TypeConversion/10.6.1.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.6.1.js'; START("10.6.1 - ToXMLName applied to the String type"); diff --git a/js/src/tests/e4x/TypeConversion/10.6.js b/js/src/tests/e4x/TypeConversion/10.6.js index 705c027b442f..47903c4e62da 100644 --- a/js/src/tests/e4x/TypeConversion/10.6.js +++ b/js/src/tests/e4x/TypeConversion/10.6.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.6.js'; START("10.6 - ToXMLName"); diff --git a/js/src/tests/e4x/TypeConversion/regress-302097.js b/js/src/tests/e4x/TypeConversion/regress-302097.js index 4139452c88b4..7b77f371419a 100644 --- a/js/src/tests/e4x/TypeConversion/regress-302097.js +++ b/js/src/tests/e4x/TypeConversion/regress-302097.js @@ -5,7 +5,6 @@ * Contributors: Blake Kaplan, Bob Clary */ -gTestfile = 'regress-302097.js'; var summary = 'E4X - Function.prototype.toString should not quote {} ' + 'attribute values'; diff --git a/js/src/tests/e4x/TypeConversion/shell.js b/js/src/tests/e4x/TypeConversion/shell.js index 49ce60f62744..e69de29bb2d1 100644 --- a/js/src/tests/e4x/TypeConversion/shell.js +++ b/js/src/tests/e4x/TypeConversion/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'TypeConversion'; diff --git a/js/src/tests/e4x/Types/9.1.1.1.js b/js/src/tests/e4x/Types/9.1.1.1.js index 376eeb58c40a..5c23bff9ffb0 100644 --- a/js/src/tests/e4x/Types/9.1.1.1.js +++ b/js/src/tests/e4x/Types/9.1.1.1.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.1.1.1.js'; START('9.1.1.1 XML [[Get]]'); @@ -301,4 +300,4 @@ try { TEST(29, "TypeError", ex.name); } -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/Types/9.1.1.10.js b/js/src/tests/e4x/Types/9.1.1.10.js index 7d500b97325c..772d27262999 100644 --- a/js/src/tests/e4x/Types/9.1.1.10.js +++ b/js/src/tests/e4x/Types/9.1.1.10.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.1.1.10.js'; START("9.1.1.10 - XML [[ResolveValue]]"); diff --git a/js/src/tests/e4x/Types/9.1.1.11.js b/js/src/tests/e4x/Types/9.1.1.11.js index 2579209f8a20..7f61fb1d6430 100644 --- a/js/src/tests/e4x/Types/9.1.1.11.js +++ b/js/src/tests/e4x/Types/9.1.1.11.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.1.1.11.js'; START("9.1.1.11 - XML [[Insert]]"); diff --git a/js/src/tests/e4x/Types/9.1.1.12.js b/js/src/tests/e4x/Types/9.1.1.12.js index c91e816ac105..1ab6f886bfe3 100644 --- a/js/src/tests/e4x/Types/9.1.1.12.js +++ b/js/src/tests/e4x/Types/9.1.1.12.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.1.1.12.js'; START("9.1.1.12 - XML [[Replace]]"); diff --git a/js/src/tests/e4x/Types/9.1.1.13.js b/js/src/tests/e4x/Types/9.1.1.13.js index 0e71a04437ac..acc8003a5b27 100644 --- a/js/src/tests/e4x/Types/9.1.1.13.js +++ b/js/src/tests/e4x/Types/9.1.1.13.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.1.1.13.js'; START("9.1.1.13 - XML Type [[AddInScopeNamespace]]"); diff --git a/js/src/tests/e4x/Types/9.1.1.2.js b/js/src/tests/e4x/Types/9.1.1.2.js index e9cdc343afbb..8a327b1dcc89 100644 --- a/js/src/tests/e4x/Types/9.1.1.2.js +++ b/js/src/tests/e4x/Types/9.1.1.2.js @@ -41,7 +41,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.1.1.2.js'; START('9.1.1.2 - XML [[Put]]'); diff --git a/js/src/tests/e4x/Types/9.1.1.3.js b/js/src/tests/e4x/Types/9.1.1.3.js index aa5a81ed5920..59fa524f8f39 100644 --- a/js/src/tests/e4x/Types/9.1.1.3.js +++ b/js/src/tests/e4x/Types/9.1.1.3.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.1.1.3.js'; START("9.1.1.3 - XML [[Delete]]"); diff --git a/js/src/tests/e4x/Types/9.1.1.4.js b/js/src/tests/e4x/Types/9.1.1.4.js index 9d9720ba5ab0..4293c1b730b3 100644 --- a/js/src/tests/e4x/Types/9.1.1.4.js +++ b/js/src/tests/e4x/Types/9.1.1.4.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.1.1.4.js'; START("9.1.1.4 - XML [[DeleteByIndex]]"); diff --git a/js/src/tests/e4x/Types/9.1.1.5.js b/js/src/tests/e4x/Types/9.1.1.5.js index d00fa63f4f45..4070e941da7c 100644 --- a/js/src/tests/e4x/Types/9.1.1.5.js +++ b/js/src/tests/e4x/Types/9.1.1.5.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.1.1.5.js'; // XML Type [[Default Value]] START("9.1.1.5 - XML [[Default Value]]"); diff --git a/js/src/tests/e4x/Types/9.1.1.6.js b/js/src/tests/e4x/Types/9.1.1.6.js index 709c6881c64d..488c6c0da5eb 100644 --- a/js/src/tests/e4x/Types/9.1.1.6.js +++ b/js/src/tests/e4x/Types/9.1.1.6.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.1.1.6.js'; START("9.1.1.6 - XML [[HasProperty]]"); @@ -56,4 +55,4 @@ TEST(8, false, 2 in x.bravo); TEST(9, false, "foobar" in x); TEST(10, false, "foobar" in x.bravo); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/Types/9.1.1.7.js b/js/src/tests/e4x/Types/9.1.1.7.js index 013ea1837ab9..a8cb8bad7adc 100644 --- a/js/src/tests/e4x/Types/9.1.1.7.js +++ b/js/src/tests/e4x/Types/9.1.1.7.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.1.1.7.js'; START("9.1.1.7 - XML [[DeepCopy]]"); diff --git a/js/src/tests/e4x/Types/9.1.1.8.js b/js/src/tests/e4x/Types/9.1.1.8.js index 232847ed165e..45a5210dcda0 100644 --- a/js/src/tests/e4x/Types/9.1.1.8.js +++ b/js/src/tests/e4x/Types/9.1.1.8.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.1.1.8.js'; // XML Type [[Descendants]] START("9.1.1.8 - XML [[Descendants]]"); diff --git a/js/src/tests/e4x/Types/9.1.1.9.js b/js/src/tests/e4x/Types/9.1.1.9.js index 4d838bb2ee5a..582b54d801bf 100644 --- a/js/src/tests/e4x/Types/9.1.1.9.js +++ b/js/src/tests/e4x/Types/9.1.1.9.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.1.1.9.js'; START("9.1.1.9 - XML [[Equals]]"); diff --git a/js/src/tests/e4x/Types/9.2.1.1.js b/js/src/tests/e4x/Types/9.2.1.1.js index 77deb4d172b8..e9a74e1b37f5 100644 --- a/js/src/tests/e4x/Types/9.2.1.1.js +++ b/js/src/tests/e4x/Types/9.2.1.1.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.2.1.1.js'; START("9.2.1.1 XMLList [[Get]]"); @@ -161,4 +160,4 @@ correct += new XML("value4"); TEST(10, correct, x..@*); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/Types/9.2.1.10.js b/js/src/tests/e4x/Types/9.2.1.10.js index fc7ed6e7700d..9ad34a01d9bf 100644 --- a/js/src/tests/e4x/Types/9.2.1.10.js +++ b/js/src/tests/e4x/Types/9.2.1.10.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.2.1.10.js'; START("9.2.1.10 XMLList [[ResolveValue]]"); diff --git a/js/src/tests/e4x/Types/9.2.1.2.js b/js/src/tests/e4x/Types/9.2.1.2.js index 91ea1979d127..37aef7f59f95 100644 --- a/js/src/tests/e4x/Types/9.2.1.2.js +++ b/js/src/tests/e4x/Types/9.2.1.2.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.2.1.2.js'; START("9.2.1.2 - XMLList [[Put]]"); @@ -61,4 +60,4 @@ x[0] = four + five; TEST(3, "four\nfive\ntwo", x.toXMLString()); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/Types/9.2.1.3.js b/js/src/tests/e4x/Types/9.2.1.3.js index c93ce53b9c7f..3c11130ee232 100644 --- a/js/src/tests/e4x/Types/9.2.1.3.js +++ b/js/src/tests/e4x/Types/9.2.1.3.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.2.1.3.js'; START("9.2.1.3 XMLList [[Delete]]"); diff --git a/js/src/tests/e4x/Types/9.2.1.4.js b/js/src/tests/e4x/Types/9.2.1.4.js index ba235795733c..acd5f69a26f3 100644 --- a/js/src/tests/e4x/Types/9.2.1.4.js +++ b/js/src/tests/e4x/Types/9.2.1.4.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.2.1.4.js'; START("9.2.1.4 XMLList [[DefaultValue]]"); diff --git a/js/src/tests/e4x/Types/9.2.1.5.js b/js/src/tests/e4x/Types/9.2.1.5.js index a0c4c2aedca6..33a4582436e3 100644 --- a/js/src/tests/e4x/Types/9.2.1.5.js +++ b/js/src/tests/e4x/Types/9.2.1.5.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.2.1.5.js'; START("9.2.1.5 XMLList [[HasProperty]]"); diff --git a/js/src/tests/e4x/Types/9.2.1.6.js b/js/src/tests/e4x/Types/9.2.1.6.js index 0ae5a6d57cdc..bc8a09a97edc 100644 --- a/js/src/tests/e4x/Types/9.2.1.6.js +++ b/js/src/tests/e4x/Types/9.2.1.6.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.2.1.6.js'; START("9.2.1.6 XMLList [[Append]]"); diff --git a/js/src/tests/e4x/Types/9.2.1.7.js b/js/src/tests/e4x/Types/9.2.1.7.js index 36e96170d5b5..298e8a6a01e6 100644 --- a/js/src/tests/e4x/Types/9.2.1.7.js +++ b/js/src/tests/e4x/Types/9.2.1.7.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.2.1.7.js'; START("9.2.1.7 XMLList [[DeepCopy]]"); diff --git a/js/src/tests/e4x/Types/9.2.1.8.js b/js/src/tests/e4x/Types/9.2.1.8.js index 1e34ee149c07..45a6c35774e6 100644 --- a/js/src/tests/e4x/Types/9.2.1.8.js +++ b/js/src/tests/e4x/Types/9.2.1.8.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.2.1.8.js'; START("9.2.1.8 XMLList [[Descendants]]"); diff --git a/js/src/tests/e4x/Types/9.2.1.9.js b/js/src/tests/e4x/Types/9.2.1.9.js index eba9c6eccd73..d3a0e64f5477 100644 --- a/js/src/tests/e4x/Types/9.2.1.9.js +++ b/js/src/tests/e4x/Types/9.2.1.9.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.2.1.9.js'; START("9.2.1.9 XMLList [[Equals]]"); @@ -78,4 +77,4 @@ TEST(9, false, (x == y) || (y == x)); y = new Object(); TEST(10, false, (x == y) || (y == x)); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/Types/shell.js b/js/src/tests/e4x/Types/shell.js index a16b996e00d2..e69de29bb2d1 100644 --- a/js/src/tests/e4x/Types/shell.js +++ b/js/src/tests/e4x/Types/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Types'; diff --git a/js/src/tests/e4x/XML/13.4.1.js b/js/src/tests/e4x/XML/13.4.1.js index 6479d0cbd2e6..117cc24ed0e8 100644 --- a/js/src/tests/e4x/XML/13.4.1.js +++ b/js/src/tests/e4x/XML/13.4.1.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.1.js'; START("13.4.1 - XML Constructor as Function"); diff --git a/js/src/tests/e4x/XML/13.4.2.js b/js/src/tests/e4x/XML/13.4.2.js index 7bdf2b9e2d53..1d414f52f3a5 100644 --- a/js/src/tests/e4x/XML/13.4.2.js +++ b/js/src/tests/e4x/XML/13.4.2.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.2.js'; START("13.4.2 - XML Constructor"); diff --git a/js/src/tests/e4x/XML/13.4.3.10.js b/js/src/tests/e4x/XML/13.4.3.10.js index d3c6d1970807..0e3da21e0ba6 100644 --- a/js/src/tests/e4x/XML/13.4.3.10.js +++ b/js/src/tests/e4x/XML/13.4.3.10.js @@ -37,7 +37,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.3.10.js'; START("13.4.3.10 - XML Constructor [[HasInstance]]"); diff --git a/js/src/tests/e4x/XML/13.4.3.js b/js/src/tests/e4x/XML/13.4.3.js index a17b5af8ce3e..8d6424582e5e 100644 --- a/js/src/tests/e4x/XML/13.4.3.js +++ b/js/src/tests/e4x/XML/13.4.3.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.3.js'; START("13.4.3 - XML Properties"); diff --git a/js/src/tests/e4x/XML/13.4.4.1.js b/js/src/tests/e4x/XML/13.4.4.1.js index dfd1f671925f..69528981d4ac 100644 --- a/js/src/tests/e4x/XML/13.4.4.1.js +++ b/js/src/tests/e4x/XML/13.4.4.1.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.1.js'; START("13.4.4.1 - XML Constructor"); diff --git a/js/src/tests/e4x/XML/13.4.4.10.js b/js/src/tests/e4x/XML/13.4.4.10.js index 0554d499ee11..5c60fa02ec84 100644 --- a/js/src/tests/e4x/XML/13.4.4.10.js +++ b/js/src/tests/e4x/XML/13.4.4.10.js @@ -41,7 +41,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.10.js'; var nTest = 0; diff --git a/js/src/tests/e4x/XML/13.4.4.11.js b/js/src/tests/e4x/XML/13.4.4.11.js index 2fa2d26808e3..5b848d17c444 100644 --- a/js/src/tests/e4x/XML/13.4.4.11.js +++ b/js/src/tests/e4x/XML/13.4.4.11.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.11.js'; START("13.4.4.11 - XML copy()"); diff --git a/js/src/tests/e4x/XML/13.4.4.12-1.js b/js/src/tests/e4x/XML/13.4.4.12-1.js index 7b9b48cbee65..5174ef3641d4 100644 --- a/js/src/tests/e4x/XML/13.4.4.12-1.js +++ b/js/src/tests/e4x/XML/13.4.4.12-1.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.12-1.js'; var summary = "13.4.4.12 - XML Descendants"; var BUGNUMBER = 289117; diff --git a/js/src/tests/e4x/XML/13.4.4.12.js b/js/src/tests/e4x/XML/13.4.4.12.js index 6c96969207ab..77e738878103 100644 --- a/js/src/tests/e4x/XML/13.4.4.12.js +++ b/js/src/tests/e4x/XML/13.4.4.12.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.12.js'; START("13.4.4.12 - XML descendants"); diff --git a/js/src/tests/e4x/XML/13.4.4.13.js b/js/src/tests/e4x/XML/13.4.4.13.js index 7fd067a0dc0a..2ac74bada3d5 100644 --- a/js/src/tests/e4x/XML/13.4.4.13.js +++ b/js/src/tests/e4x/XML/13.4.4.13.js @@ -40,10 +40,9 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.13.js'; START("13.4.4.14 - XML elements()"); TEST(1, true, XML.prototype.hasOwnProperty("elements")); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.14.js b/js/src/tests/e4x/XML/13.4.4.14.js index 2d9094f5556b..4a0f6b3467e4 100644 --- a/js/src/tests/e4x/XML/13.4.4.14.js +++ b/js/src/tests/e4x/XML/13.4.4.14.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.14.js'; START("13.4.4.14 - XML hasOwnProperty()"); @@ -66,4 +65,4 @@ TEST(4, false, x.hasOwnProperty("foobar")); TEST(5, true, XML.prototype.hasOwnProperty("toString")); TEST(6, false, XML.prototype.hasOwnProperty("foobar")); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.15.js b/js/src/tests/e4x/XML/13.4.4.15.js index 37b932bbe3e1..b07304efc5dc 100644 --- a/js/src/tests/e4x/XML/13.4.4.15.js +++ b/js/src/tests/e4x/XML/13.4.4.15.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.15.js'; START("13.4.4.15 - hasComplexContent()"); @@ -76,4 +75,4 @@ TEST(10, false, x.bravo.child(0).hasComplexContent()); TEST(11, true, x.india.hasComplexContent()); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.16.js b/js/src/tests/e4x/XML/13.4.4.16.js index 663ca25529a5..36880e85b683 100644 --- a/js/src/tests/e4x/XML/13.4.4.16.js +++ b/js/src/tests/e4x/XML/13.4.4.16.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.16.js'; START("13.4.4.16 - XML hasSimpleContent()"); @@ -75,4 +74,4 @@ TEST(9, true, x.@attr1.hasSimpleContent()); TEST(10, true, x.bravo.child(0).hasSimpleContent()); TEST(11, false, x.india.hasSimpleContent()); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.17.js b/js/src/tests/e4x/XML/13.4.4.17.js index e96aa35992da..8919a0c3c294 100644 --- a/js/src/tests/e4x/XML/13.4.4.17.js +++ b/js/src/tests/e4x/XML/13.4.4.17.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.17.js'; START("13.4.4.17 - XML inScopeNamespaces()"); @@ -61,4 +60,4 @@ TEST(6, "", namespaces[2].prefix); TEST(7, "", namespaces[2].uri); TEST(8, 3, namespaces.length); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.18.js b/js/src/tests/e4x/XML/13.4.4.18.js index e37cf240a168..5e8ec1e9ab47 100644 --- a/js/src/tests/e4x/XML/13.4.4.18.js +++ b/js/src/tests/e4x/XML/13.4.4.18.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.18.js'; START("13.4.4.18 - XML insertChildAfter()"); @@ -81,4 +80,4 @@ x.insertChildAfter(null, three); TEST(3, correct, x); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.19.js b/js/src/tests/e4x/XML/13.4.4.19.js index 404a9390ef4f..82b54546f6f9 100644 --- a/js/src/tests/e4x/XML/13.4.4.19.js +++ b/js/src/tests/e4x/XML/13.4.4.19.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.19.js'; START("13.4.4.19 - insertChildBefore()"); @@ -81,4 +80,4 @@ x.insertChildBefore(null, three); TEST(3, correct, x); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.2.js b/js/src/tests/e4x/XML/13.4.4.2.js index 94c22860bdd0..e404b6555c93 100644 --- a/js/src/tests/e4x/XML/13.4.4.2.js +++ b/js/src/tests/e4x/XML/13.4.4.2.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.2.js'; START("13.4.4.2 - XML addNamespace()"); @@ -66,4 +65,4 @@ n = new Namespace("ns", "uri"); x.addNamespace(n); TEST(2, "", x.toXMLString()); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.20.js b/js/src/tests/e4x/XML/13.4.4.20.js index b76559698a62..5506b6b13b4e 100644 --- a/js/src/tests/e4x/XML/13.4.4.20.js +++ b/js/src/tests/e4x/XML/13.4.4.20.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.20.js'; START("13.4.4.20 - XML length()"); @@ -62,4 +61,4 @@ TEST(3, 1, x.bravo.length()); TEST(4, 1, x.charlie.length()); TEST(5, 1, x.delta.length()); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.21.js b/js/src/tests/e4x/XML/13.4.4.21.js index 382e331c7dd0..405c6301a14e 100644 --- a/js/src/tests/e4x/XML/13.4.4.21.js +++ b/js/src/tests/e4x/XML/13.4.4.21.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.21.js'; START("13.4.4.21 - XML localName()"); @@ -78,4 +77,4 @@ TEST(7, "name", y); y = x.ns::bravo.@ns::value.localName(); TEST(8, "value", y); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.22.js b/js/src/tests/e4x/XML/13.4.4.22.js index 08b7ba6aead5..f59dcfd69f58 100644 --- a/js/src/tests/e4x/XML/13.4.4.22.js +++ b/js/src/tests/e4x/XML/13.4.4.22.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.22.js'; START("13.4.4.22 - XML name()"); @@ -78,4 +77,4 @@ TEST(7, "http://foo/", y.uri); TEST(8, "value", y.localName); TEST(9, QName("http://foo/", "value"), y); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.23.js b/js/src/tests/e4x/XML/13.4.4.23.js index ad00ed2fd2a8..375381eeee22 100644 --- a/js/src/tests/e4x/XML/13.4.4.23.js +++ b/js/src/tests/e4x/XML/13.4.4.23.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.23.js'; START("13.4.4.23 - XML namespace()"); @@ -90,4 +89,4 @@ TEST(9, Namespace(""), y); y = x.ns::bravo.@ns::value.namespace(); TEST(10, ns.toString(), y.toString()); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.24.js b/js/src/tests/e4x/XML/13.4.4.24.js index bf0123a2bb13..aa194d8347d3 100644 --- a/js/src/tests/e4x/XML/13.4.4.24.js +++ b/js/src/tests/e4x/XML/13.4.4.24.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.24.js'; START("13.4.4.24 - XML namespaceDeclarations()"); @@ -61,4 +60,4 @@ TEST(6, Namespace("http://foo/"), y[0]); TEST(7, "bar", y[1].prefix); TEST(8, Namespace("http://bar/"), y[1]); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.25.js b/js/src/tests/e4x/XML/13.4.4.25.js index 968556610443..dada3a590573 100644 --- a/js/src/tests/e4x/XML/13.4.4.25.js +++ b/js/src/tests/e4x/XML/13.4.4.25.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.25.js'; START("13.4.4.25 - XML nodeKind()"); @@ -59,4 +58,4 @@ x = new XML(); TEST(4, "text", x.nodeKind()); TEST(5, "text", XML.prototype.nodeKind()); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.26.js b/js/src/tests/e4x/XML/13.4.4.26.js index 8a1b49f3e577..7cea37652f28 100644 --- a/js/src/tests/e4x/XML/13.4.4.26.js +++ b/js/src/tests/e4x/XML/13.4.4.26.js @@ -41,7 +41,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.26.js'; START("13.4.4.26 - XML normalize()"); diff --git a/js/src/tests/e4x/XML/13.4.4.27.js b/js/src/tests/e4x/XML/13.4.4.27.js index 156f059cb421..89a82d005403 100644 --- a/js/src/tests/e4x/XML/13.4.4.27.js +++ b/js/src/tests/e4x/XML/13.4.4.27.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.27.js'; START("13.4.4.27 - XML parent()"); diff --git a/js/src/tests/e4x/XML/13.4.4.28.js b/js/src/tests/e4x/XML/13.4.4.28.js index 90d41b0bdefe..6d2daaf873be 100644 --- a/js/src/tests/e4x/XML/13.4.4.28.js +++ b/js/src/tests/e4x/XML/13.4.4.28.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.28.js'; START("13.4.4.28 - processingInsructions()"); diff --git a/js/src/tests/e4x/XML/13.4.4.29.js b/js/src/tests/e4x/XML/13.4.4.29.js index c7e70f2c64e4..071a0be08e41 100644 --- a/js/src/tests/e4x/XML/13.4.4.29.js +++ b/js/src/tests/e4x/XML/13.4.4.29.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.29.js'; START("13.4.4.29 - XML prependChild()"); @@ -90,4 +89,4 @@ emps.employee.(name == "John").prependChild(Mr.); TEST(3, correct, emps); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.3-01.js b/js/src/tests/e4x/XML/13.4.4.3-01.js index 89dada7e260d..236c0d475132 100644 --- a/js/src/tests/e4x/XML/13.4.4.3-01.js +++ b/js/src/tests/e4x/XML/13.4.4.3-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.3-01.js'; var summary = "13.4.4.3 - XML.appendChild should copy child"; diff --git a/js/src/tests/e4x/XML/13.4.4.3-02.js b/js/src/tests/e4x/XML/13.4.4.3-02.js index 9893af4f29d1..d1635669778b 100644 --- a/js/src/tests/e4x/XML/13.4.4.3-02.js +++ b/js/src/tests/e4x/XML/13.4.4.3-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.3-02.js'; var summary = "13.4.4.3 - XML.appendChild should copy child"; var BUGNUMBER = 312692; diff --git a/js/src/tests/e4x/XML/13.4.4.3.js b/js/src/tests/e4x/XML/13.4.4.3.js index 56ba95f3d707..4642a01a6e19 100644 --- a/js/src/tests/e4x/XML/13.4.4.3.js +++ b/js/src/tests/e4x/XML/13.4.4.3.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.3.js'; START("13.4.4.3 - XML appendChild()"); diff --git a/js/src/tests/e4x/XML/13.4.4.30.js b/js/src/tests/e4x/XML/13.4.4.30.js index f1e73835951f..db1512b64467 100644 --- a/js/src/tests/e4x/XML/13.4.4.30.js +++ b/js/src/tests/e4x/XML/13.4.4.30.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.30.js'; START("13.4.4.30 - propertyIsEnumerable()"); @@ -59,4 +58,4 @@ TEST(6, false, x.propertyIsEnumerable()); TEST(7, false, x.propertyIsEnumerable(undefined)); TEST(8, false, x.propertyIsEnumerable(null)); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.31.js b/js/src/tests/e4x/XML/13.4.4.31.js index 5d006b350d76..0dea677601bc 100644 --- a/js/src/tests/e4x/XML/13.4.4.31.js +++ b/js/src/tests/e4x/XML/13.4.4.31.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.31.js'; START("13.4.4.31 - XML removeNamespace()"); @@ -75,4 +74,4 @@ x.removeNamespace("http://foo/"); TEST(3, correct, x); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.32-01.js b/js/src/tests/e4x/XML/13.4.4.32-01.js index 8e078153cb7d..b8408420f5c4 100644 --- a/js/src/tests/e4x/XML/13.4.4.32-01.js +++ b/js/src/tests/e4x/XML/13.4.4.32-01.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.32-01.js'; START("13.4.4.32-1 - XML replace() by index, text to string"); diff --git a/js/src/tests/e4x/XML/13.4.4.32.js b/js/src/tests/e4x/XML/13.4.4.32.js index 6f576abaded9..7d1a3ead414d 100644 --- a/js/src/tests/e4x/XML/13.4.4.32.js +++ b/js/src/tests/e4x/XML/13.4.4.32.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.32.js'; START("13.4.4.32 - XML replace()"); diff --git a/js/src/tests/e4x/XML/13.4.4.33.js b/js/src/tests/e4x/XML/13.4.4.33.js index a9d30ed22255..44e3db149d1f 100644 --- a/js/src/tests/e4x/XML/13.4.4.33.js +++ b/js/src/tests/e4x/XML/13.4.4.33.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.33.js'; START("13.4.4.33 - XML setChildren()"); @@ -77,4 +76,4 @@ emps.employee.(name == "Jim").setChildren(John + 35); TEST(3, correct, emps); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.34.js b/js/src/tests/e4x/XML/13.4.4.34.js index ef11ab9401c3..1bcbf16e1198 100644 --- a/js/src/tests/e4x/XML/13.4.4.34.js +++ b/js/src/tests/e4x/XML/13.4.4.34.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.34.js'; START("13.4.4.34 - XML setLocalName()"); @@ -74,4 +73,4 @@ x.setLocalName("charlie"); TEST(3, correct, x); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.35.js b/js/src/tests/e4x/XML/13.4.4.35.js index 22a9d44a8f18..cf5d572a71f2 100644 --- a/js/src/tests/e4x/XML/13.4.4.35.js +++ b/js/src/tests/e4x/XML/13.4.4.35.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.35.js'; START("13.4.4.35 - setName"); @@ -88,4 +87,4 @@ x.setName(new QName("http://foobar/", "charlie")); TEST(4, correct, x); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.36.js b/js/src/tests/e4x/XML/13.4.4.36.js index 79f246020c46..e967f056dca8 100644 --- a/js/src/tests/e4x/XML/13.4.4.36.js +++ b/js/src/tests/e4x/XML/13.4.4.36.js @@ -41,7 +41,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.36.js'; START("13.4.4.36 - setNamespace"); diff --git a/js/src/tests/e4x/XML/13.4.4.37.js b/js/src/tests/e4x/XML/13.4.4.37.js index cd35a72f0ab8..8e5b94918fd9 100644 --- a/js/src/tests/e4x/XML/13.4.4.37.js +++ b/js/src/tests/e4x/XML/13.4.4.37.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.37.js'; START("13.4.4.37 - XML text()"); @@ -64,4 +63,4 @@ TEST_XML(4, "", x.charlie.text()); TEST_XML(5, "", x.foobar.text()); TEST_XML(6, "one", x.*.text()); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.38.js b/js/src/tests/e4x/XML/13.4.4.38.js index 1cb063c05d1a..c3e81e2c39db 100644 --- a/js/src/tests/e4x/XML/13.4.4.38.js +++ b/js/src/tests/e4x/XML/13.4.4.38.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.38.js'; START("13.4.4.38 - XML toString()"); diff --git a/js/src/tests/e4x/XML/13.4.4.39.js b/js/src/tests/e4x/XML/13.4.4.39.js index 57b084297aff..84a42b7c0b32 100644 --- a/js/src/tests/e4x/XML/13.4.4.39.js +++ b/js/src/tests/e4x/XML/13.4.4.39.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.39.js'; START("13.4.4.39 - XML toXMLString"); diff --git a/js/src/tests/e4x/XML/13.4.4.4.js b/js/src/tests/e4x/XML/13.4.4.4.js index 1add4eceafcb..567294d4671f 100644 --- a/js/src/tests/e4x/XML/13.4.4.4.js +++ b/js/src/tests/e4x/XML/13.4.4.4.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.4.js'; START("13.4.4.4 - XML attribute()"); diff --git a/js/src/tests/e4x/XML/13.4.4.40.js b/js/src/tests/e4x/XML/13.4.4.40.js index 398af914f616..52c7c099ea86 100644 --- a/js/src/tests/e4x/XML/13.4.4.40.js +++ b/js/src/tests/e4x/XML/13.4.4.40.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.40.js'; START("13.4.4.40 - valueOf"); @@ -66,4 +65,4 @@ x.bravo = "two"; TEST(3, x, y); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.5.js b/js/src/tests/e4x/XML/13.4.4.5.js index 95651d88017b..c3c6c19fe8c2 100644 --- a/js/src/tests/e4x/XML/13.4.4.5.js +++ b/js/src/tests/e4x/XML/13.4.4.5.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.5.js'; START("13.4.4.5 - XML attributes()"); @@ -68,4 +67,4 @@ for each (var a in x.attributes()) i++; } -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.6.js b/js/src/tests/e4x/XML/13.4.4.6.js index 250a8819f3f9..5211d185388f 100644 --- a/js/src/tests/e4x/XML/13.4.4.6.js +++ b/js/src/tests/e4x/XML/13.4.4.6.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.6.js'; START("13.4.4.6 - XML child()"); diff --git a/js/src/tests/e4x/XML/13.4.4.7.js b/js/src/tests/e4x/XML/13.4.4.7.js index bbdb72de03c2..998a8aacc512 100644 --- a/js/src/tests/e4x/XML/13.4.4.7.js +++ b/js/src/tests/e4x/XML/13.4.4.7.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.7.js'; START("13.4.4.7 - XML childIndex()"); diff --git a/js/src/tests/e4x/XML/13.4.4.8.js b/js/src/tests/e4x/XML/13.4.4.8.js index c25e532a2f56..9a1761ba5924 100644 --- a/js/src/tests/e4x/XML/13.4.4.8.js +++ b/js/src/tests/e4x/XML/13.4.4.8.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.8.js'; START("13.4.4.8 - XML children()"); @@ -66,4 +65,4 @@ correct += 25; TEST(4, correct, emps.employee[0].children()); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/13.4.4.9.js b/js/src/tests/e4x/XML/13.4.4.9.js index 1e34596be1df..e6abf757939a 100644 --- a/js/src/tests/e4x/XML/13.4.4.9.js +++ b/js/src/tests/e4x/XML/13.4.4.9.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.4.4.9.js'; START("13.4.4.9 - XML comments()"); @@ -60,4 +59,4 @@ x = TEST_XML(2, "", x.comments()); TEST_XML(3, "", x..*.comments()); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/regress-291930.js b/js/src/tests/e4x/XML/regress-291930.js index 011fc87473d9..6379f6484f7f 100644 --- a/js/src/tests/e4x/XML/regress-291930.js +++ b/js/src/tests/e4x/XML/regress-291930.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-291930.js'; START("If document starts with comment, document is discarded"); printBugNumber(291930); @@ -51,4 +50,4 @@ try { TEST(1, "error", "error"); } -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XML/regress-324422-1.js b/js/src/tests/e4x/XML/regress-324422-1.js index 879550320579..954518ef49c8 100644 --- a/js/src/tests/e4x/XML/regress-324422-1.js +++ b/js/src/tests/e4x/XML/regress-324422-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-324422-1.js'; var summary = "Do not crash creating XML object with long initialiser"; diff --git a/js/src/tests/e4x/XML/regress-324422-2.js b/js/src/tests/e4x/XML/regress-324422-2.js index c4c3922c6542..c3ab52125360 100644 --- a/js/src/tests/e4x/XML/regress-324422-2.js +++ b/js/src/tests/e4x/XML/regress-324422-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-324422-2.js'; var summary = "Do not crash creating XML object with long initialiser"; var BUGNUMBER = 324422; diff --git a/js/src/tests/e4x/XML/regress-324688.js b/js/src/tests/e4x/XML/regress-324688.js index 035dee93d36b..a6f7a10a94aa 100644 --- a/js/src/tests/e4x/XML/regress-324688.js +++ b/js/src/tests/e4x/XML/regress-324688.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-324688.js'; var summary = 'No Syntax Error when trailing space and XML.ignoreWhitespace ' + 'true'; diff --git a/js/src/tests/e4x/XML/regress-336921.js b/js/src/tests/e4x/XML/regress-336921.js index e078a584c4dc..04a32b513ad6 100644 --- a/js/src/tests/e4x/XML/regress-336921.js +++ b/js/src/tests/e4x/XML/regress-336921.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-336921.js'; var summary = '13.4.4.3 - XML.prototype.appendChild creates undesired
'; var BUGNUMBER = 336921; diff --git a/js/src/tests/e4x/XML/regress-376773.js b/js/src/tests/e4x/XML/regress-376773.js index 11a155683831..a08272b3dd04 100644 --- a/js/src/tests/e4x/XML/regress-376773.js +++ b/js/src/tests/e4x/XML/regress-376773.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-376773.js'; var BUGNUMBER = 376773; var summary = 'xmlsimple.stringmethod === xmlsimple.function::stringmethod'; diff --git a/js/src/tests/e4x/XML/shell.js b/js/src/tests/e4x/XML/shell.js index 7f5caea1db36..e69de29bb2d1 100644 --- a/js/src/tests/e4x/XML/shell.js +++ b/js/src/tests/e4x/XML/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'XML'; diff --git a/js/src/tests/e4x/XMLList/13.5.1.js b/js/src/tests/e4x/XMLList/13.5.1.js index 887560b4d047..153abacf5845 100644 --- a/js/src/tests/e4x/XMLList/13.5.1.js +++ b/js/src/tests/e4x/XMLList/13.5.1.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.1.js'; START("13.5.1 - XMLList Constructor as Function"); @@ -94,4 +93,4 @@ TEST_XML(10, "", x); x = XMLList(undefined); TEST_XML(11, "", x); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XMLList/13.5.2.js b/js/src/tests/e4x/XMLList/13.5.2.js index 5663f17f30e9..30f66c38f691 100644 --- a/js/src/tests/e4x/XMLList/13.5.2.js +++ b/js/src/tests/e4x/XMLList/13.5.2.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.2.js'; START("13.5.2 - XMLList Constructor"); @@ -88,4 +87,4 @@ TEST_XML(9, "", x); x = new XMLList(undefined); TEST_XML(10, "", x); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XMLList/13.5.4.10.js b/js/src/tests/e4x/XMLList/13.5.4.10.js index ed024026f17d..7500dea28768 100644 --- a/js/src/tests/e4x/XMLList/13.5.4.10.js +++ b/js/src/tests/e4x/XMLList/13.5.4.10.js @@ -38,11 +38,10 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.4.10.js'; START("13.5.4.10 - XMLList elements()"); TEST(1, true, XMLList.prototype.hasOwnProperty("elements")); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XMLList/13.5.4.11.js b/js/src/tests/e4x/XMLList/13.5.4.11.js index ea9170a4419b..16ce3cbb6802 100644 --- a/js/src/tests/e4x/XMLList/13.5.4.11.js +++ b/js/src/tests/e4x/XMLList/13.5.4.11.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.4.11.js'; START("13.5.4.11 - XMLList hasOwnProperty()"); @@ -73,4 +72,4 @@ TEST(5, true, x.hasOwnProperty("echo")); TEST(5, true, XMLList.prototype.hasOwnProperty("toString")); TEST(6, false, XMLList.prototype.hasOwnProperty("foobar")); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XMLList/13.5.4.12.js b/js/src/tests/e4x/XMLList/13.5.4.12.js index 86f05835e4a7..0a5448b3a04d 100644 --- a/js/src/tests/e4x/XMLList/13.5.4.12.js +++ b/js/src/tests/e4x/XMLList/13.5.4.12.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.4.12.js'; START("13.5.4.12 - XMLList hasComplexContent()"); @@ -102,4 +101,4 @@ x = TEST(14, false, x.@*.hasComplexContent()); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XMLList/13.5.4.13.js b/js/src/tests/e4x/XMLList/13.5.4.13.js index 8297a56780ed..123b82417a5b 100644 --- a/js/src/tests/e4x/XMLList/13.5.4.13.js +++ b/js/src/tests/e4x/XMLList/13.5.4.13.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.4.13.js'; START("13.5.4.13 - XMLList hasSimpleContent()"); @@ -102,4 +101,4 @@ x = TEST(14, true, x.@*.hasSimpleContent()); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XMLList/13.5.4.14.js b/js/src/tests/e4x/XMLList/13.5.4.14.js index ffbb57d14921..e6360247a2e4 100644 --- a/js/src/tests/e4x/XMLList/13.5.4.14.js +++ b/js/src/tests/e4x/XMLList/13.5.4.14.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.4.14.js'; START("13.5.4.14 - XMLList length()"); diff --git a/js/src/tests/e4x/XMLList/13.5.4.15.js b/js/src/tests/e4x/XMLList/13.5.4.15.js index 7ca5b25b62f1..e952fa81bf27 100644 --- a/js/src/tests/e4x/XMLList/13.5.4.15.js +++ b/js/src/tests/e4x/XMLList/13.5.4.15.js @@ -40,10 +40,9 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.4.15.js'; START("13.5.4.15 - XMLList normalize()"); TEST(1, true, XMLList.prototype.hasOwnProperty("normalize")); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XMLList/13.5.4.16.js b/js/src/tests/e4x/XMLList/13.5.4.16.js index 73d77e9691da..6f61ce943156 100644 --- a/js/src/tests/e4x/XMLList/13.5.4.16.js +++ b/js/src/tests/e4x/XMLList/13.5.4.16.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.4.16.js'; START("13.5.4.16 - XMLList parent()"); diff --git a/js/src/tests/e4x/XMLList/13.5.4.17.js b/js/src/tests/e4x/XMLList/13.5.4.17.js index c78ba5ac43d5..cf02416cb242 100644 --- a/js/src/tests/e4x/XMLList/13.5.4.17.js +++ b/js/src/tests/e4x/XMLList/13.5.4.17.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.4.17.js'; START("13.5.4.17 - XMLList processingInstructions()"); diff --git a/js/src/tests/e4x/XMLList/13.5.4.18.js b/js/src/tests/e4x/XMLList/13.5.4.18.js index 2f7ffba4c604..21d7d56ddaad 100644 --- a/js/src/tests/e4x/XMLList/13.5.4.18.js +++ b/js/src/tests/e4x/XMLList/13.5.4.18.js @@ -40,10 +40,9 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.4.18.js'; START("13.5.4.18 - XMLList propertyIsEnumerable()"); TEST(1, true, XMLList.prototype.hasOwnProperty("propertyIsEnumerable")); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XMLList/13.5.4.19.js b/js/src/tests/e4x/XMLList/13.5.4.19.js index 0751b834a300..54fa4a8aeb8b 100644 --- a/js/src/tests/e4x/XMLList/13.5.4.19.js +++ b/js/src/tests/e4x/XMLList/13.5.4.19.js @@ -40,10 +40,9 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.4.19.js'; START("13.5.4.19 - XMLList text()"); TEST(1, true, XMLList.prototype.hasOwnProperty("text")); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XMLList/13.5.4.2.js b/js/src/tests/e4x/XMLList/13.5.4.2.js index fb83954fc4a7..d216427a2ea9 100644 --- a/js/src/tests/e4x/XMLList/13.5.4.2.js +++ b/js/src/tests/e4x/XMLList/13.5.4.2.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.4.2.js'; START("13.5.4.2 - XMLList attribute()"); @@ -84,4 +83,4 @@ try { TEST(10, "TypeError", ex.name); } -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XMLList/13.5.4.20.js b/js/src/tests/e4x/XMLList/13.5.4.20.js index 07d595b913bd..9fe12062339e 100644 --- a/js/src/tests/e4x/XMLList/13.5.4.20.js +++ b/js/src/tests/e4x/XMLList/13.5.4.20.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.4.20.js'; START("13.5.4.20 - XMLList toString()"); @@ -54,4 +53,4 @@ x = <>onetwo; TEST(3, "one\ntwo", x.toString()); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XMLList/13.5.4.21.js b/js/src/tests/e4x/XMLList/13.5.4.21.js index 9e2b7ff8fd2f..a717b28c37f1 100644 --- a/js/src/tests/e4x/XMLList/13.5.4.21.js +++ b/js/src/tests/e4x/XMLList/13.5.4.21.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.4.21.js'; START("13.5.4.21 - XMLList toXMLString()"); @@ -54,4 +53,4 @@ x = <>onetwo; TEST(3, "one\ntwo", x.toXMLString()); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XMLList/13.5.4.22.js b/js/src/tests/e4x/XMLList/13.5.4.22.js index 63acdce830b5..e9cc826ba445 100644 --- a/js/src/tests/e4x/XMLList/13.5.4.22.js +++ b/js/src/tests/e4x/XMLList/13.5.4.22.js @@ -40,11 +40,10 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.4.22.js'; START("13.5.4.22 - XMLList valueOf()"); TEST(1, true, XMLList.prototype.hasOwnProperty("valueOf")); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XMLList/13.5.4.3.js b/js/src/tests/e4x/XMLList/13.5.4.3.js index 3f12d2757606..94741e26d4a3 100644 --- a/js/src/tests/e4x/XMLList/13.5.4.3.js +++ b/js/src/tests/e4x/XMLList/13.5.4.3.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.4.3.js'; START("13.5.4.3 - XMLList attributes()"); @@ -71,4 +70,4 @@ correct += new XML("value3"); correct += new XML("value4"); TEST(7, correct, x.attributes()); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XMLList/13.5.4.4.js b/js/src/tests/e4x/XMLList/13.5.4.4.js index 00ebf5d7efdd..b2ae668adbf8 100644 --- a/js/src/tests/e4x/XMLList/13.5.4.4.js +++ b/js/src/tests/e4x/XMLList/13.5.4.4.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.4.4.js'; START("13.5.4.4 - XMLList child()"); @@ -83,4 +82,4 @@ x = TEST(12, one, x.child(0)); TEST(13, two, x.child(1)); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XMLList/13.5.4.5.js b/js/src/tests/e4x/XMLList/13.5.4.5.js index d900b5c8d7a7..42b8eab650d6 100644 --- a/js/src/tests/e4x/XMLList/13.5.4.5.js +++ b/js/src/tests/e4x/XMLList/13.5.4.5.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.4.5.js'; START("13.5.4.5 - XMLList children()"); diff --git a/js/src/tests/e4x/XMLList/13.5.4.6.js b/js/src/tests/e4x/XMLList/13.5.4.6.js index ceb2951f28ff..4c730ff8fcd6 100644 --- a/js/src/tests/e4x/XMLList/13.5.4.6.js +++ b/js/src/tests/e4x/XMLList/13.5.4.6.js @@ -40,10 +40,9 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.4.6.js'; START("13.5.4.6 - XMLList comments()"); TEST(1, true, XMLList.prototype.hasOwnProperty("comments")); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XMLList/13.5.4.7.js b/js/src/tests/e4x/XMLList/13.5.4.7.js index d929434e0808..773969ba220c 100644 --- a/js/src/tests/e4x/XMLList/13.5.4.7.js +++ b/js/src/tests/e4x/XMLList/13.5.4.7.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.4.7.js'; START("13.5.4.7 - XMLList contains()"); @@ -56,4 +55,4 @@ TEST(2, true, emps.employee.contains(Jim25Joe20)); TEST(4, false, emps.employee.contains(Joe20)); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XMLList/13.5.4.8.js b/js/src/tests/e4x/XMLList/13.5.4.8.js index e7a671dfec89..3d366718942b 100644 --- a/js/src/tests/e4x/XMLList/13.5.4.8.js +++ b/js/src/tests/e4x/XMLList/13.5.4.8.js @@ -40,7 +40,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.4.8.js'; START("13.5.4.8 - XMLList copy()"); @@ -72,4 +71,4 @@ emps += Sue32; TEST(4, correct, x); -END(); \ No newline at end of file +END(); diff --git a/js/src/tests/e4x/XMLList/13.5.4.9.js b/js/src/tests/e4x/XMLList/13.5.4.9.js index e57cbda27eb0..d99ac317ee02 100644 --- a/js/src/tests/e4x/XMLList/13.5.4.9.js +++ b/js/src/tests/e4x/XMLList/13.5.4.9.js @@ -41,7 +41,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '13.5.4.9.js'; START("13.5.4.9 - XMLList descendants()"); diff --git a/js/src/tests/e4x/XMLList/regress-373072.js b/js/src/tests/e4x/XMLList/regress-373072.js index f118babb72ce..38cf27fc6cd3 100644 --- a/js/src/tests/e4x/XMLList/regress-373072.js +++ b/js/src/tests/e4x/XMLList/regress-373072.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-373072.js'; var BUGNUMBER = 373072; var summary = 'XML.prototype.namespace() does not check for xml list'; diff --git a/js/src/tests/e4x/XMLList/shell.js b/js/src/tests/e4x/XMLList/shell.js index dbd3c2260482..e69de29bb2d1 100644 --- a/js/src/tests/e4x/XMLList/shell.js +++ b/js/src/tests/e4x/XMLList/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'XMLList'; diff --git a/js/src/tests/e4x/browser.js b/js/src/tests/e4x/browser.js index e783e576cbfe..38d15ed99fa0 100644 --- a/js/src/tests/e4x/browser.js +++ b/js/src/tests/e4x/browser.js @@ -63,7 +63,7 @@ window.onerror = function (msg, page, line) EXPECTED = 'Unknown'; } - var testcase = new TestCase(gTestfile, SUMMARY + DESCRIPTION + + var testcase = new TestCase("unknown-test-name", SUMMARY + DESCRIPTION + ' Section ' + SECTION, EXPECTED, "error"); testcase.passed = false; diff --git a/js/src/tests/e4x/decompilation/decompile-xml-escapes.js b/js/src/tests/e4x/decompilation/decompile-xml-escapes.js index 8dcbcd3959a0..7dbdc0410372 100644 --- a/js/src/tests/e4x/decompilation/decompile-xml-escapes.js +++ b/js/src/tests/e4x/decompilation/decompile-xml-escapes.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'decompile-xml-escapes.js'; //----------------------------------------------------------------------------- var BUGNUMBER = "352285"; diff --git a/js/src/tests/e4x/decompilation/regress-349814.js b/js/src/tests/e4x/decompilation/regress-349814.js index ca2e26a82dfa..a3faa05c37a7 100644 --- a/js/src/tests/e4x/decompilation/regress-349814.js +++ b/js/src/tests/e4x/decompilation/regress-349814.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-349814.js'; var BUGNUMBER = 349814; var summary = 'decompilation of e4x literals'; diff --git a/js/src/tests/e4x/decompilation/regress-349815.js b/js/src/tests/e4x/decompilation/regress-349815.js index b951e416529b..94212416c680 100644 --- a/js/src/tests/e4x/decompilation/regress-349815.js +++ b/js/src/tests/e4x/decompilation/regress-349815.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-349815.js'; var BUGNUMBER = 349815; var summary = 'decompilation of parameterized e4x xmllist literal'; diff --git a/js/src/tests/e4x/decompilation/regress-349822.js b/js/src/tests/e4x/decompilation/regress-349822.js index 378bd824c7cb..51371d0e2eee 100644 --- a/js/src/tests/e4x/decompilation/regress-349822.js +++ b/js/src/tests/e4x/decompilation/regress-349822.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-349822.js'; var BUGNUMBER = 349822; var summary = 'decompilation of x.@[2]'; diff --git a/js/src/tests/e4x/decompilation/regress-349956.js b/js/src/tests/e4x/decompilation/regress-349956.js index b30734ff81d5..f0bb5ba4b8c9 100644 --- a/js/src/tests/e4x/decompilation/regress-349956.js +++ b/js/src/tests/e4x/decompilation/regress-349956.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-349956.js'; var BUGNUMBER = 349956; var summary = 'decompilation of .@*'; diff --git a/js/src/tests/e4x/decompilation/regress-350226.js b/js/src/tests/e4x/decompilation/regress-350226.js index 8f25f3bffd03..8da60ee7fc7f 100644 --- a/js/src/tests/e4x/decompilation/regress-350226.js +++ b/js/src/tests/e4x/decompilation/regress-350226.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-350226.js'; var BUGNUMBER = 350226; var summary = 'decompilation of .@[*]'; diff --git a/js/src/tests/e4x/decompilation/regress-350531.js b/js/src/tests/e4x/decompilation/regress-350531.js index cd4adfdd6091..0a8290c33bee 100644 --- a/js/src/tests/e4x/decompilation/regress-350531.js +++ b/js/src/tests/e4x/decompilation/regress-350531.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-350531.js'; var BUGNUMBER = 350531; var summary = "decompilation of function (){ return (@['a'])=='b'}"; diff --git a/js/src/tests/e4x/decompilation/regress-351706.js b/js/src/tests/e4x/decompilation/regress-351706.js index d377f0249c3d..ebfd4368a579 100644 --- a/js/src/tests/e4x/decompilation/regress-351706.js +++ b/js/src/tests/e4x/decompilation/regress-351706.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-351706.js'; var BUGNUMBER = 351706; var summary = 'decompilation of E4X literals with parens'; diff --git a/js/src/tests/e4x/decompilation/regress-351988.js b/js/src/tests/e4x/decompilation/regress-351988.js index 47f2c83ac832..d206eeab50f1 100644 --- a/js/src/tests/e4x/decompilation/regress-351988.js +++ b/js/src/tests/e4x/decompilation/regress-351988.js @@ -5,7 +5,6 @@ * Contributor: Robert Sayre */ -gTestfile = 'regress-351988.js'; var summary = 'decompilation of XMLPI object initializer'; var BUGNUMBER = 351988; diff --git a/js/src/tests/e4x/decompilation/regress-352013.js b/js/src/tests/e4x/decompilation/regress-352013.js index d478b9b680ed..f47a835d8751 100644 --- a/js/src/tests/e4x/decompilation/regress-352013.js +++ b/js/src/tests/e4x/decompilation/regress-352013.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-352013.js'; var BUGNUMBER = 352013; var summary = 'Decompilation with new operator redeaux'; diff --git a/js/src/tests/e4x/decompilation/regress-352459.js b/js/src/tests/e4x/decompilation/regress-352459.js index a7cba07308f1..cab5b942b74d 100644 --- a/js/src/tests/e4x/decompilation/regress-352459.js +++ b/js/src/tests/e4x/decompilation/regress-352459.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-352459.js'; var BUGNUMBER = 352459; var summary = 'decompilation for 4..@x++'; diff --git a/js/src/tests/e4x/decompilation/regress-352649.js b/js/src/tests/e4x/decompilation/regress-352649.js index abc49497bf26..40b0e35dff40 100644 --- a/js/src/tests/e4x/decompilation/regress-352649.js +++ b/js/src/tests/e4x/decompilation/regress-352649.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-352649.js'; var BUGNUMBER = 352649; var summary = 'decompilation of e4x literal after |if| block'; diff --git a/js/src/tests/e4x/decompilation/regress-352789.js b/js/src/tests/e4x/decompilation/regress-352789.js index d279cb2ace9e..653b4e53a317 100644 --- a/js/src/tests/e4x/decompilation/regress-352789.js +++ b/js/src/tests/e4x/decompilation/regress-352789.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-352789.js'; var BUGNUMBER = 352789; var summary = 'Decompilation of new and .@'; diff --git a/js/src/tests/e4x/decompilation/regress-355101.js b/js/src/tests/e4x/decompilation/regress-355101.js index 7603e0f0e412..701cdffbe55b 100644 --- a/js/src/tests/e4x/decompilation/regress-355101.js +++ b/js/src/tests/e4x/decompilation/regress-355101.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-355101.js'; var BUGNUMBER = 355101; var summary = 'XML Filtering predicate operator'; diff --git a/js/src/tests/e4x/decompilation/regress-355474-01.js b/js/src/tests/e4x/decompilation/regress-355474-01.js index 629299413767..f37ded9a85dd 100644 --- a/js/src/tests/e4x/decompilation/regress-355474-01.js +++ b/js/src/tests/e4x/decompilation/regress-355474-01.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-355474-01.js'; var BUGNUMBER = 355474; var summary = 'Iterating over XML with WAY_TOO_MUCH_GC'; diff --git a/js/src/tests/e4x/decompilation/regress-373678.js b/js/src/tests/e4x/decompilation/regress-373678.js index e9be0f8b7708..4f4500fadb33 100644 --- a/js/src/tests/e4x/decompilation/regress-373678.js +++ b/js/src/tests/e4x/decompilation/regress-373678.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-373678.js'; var BUGNUMBER = 373678; var summary = 'Missing quotes around string in decompilation, ' + diff --git a/js/src/tests/e4x/decompilation/regress-429249.js b/js/src/tests/e4x/decompilation/regress-429249.js index ba3e76a41600..771546a129ac 100644 --- a/js/src/tests/e4x/decompilation/regress-429249.js +++ b/js/src/tests/e4x/decompilation/regress-429249.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-429249.js'; var summary = 'trap should not change decompilation '; var BUGNUMBER = 429249 diff --git a/js/src/tests/e4x/decompilation/regress-461233.js b/js/src/tests/e4x/decompilation/regress-461233.js index 2ffe0b00c9bf..197b39cd4862 100644 --- a/js/src/tests/e4x/decompilation/regress-461233.js +++ b/js/src/tests/e4x/decompilation/regress-461233.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-461233.js'; var summary = 'Decompilation of ({0: (4, <>)})'; var BUGNUMBER = 461233; diff --git a/js/src/tests/e4x/decompilation/regress-463360.js b/js/src/tests/e4x/decompilation/regress-463360.js index d00f49e7a354..7a55f2ee849f 100644 --- a/js/src/tests/e4x/decompilation/regress-463360.js +++ b/js/src/tests/e4x/decompilation/regress-463360.js @@ -6,7 +6,6 @@ * Rasmus Jensen */ -gTestfile = 'template.js'; var summary = 'Uneval+eval of XML containing string with {'; var BUGNUMBER = 463360; diff --git a/js/src/tests/e4x/decompilation/shell.js b/js/src/tests/e4x/decompilation/shell.js index be481c508118..e69de29bb2d1 100644 --- a/js/src/tests/e4x/decompilation/shell.js +++ b/js/src/tests/e4x/decompilation/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'decompilation'; diff --git a/js/src/tests/e4x/extensions/regress-305335.js b/js/src/tests/e4x/extensions/regress-305335.js index 7f1761f68427..71687e3cd5ed 100644 --- a/js/src/tests/e4x/extensions/regress-305335.js +++ b/js/src/tests/e4x/extensions/regress-305335.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-305335.js'; var summary = "Regression - XML instance methods should type check in " + "JS_GetPrivate()"; diff --git a/js/src/tests/e4x/extensions/regress-312196.js b/js/src/tests/e4x/extensions/regress-312196.js index 0763b9f6ad2b..e8f30bdbff96 100644 --- a/js/src/tests/e4x/extensions/regress-312196.js +++ b/js/src/tests/e4x/extensions/regress-312196.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-312196.js'; var summary = "Extending E4X XML objects with __noSuchMethod__"; var BUGNUMBER = 312196; diff --git a/js/src/tests/e4x/extensions/regress-313080.js b/js/src/tests/e4x/extensions/regress-313080.js index 2db69fa084ec..1b37a50d47cc 100644 --- a/js/src/tests/e4x/extensions/regress-313080.js +++ b/js/src/tests/e4x/extensions/regress-313080.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-313080.js'; var summary = "Regression - Do not crash calling __proto__"; var BUGNUMBER = 313080; diff --git a/js/src/tests/e4x/extensions/regress-321547.js b/js/src/tests/e4x/extensions/regress-321547.js index 369332300af3..9bc363fc4b11 100644 --- a/js/src/tests/e4x/extensions/regress-321547.js +++ b/js/src/tests/e4x/extensions/regress-321547.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-321547.js'; var summary = "Operator .. should not implicitly quote its right operand"; var BUGNUMBER = 321547; diff --git a/js/src/tests/e4x/extensions/regress-327534.js b/js/src/tests/e4x/extensions/regress-327534.js index 10989678524c..d2993674b935 100644 --- a/js/src/tests/e4x/extensions/regress-327534.js +++ b/js/src/tests/e4x/extensions/regress-327534.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-327534.js'; var summary = "uneval on E4X gives Error: xml is not a function"; var BUGNUMBER = 327534; diff --git a/js/src/tests/e4x/extensions/regress-327897.js b/js/src/tests/e4x/extensions/regress-327897.js index c5b345ad1c0b..894dcf7fa8b2 100644 --- a/js/src/tests/e4x/extensions/regress-327897.js +++ b/js/src/tests/e4x/extensions/regress-327897.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-327897.js'; var summary = "Crash in js_GetStringBytes"; var BUGNUMBER = 327897; diff --git a/js/src/tests/e4x/extensions/regress-335051.js b/js/src/tests/e4x/extensions/regress-335051.js index a8460de9a939..6f9e851425bf 100644 --- a/js/src/tests/e4x/extensions/regress-335051.js +++ b/js/src/tests/e4x/extensions/regress-335051.js @@ -6,7 +6,6 @@ * rje(a)dbc.dk */ -var gTestfile = 'regress-335051.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 335051; var summary = ''; diff --git a/js/src/tests/e4x/extensions/regress-337226.js b/js/src/tests/e4x/extensions/regress-337226.js index dba6bec8e5c6..fef009d6e800 100644 --- a/js/src/tests/e4x/extensions/regress-337226.js +++ b/js/src/tests/e4x/extensions/regress-337226.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-337226.js'; var BUGNUMBER = 337226; var summary = 'function::globalfunction'; diff --git a/js/src/tests/e4x/extensions/regress-352846-01.js b/js/src/tests/e4x/extensions/regress-352846-01.js index c68d14ea4267..194c405aebdc 100644 --- a/js/src/tests/e4x/extensions/regress-352846-01.js +++ b/js/src/tests/e4x/extensions/regress-352846-01.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-352846-01.js'; var BUGNUMBER = 352846; var summary = 'Passing unrooted value to OBJ_DEFAULT_VALUE is GC hazard'; diff --git a/js/src/tests/e4x/extensions/regress-352846-02.js b/js/src/tests/e4x/extensions/regress-352846-02.js index bacb203bc3ed..6fde6be51e70 100644 --- a/js/src/tests/e4x/extensions/regress-352846-02.js +++ b/js/src/tests/e4x/extensions/regress-352846-02.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-352846-02.js'; var BUGNUMBER = 352846; var summary = 'Passing unrooted value to OBJ_DEFAULT_VALUE is GC hazard'; diff --git a/js/src/tests/e4x/extensions/regress-352846-03.js b/js/src/tests/e4x/extensions/regress-352846-03.js index 69bed6834099..770b69d815c6 100644 --- a/js/src/tests/e4x/extensions/regress-352846-03.js +++ b/js/src/tests/e4x/extensions/regress-352846-03.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-352846-03.js'; var BUGNUMBER = 352846; var summary = 'Passing unrooted value to OBJ_DEFAULT_VALUE is GC hazard'; diff --git a/js/src/tests/e4x/extensions/regress-353165.js b/js/src/tests/e4x/extensions/regress-353165.js index 84352754d5b3..0af6830b5523 100644 --- a/js/src/tests/e4x/extensions/regress-353165.js +++ b/js/src/tests/e4x/extensions/regress-353165.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-353165.js'; var BUGNUMBER = 353165; var summary = 'Do not crash with xml_getMethod'; diff --git a/js/src/tests/e4x/extensions/regress-354145-06.js b/js/src/tests/e4x/extensions/regress-354145-06.js index 60a7e523702e..ba8e073774f8 100644 --- a/js/src/tests/e4x/extensions/regress-354145-06.js +++ b/js/src/tests/e4x/extensions/regress-354145-06.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-354145-06.js'; var BUGNUMBER = 354145; var summary = 'Immutable XML'; diff --git a/js/src/tests/e4x/extensions/regress-354151-01.js b/js/src/tests/e4x/extensions/regress-354151-01.js index 36fc6183288e..1b2de141e6c6 100644 --- a/js/src/tests/e4x/extensions/regress-354151-01.js +++ b/js/src/tests/e4x/extensions/regress-354151-01.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-354151-01.js'; var BUGNUMBER = 354151; var summary = 'Bad assumptions about Array elements'; diff --git a/js/src/tests/e4x/extensions/regress-354151-02.js b/js/src/tests/e4x/extensions/regress-354151-02.js index 757c54b547d5..ef0d85c86e5b 100644 --- a/js/src/tests/e4x/extensions/regress-354151-02.js +++ b/js/src/tests/e4x/extensions/regress-354151-02.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-354151-02.js'; var BUGNUMBER = 354151; var summary = 'Bad assumptions about Array elements'; diff --git a/js/src/tests/e4x/extensions/regress-374025.js b/js/src/tests/e4x/extensions/regress-374025.js index 9c4a636526e6..14825cb961ab 100644 --- a/js/src/tests/e4x/extensions/regress-374025.js +++ b/js/src/tests/e4x/extensions/regress-374025.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-374025.js'; var summary = 'Do not crash with XML.prettyIndent = 2147483648'; var BUGNUMBER = 374025; diff --git a/js/src/tests/e4x/extensions/regress-374163.js b/js/src/tests/e4x/extensions/regress-374163.js index c9cb787fee35..912770e3c3d6 100644 --- a/js/src/tests/e4x/extensions/regress-374163.js +++ b/js/src/tests/e4x/extensions/regress-374163.js @@ -37,7 +37,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-374163.js'; var BUGNUMBER = 374163; var summary = 'Set E4X xml.function::__proto__ = null causes toString to throw'; diff --git a/js/src/tests/e4x/extensions/regress-410192.js b/js/src/tests/e4x/extensions/regress-410192.js index f26552b539c1..6d2cb0958d66 100644 --- a/js/src/tests/e4x/extensions/regress-410192.js +++ b/js/src/tests/e4x/extensions/regress-410192.js @@ -37,7 +37,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-410192.js'; var summary = 'Proper quoting of attribute by uneval/toSource'; var BUGNUMBER = 410192; diff --git a/js/src/tests/e4x/extensions/regress-450871-01.js b/js/src/tests/e4x/extensions/regress-450871-01.js index 493d2bb19283..cc33b3b125f1 100644 --- a/js/src/tests/e4x/extensions/regress-450871-01.js +++ b/js/src/tests/e4x/extensions/regress-450871-01.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-450871-01.js'; var summary = 'Do not crash: __proto__ = ; .lastIndexOf(this, false)'; var BUGNUMBER = 450871; diff --git a/js/src/tests/e4x/extensions/regress-450871-02.js b/js/src/tests/e4x/extensions/regress-450871-02.js index 3931b70b8646..a3f5dbc804da 100644 --- a/js/src/tests/e4x/extensions/regress-450871-02.js +++ b/js/src/tests/e4x/extensions/regress-450871-02.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-450871-02.js'; var summary = 'Do not crash: __proto__ = ; .indexOf(this)'; var BUGNUMBER = 450871; diff --git a/js/src/tests/e4x/extensions/regress-462734-01.js b/js/src/tests/e4x/extensions/regress-462734-01.js index 3505e6adfa80..152af3b84385 100644 --- a/js/src/tests/e4x/extensions/regress-462734-01.js +++ b/js/src/tests/e4x/extensions/regress-462734-01.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-462734-01.js'; var summary = 'Do not assert: pobj_ == obj2'; var BUGNUMBER = 462734; diff --git a/js/src/tests/e4x/extensions/shell.js b/js/src/tests/e4x/extensions/shell.js index 3f52cffbc059..e69de29bb2d1 100644 --- a/js/src/tests/e4x/extensions/shell.js +++ b/js/src/tests/e4x/extensions/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'extensions'; diff --git a/js/src/tests/e4x/shell.js b/js/src/tests/e4x/shell.js index 36566f7fe13a..b4e222bdd7f9 100644 --- a/js/src/tests/e4x/shell.js +++ b/js/src/tests/e4x/shell.js @@ -39,7 +39,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestsuite = 'e4x'; /* * Report a failure in the 'accepted' manner diff --git a/js/src/tests/e4x/template.js b/js/src/tests/e4x/template.js index 7f9271f518bc..7a565a4b9e66 100644 --- a/js/src/tests/e4x/template.js +++ b/js/src/tests/e4x/template.js @@ -5,7 +5,6 @@ * Contributor: */ -gTestfile = 'template.js'; var summary = 'section - description'; var BUGNUMBER = 99999; diff --git a/js/src/tests/ecma/Array/15.4-1.js b/js/src/tests/ecma/Array/15.4-1.js index a0b8f58c8bb4..39eb00c6a320 100644 --- a/js/src/tests/ecma/Array/15.4-1.js +++ b/js/src/tests/ecma/Array/15.4-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4-1.js'; /** File Name: 15.4-1.js diff --git a/js/src/tests/ecma/Array/15.4-2.js b/js/src/tests/ecma/Array/15.4-2.js index 7d00703d30e8..04a8d0ec7c7a 100644 --- a/js/src/tests/ecma/Array/15.4-2.js +++ b/js/src/tests/ecma/Array/15.4-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4-2.js'; /** File Name: 15.4-2.js diff --git a/js/src/tests/ecma/Array/15.4.1.1.js b/js/src/tests/ecma/Array/15.4.1.1.js index b894433d0154..7f79588e19b0 100644 --- a/js/src/tests/ecma/Array/15.4.1.1.js +++ b/js/src/tests/ecma/Array/15.4.1.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.1.1.js'; /** File Name: 15.4.1.1.js diff --git a/js/src/tests/ecma/Array/15.4.1.2.js b/js/src/tests/ecma/Array/15.4.1.2.js index 7e2e7ef43609..bd97622a921d 100644 --- a/js/src/tests/ecma/Array/15.4.1.2.js +++ b/js/src/tests/ecma/Array/15.4.1.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.1.2.js'; /** File Name: 15.4.1.2.js diff --git a/js/src/tests/ecma/Array/15.4.1.3.js b/js/src/tests/ecma/Array/15.4.1.3.js index b36f339966ef..3778d5caf70c 100644 --- a/js/src/tests/ecma/Array/15.4.1.3.js +++ b/js/src/tests/ecma/Array/15.4.1.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.1.3.js'; /** File Name: 15.4.1.3.js diff --git a/js/src/tests/ecma/Array/15.4.1.js b/js/src/tests/ecma/Array/15.4.1.js index 414c90192695..590e00c8e76b 100644 --- a/js/src/tests/ecma/Array/15.4.1.js +++ b/js/src/tests/ecma/Array/15.4.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.1.js'; /** File Name: 15.4.1.js diff --git a/js/src/tests/ecma/Array/15.4.2.1-1.js b/js/src/tests/ecma/Array/15.4.2.1-1.js index 986684e33873..a9a405a3f269 100644 --- a/js/src/tests/ecma/Array/15.4.2.1-1.js +++ b/js/src/tests/ecma/Array/15.4.2.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.2.1-1.js'; /** File Name: 15.4.2.1-1.js diff --git a/js/src/tests/ecma/Array/15.4.2.1-2.js b/js/src/tests/ecma/Array/15.4.2.1-2.js index 9e957cbb216f..e336b30286a5 100644 --- a/js/src/tests/ecma/Array/15.4.2.1-2.js +++ b/js/src/tests/ecma/Array/15.4.2.1-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.2.1-2.js'; /** File Name: 15.4.2.1-2.js diff --git a/js/src/tests/ecma/Array/15.4.2.1-3.js b/js/src/tests/ecma/Array/15.4.2.1-3.js index 4d1806d9b80b..46067c3fa6ac 100644 --- a/js/src/tests/ecma/Array/15.4.2.1-3.js +++ b/js/src/tests/ecma/Array/15.4.2.1-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.2.1-3.js'; /** File Name: 15.4.2.1-3.js diff --git a/js/src/tests/ecma/Array/15.4.2.2-1.js b/js/src/tests/ecma/Array/15.4.2.2-1.js index 255d0b5fb4dd..b7272efea1f7 100644 --- a/js/src/tests/ecma/Array/15.4.2.2-1.js +++ b/js/src/tests/ecma/Array/15.4.2.2-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.2.2-1.js'; /** File Name: 15.4.2.2-1.js diff --git a/js/src/tests/ecma/Array/15.4.2.2-2.js b/js/src/tests/ecma/Array/15.4.2.2-2.js index e77ba8d8766e..f285881600e8 100644 --- a/js/src/tests/ecma/Array/15.4.2.2-2.js +++ b/js/src/tests/ecma/Array/15.4.2.2-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.2.2-2.js'; /** File Name: 15.4.2.2-2.js diff --git a/js/src/tests/ecma/Array/15.4.2.3.js b/js/src/tests/ecma/Array/15.4.2.3.js index 27d9bd257bc4..5c9451fbf0f1 100644 --- a/js/src/tests/ecma/Array/15.4.2.3.js +++ b/js/src/tests/ecma/Array/15.4.2.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.2.3.js'; /** File Name: 15.4.2.3.js diff --git a/js/src/tests/ecma/Array/15.4.3.1-2.js b/js/src/tests/ecma/Array/15.4.3.1-2.js index 36c1967f16e8..7cc6478596ec 100644 --- a/js/src/tests/ecma/Array/15.4.3.1-2.js +++ b/js/src/tests/ecma/Array/15.4.3.1-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.3.1-2.js'; /** File Name: 15.4.3.1-1.js diff --git a/js/src/tests/ecma/Array/15.4.3.2.js b/js/src/tests/ecma/Array/15.4.3.2.js index dfb47ca28437..d0644e8e3be0 100644 --- a/js/src/tests/ecma/Array/15.4.3.2.js +++ b/js/src/tests/ecma/Array/15.4.3.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.3.2.js'; /** File Name: 15.4.3.2.js diff --git a/js/src/tests/ecma/Array/15.4.4.1.js b/js/src/tests/ecma/Array/15.4.4.1.js index bd886b0cb081..e9c5950baf8c 100644 --- a/js/src/tests/ecma/Array/15.4.4.1.js +++ b/js/src/tests/ecma/Array/15.4.4.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.4.1.js'; /** File Name: 15.4.4.1.js diff --git a/js/src/tests/ecma/Array/15.4.4.2.js b/js/src/tests/ecma/Array/15.4.4.2.js index f64f8850d9a3..f62f5acf1745 100644 --- a/js/src/tests/ecma/Array/15.4.4.2.js +++ b/js/src/tests/ecma/Array/15.4.4.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.4.2.js'; /** File Name: 15.4.4.2.js diff --git a/js/src/tests/ecma/Array/15.4.4.3-1.js b/js/src/tests/ecma/Array/15.4.4.3-1.js index ff97512a44aa..317cfebf6288 100644 --- a/js/src/tests/ecma/Array/15.4.4.3-1.js +++ b/js/src/tests/ecma/Array/15.4.4.3-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.4.3-1.js'; /** File Name: 15.4.4.3-1.js diff --git a/js/src/tests/ecma/Array/15.4.4.4-1.js b/js/src/tests/ecma/Array/15.4.4.4-1.js index 503d7e635e55..909bc98c47af 100644 --- a/js/src/tests/ecma/Array/15.4.4.4-1.js +++ b/js/src/tests/ecma/Array/15.4.4.4-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.4.4-1.js'; /** File Name: 15.4.4.3-1.js diff --git a/js/src/tests/ecma/Array/15.4.4.4-2.js b/js/src/tests/ecma/Array/15.4.4.4-2.js index a9b7b0ec142e..f9530fa0ee31 100644 --- a/js/src/tests/ecma/Array/15.4.4.4-2.js +++ b/js/src/tests/ecma/Array/15.4.4.4-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.4.4-2.js'; /** File Name: 15.4.4.3-1.js diff --git a/js/src/tests/ecma/Array/15.4.4.5-1.js b/js/src/tests/ecma/Array/15.4.4.5-1.js index a3a521da09b1..f6867f66b20b 100644 --- a/js/src/tests/ecma/Array/15.4.4.5-1.js +++ b/js/src/tests/ecma/Array/15.4.4.5-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.4.5-1.js'; /** File Name: 15.4.4.5.js diff --git a/js/src/tests/ecma/Array/15.4.4.5-2.js b/js/src/tests/ecma/Array/15.4.4.5-2.js index 301c435d1592..be816ad65eca 100644 --- a/js/src/tests/ecma/Array/15.4.4.5-2.js +++ b/js/src/tests/ecma/Array/15.4.4.5-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.4.5-2.js'; /** File Name: 15.4.4.5-2.js diff --git a/js/src/tests/ecma/Array/15.4.4.5-3.js b/js/src/tests/ecma/Array/15.4.4.5-3.js index 984d2fe80a68..557fab67a716 100644 --- a/js/src/tests/ecma/Array/15.4.4.5-3.js +++ b/js/src/tests/ecma/Array/15.4.4.5-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.4.5-3.js'; /** File Name: 15.4.4.5-3.js diff --git a/js/src/tests/ecma/Array/15.4.4.js b/js/src/tests/ecma/Array/15.4.4.js index 2ab20720981f..72fc58b8af4c 100644 --- a/js/src/tests/ecma/Array/15.4.4.js +++ b/js/src/tests/ecma/Array/15.4.4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.4.js'; /** File Name: 15.4.4.js diff --git a/js/src/tests/ecma/Array/15.4.5.1-1.js b/js/src/tests/ecma/Array/15.4.5.1-1.js index 090300d59b48..55130f4287b6 100644 --- a/js/src/tests/ecma/Array/15.4.5.1-1.js +++ b/js/src/tests/ecma/Array/15.4.5.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.5.1-1.js'; /** File Name: 15.4.5.1-1.js diff --git a/js/src/tests/ecma/Array/15.4.5.1-2.js b/js/src/tests/ecma/Array/15.4.5.1-2.js index 2966a0045638..84dd697366b8 100644 --- a/js/src/tests/ecma/Array/15.4.5.1-2.js +++ b/js/src/tests/ecma/Array/15.4.5.1-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.5.1-2.js'; /** File Name: 15.4.5.1-2.js diff --git a/js/src/tests/ecma/Array/15.4.5.2-1.js b/js/src/tests/ecma/Array/15.4.5.2-1.js index ff15f9d4e803..230a888bec35 100644 --- a/js/src/tests/ecma/Array/15.4.5.2-1.js +++ b/js/src/tests/ecma/Array/15.4.5.2-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.5.2-1.js'; /** File Name: 15.4.5.2-1.js diff --git a/js/src/tests/ecma/Array/15.4.5.2-2.js b/js/src/tests/ecma/Array/15.4.5.2-2.js index 56a400ab4988..86c62e2cf6b3 100644 --- a/js/src/tests/ecma/Array/15.4.5.2-2.js +++ b/js/src/tests/ecma/Array/15.4.5.2-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.5.2-2.js'; /** File Name: 15.4.5.2-2.js diff --git a/js/src/tests/ecma/Array/array-length-set-on-nonarray.js b/js/src/tests/ecma/Array/array-length-set-on-nonarray.js index 8dfdb237ac2e..bc47c747777c 100644 --- a/js/src/tests/ecma/Array/array-length-set-on-nonarray.js +++ b/js/src/tests/ecma/Array/array-length-set-on-nonarray.js @@ -1,7 +1,6 @@ // Any copyright is dedicated to the Public Domain. // http://creativecommons.org/licenses/publicdomain/ -var gTestfile = 'array-length-set-on-nonarray.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 548671; var summary = diff --git a/js/src/tests/ecma/Array/shell.js b/js/src/tests/ecma/Array/shell.js index 9480d9e77dae..e69de29bb2d1 100644 --- a/js/src/tests/ecma/Array/shell.js +++ b/js/src/tests/ecma/Array/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Array'; diff --git a/js/src/tests/ecma/Boolean/15.6.1.js b/js/src/tests/ecma/Boolean/15.6.1.js index b698cbe40738..8a3c72ed0b2a 100644 --- a/js/src/tests/ecma/Boolean/15.6.1.js +++ b/js/src/tests/ecma/Boolean/15.6.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.1.js'; /** File Name: 15.6.1.js diff --git a/js/src/tests/ecma/Boolean/15.6.2.js b/js/src/tests/ecma/Boolean/15.6.2.js index f9fccb3e57ca..0b1450a66c83 100644 --- a/js/src/tests/ecma/Boolean/15.6.2.js +++ b/js/src/tests/ecma/Boolean/15.6.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.2.js'; /** File Name: 15.6.2.js diff --git a/js/src/tests/ecma/Boolean/15.6.3.1-1.js b/js/src/tests/ecma/Boolean/15.6.3.1-1.js index 0be809748754..5e5b0a457e36 100644 --- a/js/src/tests/ecma/Boolean/15.6.3.1-1.js +++ b/js/src/tests/ecma/Boolean/15.6.3.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.3.1-1.js'; /** File Name: 15.6.3.1-1.js diff --git a/js/src/tests/ecma/Boolean/15.6.3.1-2.js b/js/src/tests/ecma/Boolean/15.6.3.1-2.js index 5d435982d44d..3f1aa76ce82c 100644 --- a/js/src/tests/ecma/Boolean/15.6.3.1-2.js +++ b/js/src/tests/ecma/Boolean/15.6.3.1-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.3.1-2.js'; /** File Name: 15.6.3.1-2.js diff --git a/js/src/tests/ecma/Boolean/15.6.3.1-3.js b/js/src/tests/ecma/Boolean/15.6.3.1-3.js index 0f1b12526791..6addd7701be6 100644 --- a/js/src/tests/ecma/Boolean/15.6.3.1-3.js +++ b/js/src/tests/ecma/Boolean/15.6.3.1-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.3.1-3.js'; /** File Name: 15.6.3.1-3.js diff --git a/js/src/tests/ecma/Boolean/15.6.3.1-4.js b/js/src/tests/ecma/Boolean/15.6.3.1-4.js index 822750308a21..1b4bbda7c404 100644 --- a/js/src/tests/ecma/Boolean/15.6.3.1-4.js +++ b/js/src/tests/ecma/Boolean/15.6.3.1-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.3.1-4.js'; /** File Name: 15.6.3.1-4.js diff --git a/js/src/tests/ecma/Boolean/15.6.3.1.js b/js/src/tests/ecma/Boolean/15.6.3.1.js index ca808c63a5d0..f51cc09059da 100644 --- a/js/src/tests/ecma/Boolean/15.6.3.1.js +++ b/js/src/tests/ecma/Boolean/15.6.3.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.3.1.js'; /** File Name: 15.6.3.1.js diff --git a/js/src/tests/ecma/Boolean/15.6.4-1.js b/js/src/tests/ecma/Boolean/15.6.4-1.js index 584562b2a8f6..b10d5bc4fce9 100644 --- a/js/src/tests/ecma/Boolean/15.6.4-1.js +++ b/js/src/tests/ecma/Boolean/15.6.4-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.4-1.js'; /** File Name: 15.6.4-1.js diff --git a/js/src/tests/ecma/Boolean/15.6.4.1.js b/js/src/tests/ecma/Boolean/15.6.4.1.js index 3b75fb49ecd5..e357286871fa 100644 --- a/js/src/tests/ecma/Boolean/15.6.4.1.js +++ b/js/src/tests/ecma/Boolean/15.6.4.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.4.1.js'; /** File Name: 15.6.4.1.js diff --git a/js/src/tests/ecma/Boolean/15.6.4.2-1.js b/js/src/tests/ecma/Boolean/15.6.4.2-1.js index 54bd2e19d33b..76bc6c6ffb2c 100644 --- a/js/src/tests/ecma/Boolean/15.6.4.2-1.js +++ b/js/src/tests/ecma/Boolean/15.6.4.2-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.4.2-1.js'; /** File Name: 15.6.4.2.js diff --git a/js/src/tests/ecma/Boolean/15.6.4.2-2.js b/js/src/tests/ecma/Boolean/15.6.4.2-2.js index 203900447223..5cf670b5fabd 100644 --- a/js/src/tests/ecma/Boolean/15.6.4.2-2.js +++ b/js/src/tests/ecma/Boolean/15.6.4.2-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.4.2-2.js'; /** File Name: 15.6.4.2-2.js diff --git a/js/src/tests/ecma/Boolean/15.6.4.2-3.js b/js/src/tests/ecma/Boolean/15.6.4.2-3.js index 4dcc65f21f4d..2463c1bc88a8 100644 --- a/js/src/tests/ecma/Boolean/15.6.4.2-3.js +++ b/js/src/tests/ecma/Boolean/15.6.4.2-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.4.2-3.js'; /** File Name: 15.6.4.2-3.js diff --git a/js/src/tests/ecma/Boolean/15.6.4.2-4-n.js b/js/src/tests/ecma/Boolean/15.6.4.2-4-n.js index 0dd3e5f34934..d2bd256e98a4 100644 --- a/js/src/tests/ecma/Boolean/15.6.4.2-4-n.js +++ b/js/src/tests/ecma/Boolean/15.6.4.2-4-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.4.2-4-n.js'; /** File Name: 15.6.4.2-4.js diff --git a/js/src/tests/ecma/Boolean/15.6.4.3-1.js b/js/src/tests/ecma/Boolean/15.6.4.3-1.js index 8b913e011e60..4be078dd6dfd 100644 --- a/js/src/tests/ecma/Boolean/15.6.4.3-1.js +++ b/js/src/tests/ecma/Boolean/15.6.4.3-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.4.3-1.js'; /** File Name: 15.6.4.3.js diff --git a/js/src/tests/ecma/Boolean/15.6.4.3-2.js b/js/src/tests/ecma/Boolean/15.6.4.3-2.js index 5548a7874f31..59f9266b4381 100644 --- a/js/src/tests/ecma/Boolean/15.6.4.3-2.js +++ b/js/src/tests/ecma/Boolean/15.6.4.3-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.4.3-2.js'; /** File Name: 15.6.4.3-2.js diff --git a/js/src/tests/ecma/Boolean/15.6.4.3-3.js b/js/src/tests/ecma/Boolean/15.6.4.3-3.js index f05dfc0c60f4..6a5f2b03e5cd 100644 --- a/js/src/tests/ecma/Boolean/15.6.4.3-3.js +++ b/js/src/tests/ecma/Boolean/15.6.4.3-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.4.3-3.js'; /** File Name: 15.6.4.3-3.js diff --git a/js/src/tests/ecma/Boolean/15.6.4.3-4-n.js b/js/src/tests/ecma/Boolean/15.6.4.3-4-n.js index 4ebabfa84c5d..5bd391c38fae 100644 --- a/js/src/tests/ecma/Boolean/15.6.4.3-4-n.js +++ b/js/src/tests/ecma/Boolean/15.6.4.3-4-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.4.3-4-n.js'; /** File Name: 15.6.4.3-4.js diff --git a/js/src/tests/ecma/Boolean/15.6.4.3.js b/js/src/tests/ecma/Boolean/15.6.4.3.js index 9b7102618443..a6f34ed1440d 100644 --- a/js/src/tests/ecma/Boolean/15.6.4.3.js +++ b/js/src/tests/ecma/Boolean/15.6.4.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.4.3.js'; /** File Name: 15.6.4.3.js diff --git a/js/src/tests/ecma/Boolean/15.6.4.js b/js/src/tests/ecma/Boolean/15.6.4.js index 0c95d255fe89..84bd84e9c432 100644 --- a/js/src/tests/ecma/Boolean/15.6.4.js +++ b/js/src/tests/ecma/Boolean/15.6.4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.4.js'; /** File Name: 15.6.4.js diff --git a/js/src/tests/ecma/Boolean/shell.js b/js/src/tests/ecma/Boolean/shell.js index 2ff7258ce8b9..e69de29bb2d1 100644 --- a/js/src/tests/ecma/Boolean/shell.js +++ b/js/src/tests/ecma/Boolean/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Boolean'; diff --git a/js/src/tests/ecma/Date/15.9.1.1-1.js b/js/src/tests/ecma/Date/15.9.1.1-1.js index 303c86c0d776..f979173d25a2 100644 --- a/js/src/tests/ecma/Date/15.9.1.1-1.js +++ b/js/src/tests/ecma/Date/15.9.1.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.1.1-1.js'; /** File Name: 15.9.1.1-1.js diff --git a/js/src/tests/ecma/Date/15.9.1.1-2.js b/js/src/tests/ecma/Date/15.9.1.1-2.js index 77571a72afe2..449281fcb61e 100644 --- a/js/src/tests/ecma/Date/15.9.1.1-2.js +++ b/js/src/tests/ecma/Date/15.9.1.1-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.1.1-2.js'; /** File Name: 15.9.1.1-2.js diff --git a/js/src/tests/ecma/Date/15.9.1.13-1.js b/js/src/tests/ecma/Date/15.9.1.13-1.js index f7fb7e578bbf..9a2405028841 100644 --- a/js/src/tests/ecma/Date/15.9.1.13-1.js +++ b/js/src/tests/ecma/Date/15.9.1.13-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.1.13-1.js'; /** File Name: 15.9.1.13-1.js diff --git a/js/src/tests/ecma/Date/15.9.2.1.js b/js/src/tests/ecma/Date/15.9.2.1.js index 07cbf029ab58..216f1fc12bb8 100644 --- a/js/src/tests/ecma/Date/15.9.2.1.js +++ b/js/src/tests/ecma/Date/15.9.2.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.2.1.js'; /** File Name: 15.9.2.1.js diff --git a/js/src/tests/ecma/Date/15.9.2.2-1.js b/js/src/tests/ecma/Date/15.9.2.2-1.js index 0b742a0d899f..805eeffbf2d4 100644 --- a/js/src/tests/ecma/Date/15.9.2.2-1.js +++ b/js/src/tests/ecma/Date/15.9.2.2-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.2.2-1.js'; /** File Name: 15.9.2.2.js diff --git a/js/src/tests/ecma/Date/15.9.2.2-2.js b/js/src/tests/ecma/Date/15.9.2.2-2.js index 121f5a6b3956..df6164acfe36 100644 --- a/js/src/tests/ecma/Date/15.9.2.2-2.js +++ b/js/src/tests/ecma/Date/15.9.2.2-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.2.2-2.js'; /** File Name: 15.9.2.2.js diff --git a/js/src/tests/ecma/Date/15.9.2.2-3.js b/js/src/tests/ecma/Date/15.9.2.2-3.js index 883d7d7df457..4b831c4bd6f3 100644 --- a/js/src/tests/ecma/Date/15.9.2.2-3.js +++ b/js/src/tests/ecma/Date/15.9.2.2-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.2.2-3.js'; /** File Name: 15.9.2.2.js diff --git a/js/src/tests/ecma/Date/15.9.2.2-4.js b/js/src/tests/ecma/Date/15.9.2.2-4.js index 4dd9edd2284b..793468823673 100644 --- a/js/src/tests/ecma/Date/15.9.2.2-4.js +++ b/js/src/tests/ecma/Date/15.9.2.2-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.2.2-4.js'; /** File Name: 15.9.2.2.js diff --git a/js/src/tests/ecma/Date/15.9.2.2-5.js b/js/src/tests/ecma/Date/15.9.2.2-5.js index 4bf3728261e2..fac9831c9ac5 100644 --- a/js/src/tests/ecma/Date/15.9.2.2-5.js +++ b/js/src/tests/ecma/Date/15.9.2.2-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.2.2-5.js'; /** File Name: 15.9.2.2.js diff --git a/js/src/tests/ecma/Date/15.9.2.2-6.js b/js/src/tests/ecma/Date/15.9.2.2-6.js index 2d203294b359..76e3ce6cb9c6 100644 --- a/js/src/tests/ecma/Date/15.9.2.2-6.js +++ b/js/src/tests/ecma/Date/15.9.2.2-6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.2.2-6.js'; /** File Name: 15.9.2.2.js diff --git a/js/src/tests/ecma/Date/15.9.3.1-1.js b/js/src/tests/ecma/Date/15.9.3.1-1.js index 642169a60c3a..53bc8088fc13 100644 --- a/js/src/tests/ecma/Date/15.9.3.1-1.js +++ b/js/src/tests/ecma/Date/15.9.3.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.3.1-1.js'; /** File Name: 15.9.3.1.js diff --git a/js/src/tests/ecma/Date/15.9.3.1-2.js b/js/src/tests/ecma/Date/15.9.3.1-2.js index fb9dff486cf7..b629d3678204 100644 --- a/js/src/tests/ecma/Date/15.9.3.1-2.js +++ b/js/src/tests/ecma/Date/15.9.3.1-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.3.1-2.js'; /** File Name: 15.9.3.1.js diff --git a/js/src/tests/ecma/Date/15.9.3.1-3.js b/js/src/tests/ecma/Date/15.9.3.1-3.js index 0d888b089cbd..c331e5db861e 100644 --- a/js/src/tests/ecma/Date/15.9.3.1-3.js +++ b/js/src/tests/ecma/Date/15.9.3.1-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.3.1-3.js'; /** File Name: 15.9.3.1.js diff --git a/js/src/tests/ecma/Date/15.9.3.1-4.js b/js/src/tests/ecma/Date/15.9.3.1-4.js index 5f95a5b79705..aa7dbfd2e971 100644 --- a/js/src/tests/ecma/Date/15.9.3.1-4.js +++ b/js/src/tests/ecma/Date/15.9.3.1-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.3.1-4.js'; /** File Name: 15.9.3.1.js diff --git a/js/src/tests/ecma/Date/15.9.3.1-5.js b/js/src/tests/ecma/Date/15.9.3.1-5.js index f37c1c8da2c1..2f55e5399bc4 100644 --- a/js/src/tests/ecma/Date/15.9.3.1-5.js +++ b/js/src/tests/ecma/Date/15.9.3.1-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.3.1-5.js'; /** File Name: 15.9.3.1.js diff --git a/js/src/tests/ecma/Date/15.9.3.2-1.js b/js/src/tests/ecma/Date/15.9.3.2-1.js index e1c7d082cdcb..74482bb451dc 100644 --- a/js/src/tests/ecma/Date/15.9.3.2-1.js +++ b/js/src/tests/ecma/Date/15.9.3.2-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.3.2-1.js'; /** File Name: 15.9.3.1.js diff --git a/js/src/tests/ecma/Date/15.9.3.2-2.js b/js/src/tests/ecma/Date/15.9.3.2-2.js index c9a5e7143d2a..6577c7cf71dd 100644 --- a/js/src/tests/ecma/Date/15.9.3.2-2.js +++ b/js/src/tests/ecma/Date/15.9.3.2-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.3.2-2.js'; /** File Name: 15.9.3.1.js diff --git a/js/src/tests/ecma/Date/15.9.3.2-3.js b/js/src/tests/ecma/Date/15.9.3.2-3.js index 3c7df383b642..2cd6ec92e8f9 100644 --- a/js/src/tests/ecma/Date/15.9.3.2-3.js +++ b/js/src/tests/ecma/Date/15.9.3.2-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.3.2-3.js'; /** File Name: 15.9.3.1.js diff --git a/js/src/tests/ecma/Date/15.9.3.2-4.js b/js/src/tests/ecma/Date/15.9.3.2-4.js index bb8e095a88fb..74be729309d3 100644 --- a/js/src/tests/ecma/Date/15.9.3.2-4.js +++ b/js/src/tests/ecma/Date/15.9.3.2-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.3.2-4.js'; /** File Name: 15.9.3.1.js diff --git a/js/src/tests/ecma/Date/15.9.3.2-5.js b/js/src/tests/ecma/Date/15.9.3.2-5.js index 229d09d22ede..9a76d9c9628f 100644 --- a/js/src/tests/ecma/Date/15.9.3.2-5.js +++ b/js/src/tests/ecma/Date/15.9.3.2-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.3.2-5.js'; /** File Name: 15.9.3.1.js diff --git a/js/src/tests/ecma/Date/15.9.3.8-1.js b/js/src/tests/ecma/Date/15.9.3.8-1.js index d48199ccbad5..cc57b5c89a1c 100644 --- a/js/src/tests/ecma/Date/15.9.3.8-1.js +++ b/js/src/tests/ecma/Date/15.9.3.8-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.3.8-1.js'; /** File Name: 15.9.3.8.js diff --git a/js/src/tests/ecma/Date/15.9.3.8-2.js b/js/src/tests/ecma/Date/15.9.3.8-2.js index f9d8d36d04bf..989fa2c28e7c 100644 --- a/js/src/tests/ecma/Date/15.9.3.8-2.js +++ b/js/src/tests/ecma/Date/15.9.3.8-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.3.8-2.js'; /** File Name: 15.9.3.8.js diff --git a/js/src/tests/ecma/Date/15.9.3.8-3.js b/js/src/tests/ecma/Date/15.9.3.8-3.js index c3042a821601..bc4aab26b72b 100644 --- a/js/src/tests/ecma/Date/15.9.3.8-3.js +++ b/js/src/tests/ecma/Date/15.9.3.8-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.3.8-3.js'; /** File Name: 15.9.3.8.js diff --git a/js/src/tests/ecma/Date/15.9.3.8-4.js b/js/src/tests/ecma/Date/15.9.3.8-4.js index c3a1eae7dcd2..9bc388b869f6 100644 --- a/js/src/tests/ecma/Date/15.9.3.8-4.js +++ b/js/src/tests/ecma/Date/15.9.3.8-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.3.8-4.js'; /** File Name: 15.9.3.8.js diff --git a/js/src/tests/ecma/Date/15.9.3.8-5.js b/js/src/tests/ecma/Date/15.9.3.8-5.js index 405842c79f76..0d166c1806e2 100644 --- a/js/src/tests/ecma/Date/15.9.3.8-5.js +++ b/js/src/tests/ecma/Date/15.9.3.8-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.3.8-5.js'; /** File Name: 15.9.3.8.js diff --git a/js/src/tests/ecma/Date/15.9.4.2-1.js b/js/src/tests/ecma/Date/15.9.4.2-1.js index 4b269f264fea..518b78292a3a 100644 --- a/js/src/tests/ecma/Date/15.9.4.2-1.js +++ b/js/src/tests/ecma/Date/15.9.4.2-1.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.4.2-1.js'; /** * File Name: diff --git a/js/src/tests/ecma/Date/15.9.4.2.js b/js/src/tests/ecma/Date/15.9.4.2.js index 8a8085fc45c1..346bf44b2102 100644 --- a/js/src/tests/ecma/Date/15.9.4.2.js +++ b/js/src/tests/ecma/Date/15.9.4.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.4.2.js'; /** File Name: 15.9.4.2.js diff --git a/js/src/tests/ecma/Date/15.9.4.3.js b/js/src/tests/ecma/Date/15.9.4.3.js index 0fd77ce28bdc..cc55e1f7635e 100644 --- a/js/src/tests/ecma/Date/15.9.4.3.js +++ b/js/src/tests/ecma/Date/15.9.4.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.4.3.js'; var SECTION = "15.9.4.3"; var TITLE = "Date.UTC( year, month, date, hours, minutes, seconds, ms )"; diff --git a/js/src/tests/ecma/Date/15.9.5.1.js b/js/src/tests/ecma/Date/15.9.5.1.js index 3185a7c4e565..9f51fa830944 100644 --- a/js/src/tests/ecma/Date/15.9.5.1.js +++ b/js/src/tests/ecma/Date/15.9.5.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.1.js'; /** File Name: 15.9.5.1.js diff --git a/js/src/tests/ecma/Date/15.9.5.10-1.js b/js/src/tests/ecma/Date/15.9.5.10-1.js index cd73d288c95e..736c3306bcc9 100644 --- a/js/src/tests/ecma/Date/15.9.5.10-1.js +++ b/js/src/tests/ecma/Date/15.9.5.10-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.10-1.js'; /** File Name: 15.9.5.10.js diff --git a/js/src/tests/ecma/Date/15.9.5.10-10.js b/js/src/tests/ecma/Date/15.9.5.10-10.js index 4142635486e5..20840006ccaf 100644 --- a/js/src/tests/ecma/Date/15.9.5.10-10.js +++ b/js/src/tests/ecma/Date/15.9.5.10-10.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.10-10.js'; /** File Name: 15.9.5.10.js diff --git a/js/src/tests/ecma/Date/15.9.5.10-11.js b/js/src/tests/ecma/Date/15.9.5.10-11.js index dfadc18838a0..77ff29cfd144 100644 --- a/js/src/tests/ecma/Date/15.9.5.10-11.js +++ b/js/src/tests/ecma/Date/15.9.5.10-11.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.10-11.js'; /** File Name: 15.9.5.10.js diff --git a/js/src/tests/ecma/Date/15.9.5.10-12.js b/js/src/tests/ecma/Date/15.9.5.10-12.js index 2557108faf4b..ddd09b47236b 100644 --- a/js/src/tests/ecma/Date/15.9.5.10-12.js +++ b/js/src/tests/ecma/Date/15.9.5.10-12.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.10-12.js'; /** File Name: 15.9.5.10.js diff --git a/js/src/tests/ecma/Date/15.9.5.10-13.js b/js/src/tests/ecma/Date/15.9.5.10-13.js index e0e2402ebdaf..8e6161c1e4de 100644 --- a/js/src/tests/ecma/Date/15.9.5.10-13.js +++ b/js/src/tests/ecma/Date/15.9.5.10-13.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.10-13.js'; /** File Name: 15.9.5.10.js diff --git a/js/src/tests/ecma/Date/15.9.5.10-2.js b/js/src/tests/ecma/Date/15.9.5.10-2.js index 47c48e177f3f..9c25220b80f1 100644 --- a/js/src/tests/ecma/Date/15.9.5.10-2.js +++ b/js/src/tests/ecma/Date/15.9.5.10-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.10-2.js'; /** File Name: 15.9.5.10.js diff --git a/js/src/tests/ecma/Date/15.9.5.10-3.js b/js/src/tests/ecma/Date/15.9.5.10-3.js index 325c9bfaf200..48f4eac5e3e6 100644 --- a/js/src/tests/ecma/Date/15.9.5.10-3.js +++ b/js/src/tests/ecma/Date/15.9.5.10-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.10-3.js'; /** File Name: 15.9.5.10.js diff --git a/js/src/tests/ecma/Date/15.9.5.10-4.js b/js/src/tests/ecma/Date/15.9.5.10-4.js index 41676c265886..753800cc4463 100644 --- a/js/src/tests/ecma/Date/15.9.5.10-4.js +++ b/js/src/tests/ecma/Date/15.9.5.10-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.10-4.js'; /** File Name: 15.9.5.10.js diff --git a/js/src/tests/ecma/Date/15.9.5.10-5.js b/js/src/tests/ecma/Date/15.9.5.10-5.js index f17b0a0b29c2..b704b064fcc5 100644 --- a/js/src/tests/ecma/Date/15.9.5.10-5.js +++ b/js/src/tests/ecma/Date/15.9.5.10-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.10-5.js'; /** File Name: 15.9.5.10.js diff --git a/js/src/tests/ecma/Date/15.9.5.10-6.js b/js/src/tests/ecma/Date/15.9.5.10-6.js index 84f57b880548..43b67ea455bc 100644 --- a/js/src/tests/ecma/Date/15.9.5.10-6.js +++ b/js/src/tests/ecma/Date/15.9.5.10-6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.10-6.js'; /** File Name: 15.9.5.10.js diff --git a/js/src/tests/ecma/Date/15.9.5.10-7.js b/js/src/tests/ecma/Date/15.9.5.10-7.js index 96ba89078a82..4b2313ba6dc8 100644 --- a/js/src/tests/ecma/Date/15.9.5.10-7.js +++ b/js/src/tests/ecma/Date/15.9.5.10-7.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.10-7.js'; /** File Name: 15.9.5.10.js diff --git a/js/src/tests/ecma/Date/15.9.5.10-8.js b/js/src/tests/ecma/Date/15.9.5.10-8.js index bae220a94ee8..009284785dd3 100644 --- a/js/src/tests/ecma/Date/15.9.5.10-8.js +++ b/js/src/tests/ecma/Date/15.9.5.10-8.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.10-8.js'; /** File Name: 15.9.5.10.js diff --git a/js/src/tests/ecma/Date/15.9.5.10-9.js b/js/src/tests/ecma/Date/15.9.5.10-9.js index a1cee0e682fb..72c7239b46c1 100644 --- a/js/src/tests/ecma/Date/15.9.5.10-9.js +++ b/js/src/tests/ecma/Date/15.9.5.10-9.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.10-9.js'; /** File Name: 15.9.5.10.js diff --git a/js/src/tests/ecma/Date/15.9.5.11-1.js b/js/src/tests/ecma/Date/15.9.5.11-1.js index 5c2439ba09d1..d5f74a003050 100644 --- a/js/src/tests/ecma/Date/15.9.5.11-1.js +++ b/js/src/tests/ecma/Date/15.9.5.11-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.11-1.js'; /** File Name: 15.9.5.11.js diff --git a/js/src/tests/ecma/Date/15.9.5.11-2.js b/js/src/tests/ecma/Date/15.9.5.11-2.js index 92dd94192d93..9210e2a048d5 100644 --- a/js/src/tests/ecma/Date/15.9.5.11-2.js +++ b/js/src/tests/ecma/Date/15.9.5.11-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.11-2.js'; /** File Name: 15.9.5.11 diff --git a/js/src/tests/ecma/Date/15.9.5.11-3.js b/js/src/tests/ecma/Date/15.9.5.11-3.js index d35f8d5967eb..7c9bd1d5d373 100644 --- a/js/src/tests/ecma/Date/15.9.5.11-3.js +++ b/js/src/tests/ecma/Date/15.9.5.11-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.11-3.js'; /** File Name: 15.9.5.11.js diff --git a/js/src/tests/ecma/Date/15.9.5.11-4.js b/js/src/tests/ecma/Date/15.9.5.11-4.js index 4fc9f2ee6514..a5dcbc5bf364 100644 --- a/js/src/tests/ecma/Date/15.9.5.11-4.js +++ b/js/src/tests/ecma/Date/15.9.5.11-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.11-4.js'; /** File Name: 15.9.5.11.js diff --git a/js/src/tests/ecma/Date/15.9.5.11-5.js b/js/src/tests/ecma/Date/15.9.5.11-5.js index cee93a770bd6..365163e629c1 100644 --- a/js/src/tests/ecma/Date/15.9.5.11-5.js +++ b/js/src/tests/ecma/Date/15.9.5.11-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.11-5.js'; /** File Name: 15.9.5.11.js diff --git a/js/src/tests/ecma/Date/15.9.5.11-6.js b/js/src/tests/ecma/Date/15.9.5.11-6.js index b756e43a7e26..605d2d4fe3fe 100644 --- a/js/src/tests/ecma/Date/15.9.5.11-6.js +++ b/js/src/tests/ecma/Date/15.9.5.11-6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.11-6.js'; /** File Name: 15.9.5.11.js diff --git a/js/src/tests/ecma/Date/15.9.5.11-7.js b/js/src/tests/ecma/Date/15.9.5.11-7.js index 65c5c1c76512..996f4d666d27 100644 --- a/js/src/tests/ecma/Date/15.9.5.11-7.js +++ b/js/src/tests/ecma/Date/15.9.5.11-7.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.11-7.js'; /** File Name: 15.9.5.11.js diff --git a/js/src/tests/ecma/Date/15.9.5.12-1.js b/js/src/tests/ecma/Date/15.9.5.12-1.js index c173ffb193dd..fdbdb6a07603 100644 --- a/js/src/tests/ecma/Date/15.9.5.12-1.js +++ b/js/src/tests/ecma/Date/15.9.5.12-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.12-1.js'; /** File Name: 15.9.5.12.js diff --git a/js/src/tests/ecma/Date/15.9.5.12-2.js b/js/src/tests/ecma/Date/15.9.5.12-2.js index cc90e20a475f..d9628d9f5180 100644 --- a/js/src/tests/ecma/Date/15.9.5.12-2.js +++ b/js/src/tests/ecma/Date/15.9.5.12-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.12-2.js'; /** File Name: 15.9.5.12.js diff --git a/js/src/tests/ecma/Date/15.9.5.12-3.js b/js/src/tests/ecma/Date/15.9.5.12-3.js index 9ce226665c4e..37c8e7897553 100644 --- a/js/src/tests/ecma/Date/15.9.5.12-3.js +++ b/js/src/tests/ecma/Date/15.9.5.12-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.12-3.js'; /** File Name: 15.9.5.12.js diff --git a/js/src/tests/ecma/Date/15.9.5.12-4.js b/js/src/tests/ecma/Date/15.9.5.12-4.js index 3b752a176707..4092b58e4be0 100644 --- a/js/src/tests/ecma/Date/15.9.5.12-4.js +++ b/js/src/tests/ecma/Date/15.9.5.12-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.12-4.js'; /** File Name: 15.9.5.12.js diff --git a/js/src/tests/ecma/Date/15.9.5.12-5.js b/js/src/tests/ecma/Date/15.9.5.12-5.js index 7fe153a5eae8..08028960a7d3 100644 --- a/js/src/tests/ecma/Date/15.9.5.12-5.js +++ b/js/src/tests/ecma/Date/15.9.5.12-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.12-5.js'; /** File Name: 15.9.5.12.js diff --git a/js/src/tests/ecma/Date/15.9.5.12-6.js b/js/src/tests/ecma/Date/15.9.5.12-6.js index 663ab81b2d75..dfe648d85154 100644 --- a/js/src/tests/ecma/Date/15.9.5.12-6.js +++ b/js/src/tests/ecma/Date/15.9.5.12-6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.12-6.js'; /** File Name: 15.9.5.12.js diff --git a/js/src/tests/ecma/Date/15.9.5.12-7.js b/js/src/tests/ecma/Date/15.9.5.12-7.js index 23a021805819..1fd7fa78f327 100644 --- a/js/src/tests/ecma/Date/15.9.5.12-7.js +++ b/js/src/tests/ecma/Date/15.9.5.12-7.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.12-7.js'; /** File Name: 15.9.5.12.js diff --git a/js/src/tests/ecma/Date/15.9.5.12-8.js b/js/src/tests/ecma/Date/15.9.5.12-8.js index 4f3f66e0ceb2..83f26652b24e 100644 --- a/js/src/tests/ecma/Date/15.9.5.12-8.js +++ b/js/src/tests/ecma/Date/15.9.5.12-8.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.12-8.js'; /** File Name: 15.9.5.12 diff --git a/js/src/tests/ecma/Date/15.9.5.13-1.js b/js/src/tests/ecma/Date/15.9.5.13-1.js index d82f39a7e06b..c3b796bed954 100644 --- a/js/src/tests/ecma/Date/15.9.5.13-1.js +++ b/js/src/tests/ecma/Date/15.9.5.13-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.13-1.js'; /** File Name: 15.9.5.13.js diff --git a/js/src/tests/ecma/Date/15.9.5.13-2.js b/js/src/tests/ecma/Date/15.9.5.13-2.js index 13f0d080e36a..04576c3d7c00 100644 --- a/js/src/tests/ecma/Date/15.9.5.13-2.js +++ b/js/src/tests/ecma/Date/15.9.5.13-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.13-2.js'; /** File Name: 15.9.5.13 diff --git a/js/src/tests/ecma/Date/15.9.5.13-3.js b/js/src/tests/ecma/Date/15.9.5.13-3.js index 7c78072ee509..d75af232258e 100644 --- a/js/src/tests/ecma/Date/15.9.5.13-3.js +++ b/js/src/tests/ecma/Date/15.9.5.13-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.13-3.js'; /** File Name: 15.9.5.13.js diff --git a/js/src/tests/ecma/Date/15.9.5.13-4.js b/js/src/tests/ecma/Date/15.9.5.13-4.js index bcfcfb8c0067..d27b9f03a365 100644 --- a/js/src/tests/ecma/Date/15.9.5.13-4.js +++ b/js/src/tests/ecma/Date/15.9.5.13-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.13-4.js'; /** File Name: 15.9.5.13.js diff --git a/js/src/tests/ecma/Date/15.9.5.13-5.js b/js/src/tests/ecma/Date/15.9.5.13-5.js index 96b1acb170b6..673ad7ac81ed 100644 --- a/js/src/tests/ecma/Date/15.9.5.13-5.js +++ b/js/src/tests/ecma/Date/15.9.5.13-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.13-5.js'; /** File Name: 15.9.5.13.js diff --git a/js/src/tests/ecma/Date/15.9.5.13-6.js b/js/src/tests/ecma/Date/15.9.5.13-6.js index e749ad6b7fa8..c2f3c974a966 100644 --- a/js/src/tests/ecma/Date/15.9.5.13-6.js +++ b/js/src/tests/ecma/Date/15.9.5.13-6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.13-6.js'; /** File Name: 15.9.5.13.js diff --git a/js/src/tests/ecma/Date/15.9.5.13-7.js b/js/src/tests/ecma/Date/15.9.5.13-7.js index 63607f8d2d46..6055266d9764 100644 --- a/js/src/tests/ecma/Date/15.9.5.13-7.js +++ b/js/src/tests/ecma/Date/15.9.5.13-7.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.13-7.js'; /** File Name: 15.9.5.13.js diff --git a/js/src/tests/ecma/Date/15.9.5.13-8.js b/js/src/tests/ecma/Date/15.9.5.13-8.js index 75d42b200b88..309ad473c05b 100644 --- a/js/src/tests/ecma/Date/15.9.5.13-8.js +++ b/js/src/tests/ecma/Date/15.9.5.13-8.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.13-8.js'; /** File Name: 15.9.5.13.js diff --git a/js/src/tests/ecma/Date/15.9.5.14.js b/js/src/tests/ecma/Date/15.9.5.14.js index 5a3f8216da5f..845422cdbcd7 100644 --- a/js/src/tests/ecma/Date/15.9.5.14.js +++ b/js/src/tests/ecma/Date/15.9.5.14.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.14.js'; /** File Name: 15.9.5.14.js diff --git a/js/src/tests/ecma/Date/15.9.5.15.js b/js/src/tests/ecma/Date/15.9.5.15.js index ca2babd7ef24..7858644b0f36 100644 --- a/js/src/tests/ecma/Date/15.9.5.15.js +++ b/js/src/tests/ecma/Date/15.9.5.15.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.15.js'; /** File Name: 15.9.5.15.js diff --git a/js/src/tests/ecma/Date/15.9.5.16.js b/js/src/tests/ecma/Date/15.9.5.16.js index e791b74eae20..82c9ca2a74a4 100644 --- a/js/src/tests/ecma/Date/15.9.5.16.js +++ b/js/src/tests/ecma/Date/15.9.5.16.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.16.js'; /** File Name: 15.9.5.16.js diff --git a/js/src/tests/ecma/Date/15.9.5.17.js b/js/src/tests/ecma/Date/15.9.5.17.js index e9b30c3eed65..c5a64e7b874e 100644 --- a/js/src/tests/ecma/Date/15.9.5.17.js +++ b/js/src/tests/ecma/Date/15.9.5.17.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.17.js'; /** File Name: 15.9.5.17.js diff --git a/js/src/tests/ecma/Date/15.9.5.18.js b/js/src/tests/ecma/Date/15.9.5.18.js index f735168efe15..4d31731accef 100644 --- a/js/src/tests/ecma/Date/15.9.5.18.js +++ b/js/src/tests/ecma/Date/15.9.5.18.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.18.js'; /** File Name: 15.9.5.18.js diff --git a/js/src/tests/ecma/Date/15.9.5.19.js b/js/src/tests/ecma/Date/15.9.5.19.js index 2a0d7430ef11..c1de4e55da21 100644 --- a/js/src/tests/ecma/Date/15.9.5.19.js +++ b/js/src/tests/ecma/Date/15.9.5.19.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.19.js'; /** File Name: 15.9.5.19.js diff --git a/js/src/tests/ecma/Date/15.9.5.2-1.js b/js/src/tests/ecma/Date/15.9.5.2-1.js index 7ec3c691c8f0..a020f4594a8b 100644 --- a/js/src/tests/ecma/Date/15.9.5.2-1.js +++ b/js/src/tests/ecma/Date/15.9.5.2-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.2-1.js'; /** File Name: 15.9.5.2.js diff --git a/js/src/tests/ecma/Date/15.9.5.2-2-n.js b/js/src/tests/ecma/Date/15.9.5.2-2-n.js index c5513b816871..b877198ba5b8 100644 --- a/js/src/tests/ecma/Date/15.9.5.2-2-n.js +++ b/js/src/tests/ecma/Date/15.9.5.2-2-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.2-2-n.js'; /** File Name: 15.9.5.2-2.js diff --git a/js/src/tests/ecma/Date/15.9.5.2.js b/js/src/tests/ecma/Date/15.9.5.2.js index ef2df0510b25..a020f4594a8b 100644 --- a/js/src/tests/ecma/Date/15.9.5.2.js +++ b/js/src/tests/ecma/Date/15.9.5.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.2.js'; /** File Name: 15.9.5.2.js diff --git a/js/src/tests/ecma/Date/15.9.5.20.js b/js/src/tests/ecma/Date/15.9.5.20.js index fb3dafde2c86..68fb2bf5ffe1 100644 --- a/js/src/tests/ecma/Date/15.9.5.20.js +++ b/js/src/tests/ecma/Date/15.9.5.20.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.20.js'; /** File Name: 15.9.5.20.js diff --git a/js/src/tests/ecma/Date/15.9.5.21-1.js b/js/src/tests/ecma/Date/15.9.5.21-1.js index 4eea164305eb..818770ba4b42 100644 --- a/js/src/tests/ecma/Date/15.9.5.21-1.js +++ b/js/src/tests/ecma/Date/15.9.5.21-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.21-1.js'; /** File Name: 15.9.5.21.js diff --git a/js/src/tests/ecma/Date/15.9.5.21-2.js b/js/src/tests/ecma/Date/15.9.5.21-2.js index 37b443117a85..6c28b3e553cf 100644 --- a/js/src/tests/ecma/Date/15.9.5.21-2.js +++ b/js/src/tests/ecma/Date/15.9.5.21-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.21-2.js'; /** File Name: 15.9.5.21.js diff --git a/js/src/tests/ecma/Date/15.9.5.21-3.js b/js/src/tests/ecma/Date/15.9.5.21-3.js index d1d96cb7a32c..b9184f462e97 100644 --- a/js/src/tests/ecma/Date/15.9.5.21-3.js +++ b/js/src/tests/ecma/Date/15.9.5.21-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.21-3.js'; /** File Name: 15.9.5.21.js diff --git a/js/src/tests/ecma/Date/15.9.5.21-4.js b/js/src/tests/ecma/Date/15.9.5.21-4.js index b7dfa656ff90..cfb199f21d00 100644 --- a/js/src/tests/ecma/Date/15.9.5.21-4.js +++ b/js/src/tests/ecma/Date/15.9.5.21-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.21-4.js'; /** File Name: 15.9.5.21.js diff --git a/js/src/tests/ecma/Date/15.9.5.21-5.js b/js/src/tests/ecma/Date/15.9.5.21-5.js index ca90b1784ae7..d34e797762a9 100644 --- a/js/src/tests/ecma/Date/15.9.5.21-5.js +++ b/js/src/tests/ecma/Date/15.9.5.21-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.21-5.js'; /** File Name: 15.9.5.21.js diff --git a/js/src/tests/ecma/Date/15.9.5.21-6.js b/js/src/tests/ecma/Date/15.9.5.21-6.js index 9178ae76cf88..d9b643c9beae 100644 --- a/js/src/tests/ecma/Date/15.9.5.21-6.js +++ b/js/src/tests/ecma/Date/15.9.5.21-6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.21-6.js'; /** File Name: 15.9.5.21.js diff --git a/js/src/tests/ecma/Date/15.9.5.21-7.js b/js/src/tests/ecma/Date/15.9.5.21-7.js index c4d0a4b6159b..69f0d1906b66 100644 --- a/js/src/tests/ecma/Date/15.9.5.21-7.js +++ b/js/src/tests/ecma/Date/15.9.5.21-7.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.21-7.js'; /** File Name: 15.9.5.21.js diff --git a/js/src/tests/ecma/Date/15.9.5.21-8.js b/js/src/tests/ecma/Date/15.9.5.21-8.js index 624d6c6bcba0..4d49c5f08a66 100644 --- a/js/src/tests/ecma/Date/15.9.5.21-8.js +++ b/js/src/tests/ecma/Date/15.9.5.21-8.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.21-8.js'; /** File Name: 15.9.5.21.js diff --git a/js/src/tests/ecma/Date/15.9.5.22-1.js b/js/src/tests/ecma/Date/15.9.5.22-1.js index 5d2a6934ab2d..4e071c730db4 100644 --- a/js/src/tests/ecma/Date/15.9.5.22-1.js +++ b/js/src/tests/ecma/Date/15.9.5.22-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.22-1.js'; /** File Name: 15.9.5.22.js diff --git a/js/src/tests/ecma/Date/15.9.5.22-2.js b/js/src/tests/ecma/Date/15.9.5.22-2.js index b828b468d1c6..b7236d077f75 100644 --- a/js/src/tests/ecma/Date/15.9.5.22-2.js +++ b/js/src/tests/ecma/Date/15.9.5.22-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.22-2.js'; /** File Name: 15.9.5.22.js diff --git a/js/src/tests/ecma/Date/15.9.5.22-3.js b/js/src/tests/ecma/Date/15.9.5.22-3.js index 26c059368dfa..c26e4487a575 100644 --- a/js/src/tests/ecma/Date/15.9.5.22-3.js +++ b/js/src/tests/ecma/Date/15.9.5.22-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.22-3.js'; /** File Name: 15.9.5.22.js diff --git a/js/src/tests/ecma/Date/15.9.5.22-4.js b/js/src/tests/ecma/Date/15.9.5.22-4.js index 96b9771d5916..608984dfd3f7 100644 --- a/js/src/tests/ecma/Date/15.9.5.22-4.js +++ b/js/src/tests/ecma/Date/15.9.5.22-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.22-4.js'; /** File Name: 15.9.5.22.js diff --git a/js/src/tests/ecma/Date/15.9.5.22-5.js b/js/src/tests/ecma/Date/15.9.5.22-5.js index a943aa5699ab..b113d0ad1988 100644 --- a/js/src/tests/ecma/Date/15.9.5.22-5.js +++ b/js/src/tests/ecma/Date/15.9.5.22-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.22-5.js'; /** File Name: 15.9.5.22.js diff --git a/js/src/tests/ecma/Date/15.9.5.22-6.js b/js/src/tests/ecma/Date/15.9.5.22-6.js index 96b39d2c437c..0e439525b453 100644 --- a/js/src/tests/ecma/Date/15.9.5.22-6.js +++ b/js/src/tests/ecma/Date/15.9.5.22-6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.22-6.js'; /** File Name: 15.9.5.22.js diff --git a/js/src/tests/ecma/Date/15.9.5.22-7.js b/js/src/tests/ecma/Date/15.9.5.22-7.js index 7fa0ecaf14b7..926c6c4fd367 100644 --- a/js/src/tests/ecma/Date/15.9.5.22-7.js +++ b/js/src/tests/ecma/Date/15.9.5.22-7.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.22-7.js'; /** File Name: 15.9.5.22.js diff --git a/js/src/tests/ecma/Date/15.9.5.22-8.js b/js/src/tests/ecma/Date/15.9.5.22-8.js index 3eca9d8ec966..e031e065386f 100644 --- a/js/src/tests/ecma/Date/15.9.5.22-8.js +++ b/js/src/tests/ecma/Date/15.9.5.22-8.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.22-8.js'; /** File Name: 15.9.5.22.js diff --git a/js/src/tests/ecma/Date/15.9.5.23-1.js b/js/src/tests/ecma/Date/15.9.5.23-1.js index e4a228e2cdc9..1d796700ccd2 100644 --- a/js/src/tests/ecma/Date/15.9.5.23-1.js +++ b/js/src/tests/ecma/Date/15.9.5.23-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.23-1.js'; /** File Name: 15.9.5.23-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.23-10.js b/js/src/tests/ecma/Date/15.9.5.23-10.js index d4cb298d1952..d10999857271 100644 --- a/js/src/tests/ecma/Date/15.9.5.23-10.js +++ b/js/src/tests/ecma/Date/15.9.5.23-10.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.23-10.js'; /** File Name: 15.9.5.23-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.23-11.js b/js/src/tests/ecma/Date/15.9.5.23-11.js index ca2801576651..dfd4d711f46e 100644 --- a/js/src/tests/ecma/Date/15.9.5.23-11.js +++ b/js/src/tests/ecma/Date/15.9.5.23-11.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.23-11.js'; /** File Name: 15.9.5.23-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.23-12.js b/js/src/tests/ecma/Date/15.9.5.23-12.js index a03f5995678d..9c0b3f03062b 100644 --- a/js/src/tests/ecma/Date/15.9.5.23-12.js +++ b/js/src/tests/ecma/Date/15.9.5.23-12.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.23-12.js'; /** File Name: 15.9.5.23-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.23-13.js b/js/src/tests/ecma/Date/15.9.5.23-13.js index a68128770c6a..31708c21e8ac 100644 --- a/js/src/tests/ecma/Date/15.9.5.23-13.js +++ b/js/src/tests/ecma/Date/15.9.5.23-13.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.23-13.js'; /** File Name: 15.9.5.23-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.23-14.js b/js/src/tests/ecma/Date/15.9.5.23-14.js index 1923d715e386..5925038109d9 100644 --- a/js/src/tests/ecma/Date/15.9.5.23-14.js +++ b/js/src/tests/ecma/Date/15.9.5.23-14.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.23-14.js'; /** File Name: 15.9.5.23-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.23-15.js b/js/src/tests/ecma/Date/15.9.5.23-15.js index 31680eb38663..e42cf963a624 100644 --- a/js/src/tests/ecma/Date/15.9.5.23-15.js +++ b/js/src/tests/ecma/Date/15.9.5.23-15.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.23-15.js'; /** File Name: 15.9.5.23-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.23-16.js b/js/src/tests/ecma/Date/15.9.5.23-16.js index 3dc0726ca82d..bf510bf3b9cf 100644 --- a/js/src/tests/ecma/Date/15.9.5.23-16.js +++ b/js/src/tests/ecma/Date/15.9.5.23-16.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.23-16.js'; /** File Name: 15.9.5.23-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.23-17.js b/js/src/tests/ecma/Date/15.9.5.23-17.js index 605f4cf00bfb..e31135588e9c 100644 --- a/js/src/tests/ecma/Date/15.9.5.23-17.js +++ b/js/src/tests/ecma/Date/15.9.5.23-17.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.23-17.js'; /** File Name: 15.9.5.23-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.23-18.js b/js/src/tests/ecma/Date/15.9.5.23-18.js index e30d0f05c88e..80d2c491d0a1 100644 --- a/js/src/tests/ecma/Date/15.9.5.23-18.js +++ b/js/src/tests/ecma/Date/15.9.5.23-18.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.23-18.js'; /** File Name: 15.9.5.23-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.23-2.js b/js/src/tests/ecma/Date/15.9.5.23-2.js index 8086af88d918..59b62dde463e 100644 --- a/js/src/tests/ecma/Date/15.9.5.23-2.js +++ b/js/src/tests/ecma/Date/15.9.5.23-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.23-2.js'; /** File Name: 15.9.5.23-2.js diff --git a/js/src/tests/ecma/Date/15.9.5.23-3-n.js b/js/src/tests/ecma/Date/15.9.5.23-3-n.js index 040604bd0ea7..a57dc3bec65a 100644 --- a/js/src/tests/ecma/Date/15.9.5.23-3-n.js +++ b/js/src/tests/ecma/Date/15.9.5.23-3-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.23-3-n.js'; /** File Name: 15.9.5.23-3-n.js diff --git a/js/src/tests/ecma/Date/15.9.5.23-4.js b/js/src/tests/ecma/Date/15.9.5.23-4.js index 39e3dec8d467..e895a401a7a1 100644 --- a/js/src/tests/ecma/Date/15.9.5.23-4.js +++ b/js/src/tests/ecma/Date/15.9.5.23-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.23-4.js'; /** File Name: 15.9.5.23-2.js diff --git a/js/src/tests/ecma/Date/15.9.5.23-5.js b/js/src/tests/ecma/Date/15.9.5.23-5.js index b4317e6a55c9..6c2a8abf5b59 100644 --- a/js/src/tests/ecma/Date/15.9.5.23-5.js +++ b/js/src/tests/ecma/Date/15.9.5.23-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.23-5.js'; /** File Name: 15.9.5.23-2.js diff --git a/js/src/tests/ecma/Date/15.9.5.23-6.js b/js/src/tests/ecma/Date/15.9.5.23-6.js index cc9e07b9fdac..180265f024e1 100644 --- a/js/src/tests/ecma/Date/15.9.5.23-6.js +++ b/js/src/tests/ecma/Date/15.9.5.23-6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.23-6.js'; /** File Name: 15.9.5.23-2.js diff --git a/js/src/tests/ecma/Date/15.9.5.23-7.js b/js/src/tests/ecma/Date/15.9.5.23-7.js index 46bb900b186b..5716884aa4ab 100644 --- a/js/src/tests/ecma/Date/15.9.5.23-7.js +++ b/js/src/tests/ecma/Date/15.9.5.23-7.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.23-7.js'; /** File Name: 15.9.5.23-2.js diff --git a/js/src/tests/ecma/Date/15.9.5.23-8.js b/js/src/tests/ecma/Date/15.9.5.23-8.js index 8072a9cc1f86..4e6d61d1b479 100644 --- a/js/src/tests/ecma/Date/15.9.5.23-8.js +++ b/js/src/tests/ecma/Date/15.9.5.23-8.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.23-8.js'; /** File Name: 15.9.5.23-2.js diff --git a/js/src/tests/ecma/Date/15.9.5.23-9.js b/js/src/tests/ecma/Date/15.9.5.23-9.js index b480791e3dda..403a4d35b3c5 100644 --- a/js/src/tests/ecma/Date/15.9.5.23-9.js +++ b/js/src/tests/ecma/Date/15.9.5.23-9.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.23-9.js'; /** File Name: 15.9.5.23-2.js diff --git a/js/src/tests/ecma/Date/15.9.5.24-1.js b/js/src/tests/ecma/Date/15.9.5.24-1.js index e02aa6150af0..688d6c8e5a29 100644 --- a/js/src/tests/ecma/Date/15.9.5.24-1.js +++ b/js/src/tests/ecma/Date/15.9.5.24-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.24-1.js'; /** File Name: 15.9.5.24-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.24-2.js b/js/src/tests/ecma/Date/15.9.5.24-2.js index da6261670bc7..d4f96b40aabd 100644 --- a/js/src/tests/ecma/Date/15.9.5.24-2.js +++ b/js/src/tests/ecma/Date/15.9.5.24-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.24-2.js'; /** File Name: 15.9.5.24-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.24-3.js b/js/src/tests/ecma/Date/15.9.5.24-3.js index 81990109537b..bb5e1324f9bd 100644 --- a/js/src/tests/ecma/Date/15.9.5.24-3.js +++ b/js/src/tests/ecma/Date/15.9.5.24-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.24-3.js'; /** File Name: 15.9.5.24-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.24-4.js b/js/src/tests/ecma/Date/15.9.5.24-4.js index f6b1dae9668e..0bf4ff84871c 100644 --- a/js/src/tests/ecma/Date/15.9.5.24-4.js +++ b/js/src/tests/ecma/Date/15.9.5.24-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.24-4.js'; /** File Name: 15.9.5.24-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.24-5.js b/js/src/tests/ecma/Date/15.9.5.24-5.js index 53458028be60..b0b90720017a 100644 --- a/js/src/tests/ecma/Date/15.9.5.24-5.js +++ b/js/src/tests/ecma/Date/15.9.5.24-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.24-5.js'; /** File Name: 15.9.5.24-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.24-6.js b/js/src/tests/ecma/Date/15.9.5.24-6.js index 188dbacff993..5e9759cf13e9 100644 --- a/js/src/tests/ecma/Date/15.9.5.24-6.js +++ b/js/src/tests/ecma/Date/15.9.5.24-6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.24-6.js'; /** File Name: 15.9.5.24-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.24-7.js b/js/src/tests/ecma/Date/15.9.5.24-7.js index b2fe8fcff957..f496c32dfe76 100644 --- a/js/src/tests/ecma/Date/15.9.5.24-7.js +++ b/js/src/tests/ecma/Date/15.9.5.24-7.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.24-7.js'; /** File Name: 15.9.5.24-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.24-8.js b/js/src/tests/ecma/Date/15.9.5.24-8.js index d6ea2d8d3e99..b165e463ffc2 100644 --- a/js/src/tests/ecma/Date/15.9.5.24-8.js +++ b/js/src/tests/ecma/Date/15.9.5.24-8.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.24-8.js'; /** File Name: 15.9.5.24-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.25-1.js b/js/src/tests/ecma/Date/15.9.5.25-1.js index 0eb7783ec8d0..27b563a81671 100644 --- a/js/src/tests/ecma/Date/15.9.5.25-1.js +++ b/js/src/tests/ecma/Date/15.9.5.25-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.25-1.js'; /** File Name: 15.9.5.25-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.26-1.js b/js/src/tests/ecma/Date/15.9.5.26-1.js index 509ec73d334c..731fee91e78d 100644 --- a/js/src/tests/ecma/Date/15.9.5.26-1.js +++ b/js/src/tests/ecma/Date/15.9.5.26-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.26-1.js'; /** File Name: 15.9.5.26-1.js ECMA Section: 15.9.5.26 Date.prototype.setSeconds(sec [,ms]) diff --git a/js/src/tests/ecma/Date/15.9.5.27-1.js b/js/src/tests/ecma/Date/15.9.5.27-1.js index 1b0677733242..c585840913e6 100644 --- a/js/src/tests/ecma/Date/15.9.5.27-1.js +++ b/js/src/tests/ecma/Date/15.9.5.27-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.27-1.js'; /** File Name: 15.9.5.27-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.28-1.js b/js/src/tests/ecma/Date/15.9.5.28-1.js index 902d70a87359..d312a977145d 100644 --- a/js/src/tests/ecma/Date/15.9.5.28-1.js +++ b/js/src/tests/ecma/Date/15.9.5.28-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.28-1.js'; /** File Name: 15.9.5.28-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.29-1.js b/js/src/tests/ecma/Date/15.9.5.29-1.js index 42fa36e9b5a5..8c2445da08bd 100644 --- a/js/src/tests/ecma/Date/15.9.5.29-1.js +++ b/js/src/tests/ecma/Date/15.9.5.29-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.29-1.js'; /** File Name: 15.9.5.29-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.3-1-n.js b/js/src/tests/ecma/Date/15.9.5.3-1-n.js index e1f227f78530..d07b2727b912 100644 --- a/js/src/tests/ecma/Date/15.9.5.3-1-n.js +++ b/js/src/tests/ecma/Date/15.9.5.3-1-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.3-1-n.js'; /** File Name: 15.9.5.3-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.3-2.js b/js/src/tests/ecma/Date/15.9.5.3-2.js index 9f425c3450ff..86f41f26c857 100644 --- a/js/src/tests/ecma/Date/15.9.5.3-2.js +++ b/js/src/tests/ecma/Date/15.9.5.3-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.3-2.js'; /** File Name: 15.9.5.3-2.js diff --git a/js/src/tests/ecma/Date/15.9.5.30-1.js b/js/src/tests/ecma/Date/15.9.5.30-1.js index 7abb3927d742..78a7fc0bd83b 100644 --- a/js/src/tests/ecma/Date/15.9.5.30-1.js +++ b/js/src/tests/ecma/Date/15.9.5.30-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.30-1.js'; /** File Name: 15.9.5.30-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.31-1.js b/js/src/tests/ecma/Date/15.9.5.31-1.js index cf094de52784..329f3c65decb 100644 --- a/js/src/tests/ecma/Date/15.9.5.31-1.js +++ b/js/src/tests/ecma/Date/15.9.5.31-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.31-1.js'; /** File Name: 15.9.5.31-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.32-1.js b/js/src/tests/ecma/Date/15.9.5.32-1.js index d277fd9af1aa..6a7f03e0c6b6 100644 --- a/js/src/tests/ecma/Date/15.9.5.32-1.js +++ b/js/src/tests/ecma/Date/15.9.5.32-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.32-1.js'; /** File Name: 15.9.5.32-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.33-1.js b/js/src/tests/ecma/Date/15.9.5.33-1.js index 01e1ff2f9405..542383224935 100644 --- a/js/src/tests/ecma/Date/15.9.5.33-1.js +++ b/js/src/tests/ecma/Date/15.9.5.33-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.33-1.js'; /** File Name: 15.9.5.33-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.34-1.js b/js/src/tests/ecma/Date/15.9.5.34-1.js index de4d8c817bd4..30da4a767aa4 100644 --- a/js/src/tests/ecma/Date/15.9.5.34-1.js +++ b/js/src/tests/ecma/Date/15.9.5.34-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.34-1.js'; /** File Name: 15.9.5.34-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.35-1.js b/js/src/tests/ecma/Date/15.9.5.35-1.js index 9aceaa88a1eb..58351dce4337 100644 --- a/js/src/tests/ecma/Date/15.9.5.35-1.js +++ b/js/src/tests/ecma/Date/15.9.5.35-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.35-1.js'; /** File Name: 15.9.5.35-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.36-1.js b/js/src/tests/ecma/Date/15.9.5.36-1.js index f4cd44c2c286..de08fdeaeb3c 100644 --- a/js/src/tests/ecma/Date/15.9.5.36-1.js +++ b/js/src/tests/ecma/Date/15.9.5.36-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.36-1.js'; /** File Name: 15.9.5.36-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.36-2.js b/js/src/tests/ecma/Date/15.9.5.36-2.js index a0ce018d0f65..5ee075063ade 100644 --- a/js/src/tests/ecma/Date/15.9.5.36-2.js +++ b/js/src/tests/ecma/Date/15.9.5.36-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.36-2.js'; /** File Name: 15.9.5.36-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.36-3.js b/js/src/tests/ecma/Date/15.9.5.36-3.js index f0849f28e729..139bd5028996 100644 --- a/js/src/tests/ecma/Date/15.9.5.36-3.js +++ b/js/src/tests/ecma/Date/15.9.5.36-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.36-3.js'; /** File Name: 15.9.5.36-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.36-4.js b/js/src/tests/ecma/Date/15.9.5.36-4.js index 0ca872f8db9b..a54ef6454894 100644 --- a/js/src/tests/ecma/Date/15.9.5.36-4.js +++ b/js/src/tests/ecma/Date/15.9.5.36-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.36-4.js'; /** File Name: 15.9.5.36-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.36-5.js b/js/src/tests/ecma/Date/15.9.5.36-5.js index 2496548b1dfe..2a7a20e780e5 100644 --- a/js/src/tests/ecma/Date/15.9.5.36-5.js +++ b/js/src/tests/ecma/Date/15.9.5.36-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.36-5.js'; /** File Name: 15.9.5.36-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.36-6.js b/js/src/tests/ecma/Date/15.9.5.36-6.js index 9a05c3130ec9..aa5bff95cd07 100644 --- a/js/src/tests/ecma/Date/15.9.5.36-6.js +++ b/js/src/tests/ecma/Date/15.9.5.36-6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.36-6.js'; /** File Name: 15.9.5.36-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.36-7.js b/js/src/tests/ecma/Date/15.9.5.36-7.js index 5bc330bbea0d..709f56ddb9a5 100644 --- a/js/src/tests/ecma/Date/15.9.5.36-7.js +++ b/js/src/tests/ecma/Date/15.9.5.36-7.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.36-7.js'; /** File Name: 15.9.5.36-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.37-1.js b/js/src/tests/ecma/Date/15.9.5.37-1.js index a6acd3d10ace..a5ca1b3227d1 100644 --- a/js/src/tests/ecma/Date/15.9.5.37-1.js +++ b/js/src/tests/ecma/Date/15.9.5.37-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.37-1.js'; /** File Name: 15.9.5.37-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.37-2.js b/js/src/tests/ecma/Date/15.9.5.37-2.js index e5ec78ea7266..9724e3c5beca 100644 --- a/js/src/tests/ecma/Date/15.9.5.37-2.js +++ b/js/src/tests/ecma/Date/15.9.5.37-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.37-2.js'; /** File Name: 15.9.5.37-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.37-3.js b/js/src/tests/ecma/Date/15.9.5.37-3.js index d256511459f9..5a48d0acb324 100644 --- a/js/src/tests/ecma/Date/15.9.5.37-3.js +++ b/js/src/tests/ecma/Date/15.9.5.37-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.37-3.js'; /** File Name: 15.9.5.37-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.37-4.js b/js/src/tests/ecma/Date/15.9.5.37-4.js index 017afd63890f..6b2298ef0d4e 100644 --- a/js/src/tests/ecma/Date/15.9.5.37-4.js +++ b/js/src/tests/ecma/Date/15.9.5.37-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.37-4.js'; /** File Name: 15.9.5.37-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.37-5.js b/js/src/tests/ecma/Date/15.9.5.37-5.js index 046f3095df15..0023d0c55390 100644 --- a/js/src/tests/ecma/Date/15.9.5.37-5.js +++ b/js/src/tests/ecma/Date/15.9.5.37-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.37-5.js'; /** File Name: 15.9.5.37-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.4-1.js b/js/src/tests/ecma/Date/15.9.5.4-1.js index 6ad06931f809..2dd0de78804e 100644 --- a/js/src/tests/ecma/Date/15.9.5.4-1.js +++ b/js/src/tests/ecma/Date/15.9.5.4-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.4-1.js'; /** File Name: 15.9.5.4-1.js diff --git a/js/src/tests/ecma/Date/15.9.5.4-2-n.js b/js/src/tests/ecma/Date/15.9.5.4-2-n.js index 1cd98dd8012f..c179a982cf15 100644 --- a/js/src/tests/ecma/Date/15.9.5.4-2-n.js +++ b/js/src/tests/ecma/Date/15.9.5.4-2-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.4-2-n.js'; /** File Name: 15.9.5.4-2-n.js diff --git a/js/src/tests/ecma/Date/15.9.5.5.js b/js/src/tests/ecma/Date/15.9.5.5.js index f0136b00ad26..4bc0c53a5aa6 100644 --- a/js/src/tests/ecma/Date/15.9.5.5.js +++ b/js/src/tests/ecma/Date/15.9.5.5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.5.js'; /** File Name: 15.9.5.5.js diff --git a/js/src/tests/ecma/Date/15.9.5.6.js b/js/src/tests/ecma/Date/15.9.5.6.js index 9ae804ebb92b..ca2465ea8f53 100644 --- a/js/src/tests/ecma/Date/15.9.5.6.js +++ b/js/src/tests/ecma/Date/15.9.5.6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.6.js'; /** File Name: 15.9.5.6.js diff --git a/js/src/tests/ecma/Date/15.9.5.7.js b/js/src/tests/ecma/Date/15.9.5.7.js index c4c83a2c38c1..5db4b920b470 100644 --- a/js/src/tests/ecma/Date/15.9.5.7.js +++ b/js/src/tests/ecma/Date/15.9.5.7.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.7.js'; /** File Name: 15.9.5.7.js diff --git a/js/src/tests/ecma/Date/15.9.5.8.js b/js/src/tests/ecma/Date/15.9.5.8.js index 572e29396054..62769cca90ca 100644 --- a/js/src/tests/ecma/Date/15.9.5.8.js +++ b/js/src/tests/ecma/Date/15.9.5.8.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.8.js'; /** File Name: 15.9.5.8.js diff --git a/js/src/tests/ecma/Date/15.9.5.9.js b/js/src/tests/ecma/Date/15.9.5.9.js index 9f0fc124afe2..71352051ad13 100644 --- a/js/src/tests/ecma/Date/15.9.5.9.js +++ b/js/src/tests/ecma/Date/15.9.5.9.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.9.js'; /** File Name: 15.9.5.9.js diff --git a/js/src/tests/ecma/Date/15.9.5.js b/js/src/tests/ecma/Date/15.9.5.js index 9e3bd940804f..9893a98adf69 100644 --- a/js/src/tests/ecma/Date/15.9.5.js +++ b/js/src/tests/ecma/Date/15.9.5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.js'; /** File Name: 15.9.5.js diff --git a/js/src/tests/ecma/Date/shell.js b/js/src/tests/ecma/Date/shell.js index 7e9e53381242..fc78d24b7e93 100644 --- a/js/src/tests/ecma/Date/shell.js +++ b/js/src/tests/ecma/Date/shell.js @@ -1,12 +1,9 @@ -gTestsubsuite = 'Date'; -var gTestfile; var BUGNUMBER; var summary; function runDSTOffsetCachingTestsFraction(part, parts) { - gTestfile = 'dst-offset-caching-' + part + '-of-' + parts + '.js'; BUGNUMBER = 563938; summary = 'Cache DST offsets to improve SunSpider score'; diff --git a/js/src/tests/ecma/ExecutionContexts/10.1.3-1.js b/js/src/tests/ecma/ExecutionContexts/10.1.3-1.js index 699296d6b14e..3bd39e7b90bb 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.1.3-1.js +++ b/js/src/tests/ecma/ExecutionContexts/10.1.3-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.3-1.js'; /** File Name: 10.1.3-1.js diff --git a/js/src/tests/ecma/ExecutionContexts/10.1.3-2.js b/js/src/tests/ecma/ExecutionContexts/10.1.3-2.js index 37628424612b..2bbe4af5f138 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.1.3-2.js +++ b/js/src/tests/ecma/ExecutionContexts/10.1.3-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.3-2.js'; /** File Name: 10.1.3-1.js diff --git a/js/src/tests/ecma/ExecutionContexts/10.1.3.js b/js/src/tests/ecma/ExecutionContexts/10.1.3.js index fd466de210c4..e1576dd06c23 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.1.3.js +++ b/js/src/tests/ecma/ExecutionContexts/10.1.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.3.js'; /** File Name: 10.1.3.js diff --git a/js/src/tests/ecma/ExecutionContexts/10.1.4-1.js b/js/src/tests/ecma/ExecutionContexts/10.1.4-1.js index ec49f2059699..8dc1d9bc7061 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.1.4-1.js +++ b/js/src/tests/ecma/ExecutionContexts/10.1.4-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.4-1.js'; /** File Name: 10.1.4-1.js diff --git a/js/src/tests/ecma/ExecutionContexts/10.1.4-10.js b/js/src/tests/ecma/ExecutionContexts/10.1.4-10.js index 218031c83f3c..9c68b3fb7c0b 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.1.4-10.js +++ b/js/src/tests/ecma/ExecutionContexts/10.1.4-10.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.4-10.js'; /** File Name: 10.1.4-10.js diff --git a/js/src/tests/ecma/ExecutionContexts/10.1.4-2.js b/js/src/tests/ecma/ExecutionContexts/10.1.4-2.js index 2aee831b4551..d3b1689b7511 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.1.4-2.js +++ b/js/src/tests/ecma/ExecutionContexts/10.1.4-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.4-2.js'; /** File Name: 10.1.4-1.js diff --git a/js/src/tests/ecma/ExecutionContexts/10.1.4-3.js b/js/src/tests/ecma/ExecutionContexts/10.1.4-3.js index a3ae0ffdec51..b8c7eb1f3c46 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.1.4-3.js +++ b/js/src/tests/ecma/ExecutionContexts/10.1.4-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.4-3.js'; /** File Name: 10.1.4-1.js diff --git a/js/src/tests/ecma/ExecutionContexts/10.1.4-4.js b/js/src/tests/ecma/ExecutionContexts/10.1.4-4.js index 31274a0209c8..0fdab4d91924 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.1.4-4.js +++ b/js/src/tests/ecma/ExecutionContexts/10.1.4-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.4-4.js'; /** File Name: 10.1.4-1.js diff --git a/js/src/tests/ecma/ExecutionContexts/10.1.4-5.js b/js/src/tests/ecma/ExecutionContexts/10.1.4-5.js index c36d2db8cc6f..aa0c2a4d5288 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.1.4-5.js +++ b/js/src/tests/ecma/ExecutionContexts/10.1.4-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.4-5.js'; /** File Name: 10.1.4-1.js diff --git a/js/src/tests/ecma/ExecutionContexts/10.1.4-6.js b/js/src/tests/ecma/ExecutionContexts/10.1.4-6.js index da11110cc54f..ad41fc1a9606 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.1.4-6.js +++ b/js/src/tests/ecma/ExecutionContexts/10.1.4-6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.4-6.js'; /** File Name: 10.1.4-1.js diff --git a/js/src/tests/ecma/ExecutionContexts/10.1.4-7.js b/js/src/tests/ecma/ExecutionContexts/10.1.4-7.js index f1a0db4569f8..1ab584a3615f 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.1.4-7.js +++ b/js/src/tests/ecma/ExecutionContexts/10.1.4-7.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.4-7.js'; /** File Name: 10.1.4-7.js diff --git a/js/src/tests/ecma/ExecutionContexts/10.1.4-8.js b/js/src/tests/ecma/ExecutionContexts/10.1.4-8.js index 1eee8da4fba4..e1fd17cbfcdb 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.1.4-8.js +++ b/js/src/tests/ecma/ExecutionContexts/10.1.4-8.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.4-8.js'; /** File Name: 10.1.4-1.js diff --git a/js/src/tests/ecma/ExecutionContexts/10.1.5-1.js b/js/src/tests/ecma/ExecutionContexts/10.1.5-1.js index 363581eff618..a808ba84a1dc 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.1.5-1.js +++ b/js/src/tests/ecma/ExecutionContexts/10.1.5-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.5-1.js'; /** File Name: 10.1.5-1.js diff --git a/js/src/tests/ecma/ExecutionContexts/10.1.5-2.js b/js/src/tests/ecma/ExecutionContexts/10.1.5-2.js index cfba3b5c73b0..ecb99d53f203 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.1.5-2.js +++ b/js/src/tests/ecma/ExecutionContexts/10.1.5-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.5-2.js'; /** File Name: 10.1.5-2.js diff --git a/js/src/tests/ecma/ExecutionContexts/10.1.5-3.js b/js/src/tests/ecma/ExecutionContexts/10.1.5-3.js index f5234cb13be0..9cc5934c1472 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.1.5-3.js +++ b/js/src/tests/ecma/ExecutionContexts/10.1.5-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.5-3.js'; /** File Name: 10.1.5-3.js diff --git a/js/src/tests/ecma/ExecutionContexts/10.1.5-4.js b/js/src/tests/ecma/ExecutionContexts/10.1.5-4.js index 953e6a8feb9b..b20324524e10 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.1.5-4.js +++ b/js/src/tests/ecma/ExecutionContexts/10.1.5-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.5-4.js'; /** File Name: 10.1.5-4.js diff --git a/js/src/tests/ecma/ExecutionContexts/10.1.8-2.js b/js/src/tests/ecma/ExecutionContexts/10.1.8-2.js index 40e6f0ee8f37..bf458533c5e9 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.1.8-2.js +++ b/js/src/tests/ecma/ExecutionContexts/10.1.8-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.8-2.js'; /** File Name: 10.1.8-2 diff --git a/js/src/tests/ecma/ExecutionContexts/10.1.8-3.js b/js/src/tests/ecma/ExecutionContexts/10.1.8-3.js index 71aa876f02c1..f6e58bade79a 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.1.8-3.js +++ b/js/src/tests/ecma/ExecutionContexts/10.1.8-3.js @@ -37,7 +37,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.8-3.js'; /** File Name: 10.1.8-3 diff --git a/js/src/tests/ecma/ExecutionContexts/10.2.1.js b/js/src/tests/ecma/ExecutionContexts/10.2.1.js index 5384da4f8322..ccb01efefd4f 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.2.1.js +++ b/js/src/tests/ecma/ExecutionContexts/10.2.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.2.1.js'; /** File Name: 10.2.1.js diff --git a/js/src/tests/ecma/ExecutionContexts/10.2.2-1.js b/js/src/tests/ecma/ExecutionContexts/10.2.2-1.js index 787ef9e5b375..bc1389b45d51 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.2.2-1.js +++ b/js/src/tests/ecma/ExecutionContexts/10.2.2-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.2.2-1.js'; /** File Name: 10.2.2-1.js diff --git a/js/src/tests/ecma/ExecutionContexts/10.2.2-2.js b/js/src/tests/ecma/ExecutionContexts/10.2.2-2.js index 8048c4557544..57ca8a913687 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.2.2-2.js +++ b/js/src/tests/ecma/ExecutionContexts/10.2.2-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.2.2-2.js'; /** File Name: 10.2.2-2.js diff --git a/js/src/tests/ecma/ExecutionContexts/10.2.3-1.js b/js/src/tests/ecma/ExecutionContexts/10.2.3-1.js index a1977c66d63b..569f2cff4c5b 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.2.3-1.js +++ b/js/src/tests/ecma/ExecutionContexts/10.2.3-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.2.3-1.js'; /** File Name: 10.2.3-1.js diff --git a/js/src/tests/ecma/ExecutionContexts/10.2.3-2.js b/js/src/tests/ecma/ExecutionContexts/10.2.3-2.js index e1aa78c5da5c..0ee8707a4a09 100644 --- a/js/src/tests/ecma/ExecutionContexts/10.2.3-2.js +++ b/js/src/tests/ecma/ExecutionContexts/10.2.3-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.2.3-2.js'; /** File Name: 10.2.3-2.js diff --git a/js/src/tests/ecma/ExecutionContexts/shell.js b/js/src/tests/ecma/ExecutionContexts/shell.js index 1d353cff7427..e69de29bb2d1 100644 --- a/js/src/tests/ecma/ExecutionContexts/shell.js +++ b/js/src/tests/ecma/ExecutionContexts/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'ExecutionContexts'; diff --git a/js/src/tests/ecma/Expressions/11.1.1.js b/js/src/tests/ecma/Expressions/11.1.1.js index 18f0ec7f135b..6aadf87fa876 100644 --- a/js/src/tests/ecma/Expressions/11.1.1.js +++ b/js/src/tests/ecma/Expressions/11.1.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.1.1.js'; /** File Name: 11.1.1.js diff --git a/js/src/tests/ecma/Expressions/11.10-1.js b/js/src/tests/ecma/Expressions/11.10-1.js index 5b70334ff5a0..20c927da73fe 100644 --- a/js/src/tests/ecma/Expressions/11.10-1.js +++ b/js/src/tests/ecma/Expressions/11.10-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.10-1.js'; /** File Name: 11.10-1.js diff --git a/js/src/tests/ecma/Expressions/11.10-2.js b/js/src/tests/ecma/Expressions/11.10-2.js index 27bde196e033..81ac6db1ef2b 100644 --- a/js/src/tests/ecma/Expressions/11.10-2.js +++ b/js/src/tests/ecma/Expressions/11.10-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.10-2.js'; /** File Name: 11.10-2.js diff --git a/js/src/tests/ecma/Expressions/11.10-3.js b/js/src/tests/ecma/Expressions/11.10-3.js index 3da696325517..db42a2449c5b 100644 --- a/js/src/tests/ecma/Expressions/11.10-3.js +++ b/js/src/tests/ecma/Expressions/11.10-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.10-3.js'; /** File Name: 11.10-3.js diff --git a/js/src/tests/ecma/Expressions/11.12-1.js b/js/src/tests/ecma/Expressions/11.12-1.js index ff131b672ef2..c8a125815eef 100644 --- a/js/src/tests/ecma/Expressions/11.12-1.js +++ b/js/src/tests/ecma/Expressions/11.12-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.12-1.js'; /** File Name: 11.12.js diff --git a/js/src/tests/ecma/Expressions/11.12-2-n.js b/js/src/tests/ecma/Expressions/11.12-2-n.js index c2a1e894e083..79ed889c537b 100644 --- a/js/src/tests/ecma/Expressions/11.12-2-n.js +++ b/js/src/tests/ecma/Expressions/11.12-2-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.12-2-n.js'; /** File Name: 11.12-2-n.js diff --git a/js/src/tests/ecma/Expressions/11.12-3.js b/js/src/tests/ecma/Expressions/11.12-3.js index 11dde79fb37e..3fe761a9422a 100644 --- a/js/src/tests/ecma/Expressions/11.12-3.js +++ b/js/src/tests/ecma/Expressions/11.12-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.12-3.js'; /** File Name: 11.12-3.js diff --git a/js/src/tests/ecma/Expressions/11.12-4.js b/js/src/tests/ecma/Expressions/11.12-4.js index 861692c4e873..a541143ba004 100644 --- a/js/src/tests/ecma/Expressions/11.12-4.js +++ b/js/src/tests/ecma/Expressions/11.12-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.12-4.js'; /** File Name: 11.12-4.js diff --git a/js/src/tests/ecma/Expressions/11.13.1.js b/js/src/tests/ecma/Expressions/11.13.1.js index 5e548a3e76a9..7d0b75235223 100644 --- a/js/src/tests/ecma/Expressions/11.13.1.js +++ b/js/src/tests/ecma/Expressions/11.13.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.13.1.js'; /** File Name: 11.13.1.js diff --git a/js/src/tests/ecma/Expressions/11.13.2-1.js b/js/src/tests/ecma/Expressions/11.13.2-1.js index 41402b77ce55..88857666aed2 100644 --- a/js/src/tests/ecma/Expressions/11.13.2-1.js +++ b/js/src/tests/ecma/Expressions/11.13.2-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.13.2-1.js'; /** File Name: 11.13.2-1.js diff --git a/js/src/tests/ecma/Expressions/11.13.2-2.js b/js/src/tests/ecma/Expressions/11.13.2-2.js index 2d3b53630b6f..cca26075472d 100644 --- a/js/src/tests/ecma/Expressions/11.13.2-2.js +++ b/js/src/tests/ecma/Expressions/11.13.2-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.13.2-2.js'; /** File Name: 11.13.2-2js diff --git a/js/src/tests/ecma/Expressions/11.13.2-3.js b/js/src/tests/ecma/Expressions/11.13.2-3.js index c432934a302b..d31b55aa8cae 100644 --- a/js/src/tests/ecma/Expressions/11.13.2-3.js +++ b/js/src/tests/ecma/Expressions/11.13.2-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.13.2-3.js'; /** File Name: 11.13.2-4.js diff --git a/js/src/tests/ecma/Expressions/11.13.2-4.js b/js/src/tests/ecma/Expressions/11.13.2-4.js index 8514dd8c9ccf..3a9f84e20eb8 100644 --- a/js/src/tests/ecma/Expressions/11.13.2-4.js +++ b/js/src/tests/ecma/Expressions/11.13.2-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.13.2-4.js'; /** File Name: 11.13.2-4.js diff --git a/js/src/tests/ecma/Expressions/11.13.2-5.js b/js/src/tests/ecma/Expressions/11.13.2-5.js index 99d227b80f5e..c3d5f22290b6 100644 --- a/js/src/tests/ecma/Expressions/11.13.2-5.js +++ b/js/src/tests/ecma/Expressions/11.13.2-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.13.2-5.js'; /** File Name: 11.13.2-5.js diff --git a/js/src/tests/ecma/Expressions/11.13.js b/js/src/tests/ecma/Expressions/11.13.js index bf5f172d3673..4d75db83637a 100644 --- a/js/src/tests/ecma/Expressions/11.13.js +++ b/js/src/tests/ecma/Expressions/11.13.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.13.js'; /** File Name: 11.12.js diff --git a/js/src/tests/ecma/Expressions/11.14-1.js b/js/src/tests/ecma/Expressions/11.14-1.js index c2f30afb6ad8..b9513e16a359 100644 --- a/js/src/tests/ecma/Expressions/11.14-1.js +++ b/js/src/tests/ecma/Expressions/11.14-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.14-1.js'; /** File Name: 11.14-1.js diff --git a/js/src/tests/ecma/Expressions/11.2.1-1.js b/js/src/tests/ecma/Expressions/11.2.1-1.js index 91e25b01f1a9..3174cdabe10d 100644 --- a/js/src/tests/ecma/Expressions/11.2.1-1.js +++ b/js/src/tests/ecma/Expressions/11.2.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.1-1.js'; /** File Name: 11.2.1-1.js diff --git a/js/src/tests/ecma/Expressions/11.2.1-2.js b/js/src/tests/ecma/Expressions/11.2.1-2.js index eda8168c0fb4..f0029a2aa2ea 100644 --- a/js/src/tests/ecma/Expressions/11.2.1-2.js +++ b/js/src/tests/ecma/Expressions/11.2.1-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.1-2.js'; /** File Name: 11.2.1-2.js diff --git a/js/src/tests/ecma/Expressions/11.2.1-3-n.js b/js/src/tests/ecma/Expressions/11.2.1-3-n.js index 0732aa0378af..6c77dfe07b14 100644 --- a/js/src/tests/ecma/Expressions/11.2.1-3-n.js +++ b/js/src/tests/ecma/Expressions/11.2.1-3-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.1-3-n.js'; /** File Name: 11.2.1-2.js diff --git a/js/src/tests/ecma/Expressions/11.2.1-4-n.js b/js/src/tests/ecma/Expressions/11.2.1-4-n.js index 110684c9c6cf..94ce919ef961 100644 --- a/js/src/tests/ecma/Expressions/11.2.1-4-n.js +++ b/js/src/tests/ecma/Expressions/11.2.1-4-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.1-4-n.js'; /** File Name: 11.2.1-4-n.js diff --git a/js/src/tests/ecma/Expressions/11.2.1-5.js b/js/src/tests/ecma/Expressions/11.2.1-5.js index 2d9f0f1632a2..61d04c03052a 100644 --- a/js/src/tests/ecma/Expressions/11.2.1-5.js +++ b/js/src/tests/ecma/Expressions/11.2.1-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.1-5.js'; /** File Name: 11.2.1-5.js diff --git a/js/src/tests/ecma/Expressions/11.2.2-1-n.js b/js/src/tests/ecma/Expressions/11.2.2-1-n.js index 360389211441..33bfcab448cb 100644 --- a/js/src/tests/ecma/Expressions/11.2.2-1-n.js +++ b/js/src/tests/ecma/Expressions/11.2.2-1-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.2-1-n.js'; /** File Name: 11.2.2-1.js diff --git a/js/src/tests/ecma/Expressions/11.2.2-1.js b/js/src/tests/ecma/Expressions/11.2.2-1.js index 7105f1707180..fb6d6d450aba 100644 --- a/js/src/tests/ecma/Expressions/11.2.2-1.js +++ b/js/src/tests/ecma/Expressions/11.2.2-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.2-1.js'; /** File Name: 11.2.2-1.js diff --git a/js/src/tests/ecma/Expressions/11.2.2-10-n.js b/js/src/tests/ecma/Expressions/11.2.2-10-n.js index 36781503d9b6..e4b56e1192f3 100644 --- a/js/src/tests/ecma/Expressions/11.2.2-10-n.js +++ b/js/src/tests/ecma/Expressions/11.2.2-10-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.2-10-n.js'; /** File Name: 11.2.2-9-n.js diff --git a/js/src/tests/ecma/Expressions/11.2.2-11.js b/js/src/tests/ecma/Expressions/11.2.2-11.js index 03a0f8c436a1..a3f82c140f11 100644 --- a/js/src/tests/ecma/Expressions/11.2.2-11.js +++ b/js/src/tests/ecma/Expressions/11.2.2-11.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.2-11.js'; /** File Name: 11.2.2-9-n.js diff --git a/js/src/tests/ecma/Expressions/11.2.2-2-n.js b/js/src/tests/ecma/Expressions/11.2.2-2-n.js index 7fbea97ca1e2..08e4d53e193d 100644 --- a/js/src/tests/ecma/Expressions/11.2.2-2-n.js +++ b/js/src/tests/ecma/Expressions/11.2.2-2-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.2-2-n.js'; /** File Name: 11.2.2-2.js diff --git a/js/src/tests/ecma/Expressions/11.2.2-3-n.js b/js/src/tests/ecma/Expressions/11.2.2-3-n.js index 8b344a3ddac2..efa84ef9ed20 100644 --- a/js/src/tests/ecma/Expressions/11.2.2-3-n.js +++ b/js/src/tests/ecma/Expressions/11.2.2-3-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.2-3-n.js'; /** File Name: 11.2.2-3-n.js diff --git a/js/src/tests/ecma/Expressions/11.2.2-4-n.js b/js/src/tests/ecma/Expressions/11.2.2-4-n.js index c2ff538b9f72..389b816bb451 100644 --- a/js/src/tests/ecma/Expressions/11.2.2-4-n.js +++ b/js/src/tests/ecma/Expressions/11.2.2-4-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.2-4-n.js'; /** File Name: 11.2.2-4-n.js diff --git a/js/src/tests/ecma/Expressions/11.2.2-5-n.js b/js/src/tests/ecma/Expressions/11.2.2-5-n.js index ba8d0756fbb2..2ad935ee6bad 100644 --- a/js/src/tests/ecma/Expressions/11.2.2-5-n.js +++ b/js/src/tests/ecma/Expressions/11.2.2-5-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.2-5-n.js'; /** File Name: 11.2.2-5-n.js diff --git a/js/src/tests/ecma/Expressions/11.2.2-6-n.js b/js/src/tests/ecma/Expressions/11.2.2-6-n.js index f89b4009e336..c14daaeaec02 100644 --- a/js/src/tests/ecma/Expressions/11.2.2-6-n.js +++ b/js/src/tests/ecma/Expressions/11.2.2-6-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.2-6-n.js'; /** File Name: 11.2.2-6-n.js diff --git a/js/src/tests/ecma/Expressions/11.2.2-7-n.js b/js/src/tests/ecma/Expressions/11.2.2-7-n.js index 97ae43e8104a..03176faa15b7 100644 --- a/js/src/tests/ecma/Expressions/11.2.2-7-n.js +++ b/js/src/tests/ecma/Expressions/11.2.2-7-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.2-7-n.js'; /** File Name: 11.2.2-6-n.js diff --git a/js/src/tests/ecma/Expressions/11.2.2-8-n.js b/js/src/tests/ecma/Expressions/11.2.2-8-n.js index 10117c726e4d..e7fc06eafc36 100644 --- a/js/src/tests/ecma/Expressions/11.2.2-8-n.js +++ b/js/src/tests/ecma/Expressions/11.2.2-8-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.2-8-n.js'; /** File Name: 11.2.2-8-n.js diff --git a/js/src/tests/ecma/Expressions/11.2.2-9-n.js b/js/src/tests/ecma/Expressions/11.2.2-9-n.js index 6099754ca3a1..ce3fc2a14979 100644 --- a/js/src/tests/ecma/Expressions/11.2.2-9-n.js +++ b/js/src/tests/ecma/Expressions/11.2.2-9-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.2-9-n.js'; /** File Name: 11.2.2-9-n.js diff --git a/js/src/tests/ecma/Expressions/11.2.3-1.js b/js/src/tests/ecma/Expressions/11.2.3-1.js index 6e36ba8d3f36..8d21bc2a1357 100644 --- a/js/src/tests/ecma/Expressions/11.2.3-1.js +++ b/js/src/tests/ecma/Expressions/11.2.3-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.3-1.js'; /** File Name: 11.2.3-1.js diff --git a/js/src/tests/ecma/Expressions/11.2.3-2-n.js b/js/src/tests/ecma/Expressions/11.2.3-2-n.js index c3539e817a72..734092d24371 100644 --- a/js/src/tests/ecma/Expressions/11.2.3-2-n.js +++ b/js/src/tests/ecma/Expressions/11.2.3-2-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.3-2-n.js'; /** File Name: 11.2.3-2-n.js diff --git a/js/src/tests/ecma/Expressions/11.2.3-3-n.js b/js/src/tests/ecma/Expressions/11.2.3-3-n.js index 3023fee16b0b..30a81c73b3be 100644 --- a/js/src/tests/ecma/Expressions/11.2.3-3-n.js +++ b/js/src/tests/ecma/Expressions/11.2.3-3-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.3-3-n.js'; /** File Name: 11.2.3-3-n.js diff --git a/js/src/tests/ecma/Expressions/11.2.3-4-n.js b/js/src/tests/ecma/Expressions/11.2.3-4-n.js index 3c0ac1a4b3b1..293d54e57dad 100644 --- a/js/src/tests/ecma/Expressions/11.2.3-4-n.js +++ b/js/src/tests/ecma/Expressions/11.2.3-4-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.3-4-n.js'; /** File Name: 11.2.3-4-n.js diff --git a/js/src/tests/ecma/Expressions/11.2.3-5.js b/js/src/tests/ecma/Expressions/11.2.3-5.js index 92b356c1dd1d..1823c81c68d5 100644 --- a/js/src/tests/ecma/Expressions/11.2.3-5.js +++ b/js/src/tests/ecma/Expressions/11.2.3-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.2.3-5.js'; /** File Name: 11.2.3-5-n.js diff --git a/js/src/tests/ecma/Expressions/11.3.1.js b/js/src/tests/ecma/Expressions/11.3.1.js index 29235f11073d..c931cfdc9bf4 100644 --- a/js/src/tests/ecma/Expressions/11.3.1.js +++ b/js/src/tests/ecma/Expressions/11.3.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.3.1.js'; /** File Name: 11.3.1.js diff --git a/js/src/tests/ecma/Expressions/11.3.2.js b/js/src/tests/ecma/Expressions/11.3.2.js index 2d6f6c67703e..e454a7377956 100644 --- a/js/src/tests/ecma/Expressions/11.3.2.js +++ b/js/src/tests/ecma/Expressions/11.3.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.3.2.js'; /** File Name: 11.3.2.js diff --git a/js/src/tests/ecma/Expressions/11.4.1.js b/js/src/tests/ecma/Expressions/11.4.1.js index 62354e17bcae..8abdd2ed48fb 100644 --- a/js/src/tests/ecma/Expressions/11.4.1.js +++ b/js/src/tests/ecma/Expressions/11.4.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.4.1.js'; /** File Name: 11.4.1.js diff --git a/js/src/tests/ecma/Expressions/11.4.2.js b/js/src/tests/ecma/Expressions/11.4.2.js index b89d9145c99d..a965080db29f 100644 --- a/js/src/tests/ecma/Expressions/11.4.2.js +++ b/js/src/tests/ecma/Expressions/11.4.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.4.2.js'; /** File Name: 11.4.2.js diff --git a/js/src/tests/ecma/Expressions/11.4.3.js b/js/src/tests/ecma/Expressions/11.4.3.js index b746fbe8b549..cd758d72e653 100644 --- a/js/src/tests/ecma/Expressions/11.4.3.js +++ b/js/src/tests/ecma/Expressions/11.4.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.4.3.js'; /** File Name: typeof_1.js diff --git a/js/src/tests/ecma/Expressions/11.4.4.js b/js/src/tests/ecma/Expressions/11.4.4.js index cbacf869e448..269e107b926e 100644 --- a/js/src/tests/ecma/Expressions/11.4.4.js +++ b/js/src/tests/ecma/Expressions/11.4.4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.4.4.js'; /** File Name: 11.4.4.js diff --git a/js/src/tests/ecma/Expressions/11.4.5.js b/js/src/tests/ecma/Expressions/11.4.5.js index ee761c5d96d3..bb949cafc9f8 100644 --- a/js/src/tests/ecma/Expressions/11.4.5.js +++ b/js/src/tests/ecma/Expressions/11.4.5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.4.5.js'; /** File Name: 11.4.5.js diff --git a/js/src/tests/ecma/Expressions/11.4.6.js b/js/src/tests/ecma/Expressions/11.4.6.js index 9b100d9d50f0..c10cad2f597e 100644 --- a/js/src/tests/ecma/Expressions/11.4.6.js +++ b/js/src/tests/ecma/Expressions/11.4.6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.4.6.js'; /** File Name: 11.4.6.js diff --git a/js/src/tests/ecma/Expressions/11.4.7-01.js b/js/src/tests/ecma/Expressions/11.4.7-01.js index 827b80189d47..5740afb9095d 100644 --- a/js/src/tests/ecma/Expressions/11.4.7-01.js +++ b/js/src/tests/ecma/Expressions/11.4.7-01.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.4.7-01.js'; /** File Name: 11.4.7-01.js diff --git a/js/src/tests/ecma/Expressions/11.4.7-02.js b/js/src/tests/ecma/Expressions/11.4.7-02.js index 43bd923e2398..28a10a124fed 100644 --- a/js/src/tests/ecma/Expressions/11.4.7-02.js +++ b/js/src/tests/ecma/Expressions/11.4.7-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.4.7-02.js'; /** * File Name: 11.4.7-02.js diff --git a/js/src/tests/ecma/Expressions/11.4.8.js b/js/src/tests/ecma/Expressions/11.4.8.js index f617e1068925..6f98e66193ff 100644 --- a/js/src/tests/ecma/Expressions/11.4.8.js +++ b/js/src/tests/ecma/Expressions/11.4.8.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.4.8.js'; /** File Name: 11.4.8.js diff --git a/js/src/tests/ecma/Expressions/11.4.9.js b/js/src/tests/ecma/Expressions/11.4.9.js index cdaf0caa4ca5..0f25da233ede 100644 --- a/js/src/tests/ecma/Expressions/11.4.9.js +++ b/js/src/tests/ecma/Expressions/11.4.9.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.4.9.js'; /** File Name: 11.4.9.js diff --git a/js/src/tests/ecma/Expressions/11.5.1.js b/js/src/tests/ecma/Expressions/11.5.1.js index 94edcefea5a5..321993d8950a 100644 --- a/js/src/tests/ecma/Expressions/11.5.1.js +++ b/js/src/tests/ecma/Expressions/11.5.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.5.1.js'; /** File Name: 11.5.1.js diff --git a/js/src/tests/ecma/Expressions/11.5.2.js b/js/src/tests/ecma/Expressions/11.5.2.js index e459e7613fd8..33ed409dd3d0 100644 --- a/js/src/tests/ecma/Expressions/11.5.2.js +++ b/js/src/tests/ecma/Expressions/11.5.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.5.2.js'; /** File Name: 11.5.2.js diff --git a/js/src/tests/ecma/Expressions/11.5.3.js b/js/src/tests/ecma/Expressions/11.5.3.js index 9558b63a9631..a23d894605f8 100644 --- a/js/src/tests/ecma/Expressions/11.5.3.js +++ b/js/src/tests/ecma/Expressions/11.5.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.5.3.js'; /** File Name: 11.5.3.js diff --git a/js/src/tests/ecma/Expressions/11.6.1-1.js b/js/src/tests/ecma/Expressions/11.6.1-1.js index 87666161b61c..6dc12cbf68c8 100644 --- a/js/src/tests/ecma/Expressions/11.6.1-1.js +++ b/js/src/tests/ecma/Expressions/11.6.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.6.1-1.js'; /** File Name: 11.6.1-1.js diff --git a/js/src/tests/ecma/Expressions/11.6.1-2.js b/js/src/tests/ecma/Expressions/11.6.1-2.js index 1d96d14e920d..0e093a985ad4 100644 --- a/js/src/tests/ecma/Expressions/11.6.1-2.js +++ b/js/src/tests/ecma/Expressions/11.6.1-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.6.1-2.js'; /** File Name: 11.6.1-2.js diff --git a/js/src/tests/ecma/Expressions/11.6.1-3.js b/js/src/tests/ecma/Expressions/11.6.1-3.js index 9a162787d5f3..099ca1ce0baf 100644 --- a/js/src/tests/ecma/Expressions/11.6.1-3.js +++ b/js/src/tests/ecma/Expressions/11.6.1-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.6.1-3.js'; /** File Name: 11.6.1-3.js diff --git a/js/src/tests/ecma/Expressions/11.6.2-1.js b/js/src/tests/ecma/Expressions/11.6.2-1.js index b3ab9b17fbd2..815e0eb4b944 100644 --- a/js/src/tests/ecma/Expressions/11.6.2-1.js +++ b/js/src/tests/ecma/Expressions/11.6.2-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.6.2-1.js'; /** File Name: 11.6.2-1.js diff --git a/js/src/tests/ecma/Expressions/11.6.3.js b/js/src/tests/ecma/Expressions/11.6.3.js index cf4473852824..99e86d9af13a 100644 --- a/js/src/tests/ecma/Expressions/11.6.3.js +++ b/js/src/tests/ecma/Expressions/11.6.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.6.3.js'; /** File Name: 11.6.3.js diff --git a/js/src/tests/ecma/Expressions/11.7.1.js b/js/src/tests/ecma/Expressions/11.7.1.js index 44099f6c94bd..afed6c6ff2b3 100644 --- a/js/src/tests/ecma/Expressions/11.7.1.js +++ b/js/src/tests/ecma/Expressions/11.7.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.7.1.js'; /** File Name: 11.7.1.js diff --git a/js/src/tests/ecma/Expressions/11.7.2.js b/js/src/tests/ecma/Expressions/11.7.2.js index 843388767fa7..178d1f29a957 100644 --- a/js/src/tests/ecma/Expressions/11.7.2.js +++ b/js/src/tests/ecma/Expressions/11.7.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.7.2.js'; /** File Name: 11.7.2.js diff --git a/js/src/tests/ecma/Expressions/11.7.3.js b/js/src/tests/ecma/Expressions/11.7.3.js index 27d24e121a50..75a9bdb3d259 100644 --- a/js/src/tests/ecma/Expressions/11.7.3.js +++ b/js/src/tests/ecma/Expressions/11.7.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.7.3.js'; /** File Name: 11.7.3.js diff --git a/js/src/tests/ecma/Expressions/11.8.1.js b/js/src/tests/ecma/Expressions/11.8.1.js index 4b35c11b16bc..7dd57afb716b 100644 --- a/js/src/tests/ecma/Expressions/11.8.1.js +++ b/js/src/tests/ecma/Expressions/11.8.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.8.1.js'; /** File Name: 11.8.1.js diff --git a/js/src/tests/ecma/Expressions/11.8.2.js b/js/src/tests/ecma/Expressions/11.8.2.js index c4e6f4cfbdf6..c28f8e84f0a6 100644 --- a/js/src/tests/ecma/Expressions/11.8.2.js +++ b/js/src/tests/ecma/Expressions/11.8.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.8.2.js'; /** File Name: 11.8.2.js diff --git a/js/src/tests/ecma/Expressions/11.8.3.js b/js/src/tests/ecma/Expressions/11.8.3.js index 2180fc56554c..d3d1e29e5f44 100644 --- a/js/src/tests/ecma/Expressions/11.8.3.js +++ b/js/src/tests/ecma/Expressions/11.8.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.8.3.js'; /** File Name: 11.8.3.js diff --git a/js/src/tests/ecma/Expressions/11.8.4.js b/js/src/tests/ecma/Expressions/11.8.4.js index d43aaa260d1d..2a09e33e202e 100644 --- a/js/src/tests/ecma/Expressions/11.8.4.js +++ b/js/src/tests/ecma/Expressions/11.8.4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.8.4.js'; /** File Name: 11.8.4.js diff --git a/js/src/tests/ecma/Expressions/11.9.1.js b/js/src/tests/ecma/Expressions/11.9.1.js index 6bf3fc05177b..73f72bf6b8f8 100644 --- a/js/src/tests/ecma/Expressions/11.9.1.js +++ b/js/src/tests/ecma/Expressions/11.9.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.9.1.js'; /** File Name: 11.9.1.js diff --git a/js/src/tests/ecma/Expressions/11.9.2.js b/js/src/tests/ecma/Expressions/11.9.2.js index b6983e6af18c..38b14d03d9ec 100644 --- a/js/src/tests/ecma/Expressions/11.9.2.js +++ b/js/src/tests/ecma/Expressions/11.9.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.9.2.js'; /** File Name: 11.9.2.js diff --git a/js/src/tests/ecma/Expressions/11.9.3.js b/js/src/tests/ecma/Expressions/11.9.3.js index cce1c63c16e6..926d7d2b9fe6 100644 --- a/js/src/tests/ecma/Expressions/11.9.3.js +++ b/js/src/tests/ecma/Expressions/11.9.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.9.3.js'; /** File Name: 11.9.3.js diff --git a/js/src/tests/ecma/Expressions/shell.js b/js/src/tests/ecma/Expressions/shell.js index 8f5d1129d56e..e69de29bb2d1 100644 --- a/js/src/tests/ecma/Expressions/shell.js +++ b/js/src/tests/ecma/Expressions/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Expressions'; diff --git a/js/src/tests/ecma/FunctionObjects/15.3.1.1-1.js b/js/src/tests/ecma/FunctionObjects/15.3.1.1-1.js index 90f080acc9c0..ded74cd394d1 100644 --- a/js/src/tests/ecma/FunctionObjects/15.3.1.1-1.js +++ b/js/src/tests/ecma/FunctionObjects/15.3.1.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.1.1-1.js'; /** File Name: 15.3.1.1.js diff --git a/js/src/tests/ecma/FunctionObjects/15.3.1.1-2.js b/js/src/tests/ecma/FunctionObjects/15.3.1.1-2.js index 57fe78c8f1ad..2aabb105b569 100644 --- a/js/src/tests/ecma/FunctionObjects/15.3.1.1-2.js +++ b/js/src/tests/ecma/FunctionObjects/15.3.1.1-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.1.1-2.js'; /** File Name: 15.3.1.1-2.js diff --git a/js/src/tests/ecma/FunctionObjects/15.3.1.1-3.js b/js/src/tests/ecma/FunctionObjects/15.3.1.1-3.js index f6a0caf7662e..a7b493de2a47 100644 --- a/js/src/tests/ecma/FunctionObjects/15.3.1.1-3.js +++ b/js/src/tests/ecma/FunctionObjects/15.3.1.1-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.1.1-3.js'; /** File Name: 15.3.1.1-3.js diff --git a/js/src/tests/ecma/FunctionObjects/15.3.2.1-1.js b/js/src/tests/ecma/FunctionObjects/15.3.2.1-1.js index 3f4b59e3b491..58a2aadda1d4 100644 --- a/js/src/tests/ecma/FunctionObjects/15.3.2.1-1.js +++ b/js/src/tests/ecma/FunctionObjects/15.3.2.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.2.1-1.js'; /** File Name: 15.3.2.1.js diff --git a/js/src/tests/ecma/FunctionObjects/15.3.2.1-2.js b/js/src/tests/ecma/FunctionObjects/15.3.2.1-2.js index 7729c9587ad2..607267f1c9d4 100644 --- a/js/src/tests/ecma/FunctionObjects/15.3.2.1-2.js +++ b/js/src/tests/ecma/FunctionObjects/15.3.2.1-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.2.1-2.js'; /** File Name: 15.3.2.1.js diff --git a/js/src/tests/ecma/FunctionObjects/15.3.2.1-3.js b/js/src/tests/ecma/FunctionObjects/15.3.2.1-3.js index bd437cece2ff..37dc416b7f77 100644 --- a/js/src/tests/ecma/FunctionObjects/15.3.2.1-3.js +++ b/js/src/tests/ecma/FunctionObjects/15.3.2.1-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.2.1-3.js'; /** File Name: 15.3.2.1-3.js diff --git a/js/src/tests/ecma/FunctionObjects/15.3.3.1-2.js b/js/src/tests/ecma/FunctionObjects/15.3.3.1-2.js index b760afd1497c..8b85797213b0 100644 --- a/js/src/tests/ecma/FunctionObjects/15.3.3.1-2.js +++ b/js/src/tests/ecma/FunctionObjects/15.3.3.1-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.3.1-2.js'; /** File Name: 15.3.3.1-2.js diff --git a/js/src/tests/ecma/FunctionObjects/15.3.3.1-3.js b/js/src/tests/ecma/FunctionObjects/15.3.3.1-3.js index 62e6d4234282..75c73de4b5d1 100644 --- a/js/src/tests/ecma/FunctionObjects/15.3.3.1-3.js +++ b/js/src/tests/ecma/FunctionObjects/15.3.3.1-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.3.1-3.js'; /** File Name: 15.3.3.1-3.js diff --git a/js/src/tests/ecma/FunctionObjects/15.3.3.1-4.js b/js/src/tests/ecma/FunctionObjects/15.3.3.1-4.js index 6e1aa8426dc4..89d636c60575 100644 --- a/js/src/tests/ecma/FunctionObjects/15.3.3.1-4.js +++ b/js/src/tests/ecma/FunctionObjects/15.3.3.1-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.3.1-4.js'; /** File Name: 15.3.3.1-4.js diff --git a/js/src/tests/ecma/FunctionObjects/15.3.3.2.js b/js/src/tests/ecma/FunctionObjects/15.3.3.2.js index b1d04f395792..131284409ae6 100644 --- a/js/src/tests/ecma/FunctionObjects/15.3.3.2.js +++ b/js/src/tests/ecma/FunctionObjects/15.3.3.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.3.2.js'; /** File Name: 15.3.3.2.js diff --git a/js/src/tests/ecma/FunctionObjects/15.3.4-1.js b/js/src/tests/ecma/FunctionObjects/15.3.4-1.js index c90c26a9e5bd..777959e74a26 100644 --- a/js/src/tests/ecma/FunctionObjects/15.3.4-1.js +++ b/js/src/tests/ecma/FunctionObjects/15.3.4-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.4-1.js'; /** File Name: 15.3.4-1.js diff --git a/js/src/tests/ecma/FunctionObjects/15.3.4.1.js b/js/src/tests/ecma/FunctionObjects/15.3.4.1.js index a6bc77590215..4a2ba2554e9e 100644 --- a/js/src/tests/ecma/FunctionObjects/15.3.4.1.js +++ b/js/src/tests/ecma/FunctionObjects/15.3.4.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.4.1.js'; /** File Name: 15.3.4.1.js diff --git a/js/src/tests/ecma/FunctionObjects/15.3.4.js b/js/src/tests/ecma/FunctionObjects/15.3.4.js index 59e3ff81a598..061daccde39c 100644 --- a/js/src/tests/ecma/FunctionObjects/15.3.4.js +++ b/js/src/tests/ecma/FunctionObjects/15.3.4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.4.js'; /** File Name: 15.3.4.js diff --git a/js/src/tests/ecma/FunctionObjects/15.3.5-1.js b/js/src/tests/ecma/FunctionObjects/15.3.5-1.js index c3fbfc774e4a..6a88921e8e7e 100644 --- a/js/src/tests/ecma/FunctionObjects/15.3.5-1.js +++ b/js/src/tests/ecma/FunctionObjects/15.3.5-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.5-1.js'; /** File Name: 15.3.5-1.js diff --git a/js/src/tests/ecma/FunctionObjects/15.3.5-2.js b/js/src/tests/ecma/FunctionObjects/15.3.5-2.js index dcb351985d06..1b4fbef0e217 100644 --- a/js/src/tests/ecma/FunctionObjects/15.3.5-2.js +++ b/js/src/tests/ecma/FunctionObjects/15.3.5-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.5-2.js'; /** File Name: 15.3.5-1.js diff --git a/js/src/tests/ecma/FunctionObjects/15.3.5.1.js b/js/src/tests/ecma/FunctionObjects/15.3.5.1.js index 406d569dba04..197d10698835 100644 --- a/js/src/tests/ecma/FunctionObjects/15.3.5.1.js +++ b/js/src/tests/ecma/FunctionObjects/15.3.5.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.5.1.js'; /** File Name: 15.3.5.1.js diff --git a/js/src/tests/ecma/FunctionObjects/15.3.5.3.js b/js/src/tests/ecma/FunctionObjects/15.3.5.3.js index 4a127fbc68d7..7c51cd4b0585 100644 --- a/js/src/tests/ecma/FunctionObjects/15.3.5.3.js +++ b/js/src/tests/ecma/FunctionObjects/15.3.5.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.5.3.js'; /** File Name: 15.3.5.3.js diff --git a/js/src/tests/ecma/FunctionObjects/shell.js b/js/src/tests/ecma/FunctionObjects/shell.js index 27aa7b1318d4..e69de29bb2d1 100644 --- a/js/src/tests/ecma/FunctionObjects/shell.js +++ b/js/src/tests/ecma/FunctionObjects/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'FunctionObjects'; diff --git a/js/src/tests/ecma/GlobalObject/15.1-1-n.js b/js/src/tests/ecma/GlobalObject/15.1-1-n.js index 9946a7f2da4b..5af2dc33ddff 100644 --- a/js/src/tests/ecma/GlobalObject/15.1-1-n.js +++ b/js/src/tests/ecma/GlobalObject/15.1-1-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.1-1-n.js'; /** File Name: 15.1-1-n.js diff --git a/js/src/tests/ecma/GlobalObject/15.1-2-n.js b/js/src/tests/ecma/GlobalObject/15.1-2-n.js index 545caeeae039..65becb2a3a8f 100644 --- a/js/src/tests/ecma/GlobalObject/15.1-2-n.js +++ b/js/src/tests/ecma/GlobalObject/15.1-2-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.1-2-n.js'; /** File Name: 15.1-2-n.js diff --git a/js/src/tests/ecma/GlobalObject/15.1.1.1.js b/js/src/tests/ecma/GlobalObject/15.1.1.1.js index a8d4e7fecf03..9b035bcc287d 100644 --- a/js/src/tests/ecma/GlobalObject/15.1.1.1.js +++ b/js/src/tests/ecma/GlobalObject/15.1.1.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.1.1.1.js'; /** File Name: 15.1.1.1.js diff --git a/js/src/tests/ecma/GlobalObject/15.1.1.2.js b/js/src/tests/ecma/GlobalObject/15.1.1.2.js index 8671ff642a95..61d1a83edd49 100644 --- a/js/src/tests/ecma/GlobalObject/15.1.1.2.js +++ b/js/src/tests/ecma/GlobalObject/15.1.1.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.1.1.2.js'; /** File Name: 15.1.1.2.js diff --git a/js/src/tests/ecma/GlobalObject/15.1.2.1-2.js b/js/src/tests/ecma/GlobalObject/15.1.2.1-2.js index 8572371f8e5f..c81ca11be840 100644 --- a/js/src/tests/ecma/GlobalObject/15.1.2.1-2.js +++ b/js/src/tests/ecma/GlobalObject/15.1.2.1-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.1.2.1-2.js'; /** File Name: 15.1.2.1-2.js diff --git a/js/src/tests/ecma/GlobalObject/15.1.2.2-1.js b/js/src/tests/ecma/GlobalObject/15.1.2.2-1.js index daf013ca2511..a9ec0dc5dcbf 100644 --- a/js/src/tests/ecma/GlobalObject/15.1.2.2-1.js +++ b/js/src/tests/ecma/GlobalObject/15.1.2.2-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.1.2.2-1.js'; /** File Name: 15.1.2.2-1.js diff --git a/js/src/tests/ecma/GlobalObject/15.1.2.2-2.js b/js/src/tests/ecma/GlobalObject/15.1.2.2-2.js index ff8806dfb285..0f08b07627e7 100644 --- a/js/src/tests/ecma/GlobalObject/15.1.2.2-2.js +++ b/js/src/tests/ecma/GlobalObject/15.1.2.2-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.1.2.2-2.js'; /** File Name: 15.1.2.2-1.js diff --git a/js/src/tests/ecma/GlobalObject/15.1.2.3-1.js b/js/src/tests/ecma/GlobalObject/15.1.2.3-1.js index e606f2b80318..26911d299073 100644 --- a/js/src/tests/ecma/GlobalObject/15.1.2.3-1.js +++ b/js/src/tests/ecma/GlobalObject/15.1.2.3-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.1.2.3-1.js'; /** File Name: 15.1.2.3.js diff --git a/js/src/tests/ecma/GlobalObject/15.1.2.3-2.js b/js/src/tests/ecma/GlobalObject/15.1.2.3-2.js index 557b93f637aa..1475234b84e2 100644 --- a/js/src/tests/ecma/GlobalObject/15.1.2.3-2.js +++ b/js/src/tests/ecma/GlobalObject/15.1.2.3-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.1.2.3-2.js'; /** File Name: 15.1.2.3-2.js diff --git a/js/src/tests/ecma/GlobalObject/15.1.2.4.js b/js/src/tests/ecma/GlobalObject/15.1.2.4.js index f215b911f896..903bf3f88036 100644 --- a/js/src/tests/ecma/GlobalObject/15.1.2.4.js +++ b/js/src/tests/ecma/GlobalObject/15.1.2.4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.1.2.4.js'; /** File Name: 15.1.2.4.js diff --git a/js/src/tests/ecma/GlobalObject/15.1.2.5-1.js b/js/src/tests/ecma/GlobalObject/15.1.2.5-1.js index 256ef2e04bff..c888451c40e9 100644 --- a/js/src/tests/ecma/GlobalObject/15.1.2.5-1.js +++ b/js/src/tests/ecma/GlobalObject/15.1.2.5-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.1.2.5-1.js'; /** File Name: 15.1.2.5-1.js diff --git a/js/src/tests/ecma/GlobalObject/15.1.2.5-2.js b/js/src/tests/ecma/GlobalObject/15.1.2.5-2.js index 99b58752b28a..51612b741d59 100644 --- a/js/src/tests/ecma/GlobalObject/15.1.2.5-2.js +++ b/js/src/tests/ecma/GlobalObject/15.1.2.5-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.1.2.5-2.js'; /** File Name: 15.1.2.5-2.js diff --git a/js/src/tests/ecma/GlobalObject/15.1.2.5-3.js b/js/src/tests/ecma/GlobalObject/15.1.2.5-3.js index 2615d625313c..efa98a451932 100644 --- a/js/src/tests/ecma/GlobalObject/15.1.2.5-3.js +++ b/js/src/tests/ecma/GlobalObject/15.1.2.5-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.1.2.5-3.js'; /** File Name: 15.1.2.5-3.js diff --git a/js/src/tests/ecma/GlobalObject/15.1.2.6.js b/js/src/tests/ecma/GlobalObject/15.1.2.6.js index a3d803cbedfb..6e44ff458d19 100644 --- a/js/src/tests/ecma/GlobalObject/15.1.2.6.js +++ b/js/src/tests/ecma/GlobalObject/15.1.2.6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.1.2.6.js'; /** File Name: 15.1.2.6.js diff --git a/js/src/tests/ecma/GlobalObject/15.1.2.7.js b/js/src/tests/ecma/GlobalObject/15.1.2.7.js index a10b2b01cbf6..09c4e0621a99 100644 --- a/js/src/tests/ecma/GlobalObject/15.1.2.7.js +++ b/js/src/tests/ecma/GlobalObject/15.1.2.7.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.1.2.7.js'; /** File Name: 15.1.2.7.js diff --git a/js/src/tests/ecma/GlobalObject/shell.js b/js/src/tests/ecma/GlobalObject/shell.js index d92270721808..e69de29bb2d1 100644 --- a/js/src/tests/ecma/GlobalObject/shell.js +++ b/js/src/tests/ecma/GlobalObject/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'GlobalObject'; diff --git a/js/src/tests/ecma/LexicalConventions/7.1-1.js b/js/src/tests/ecma/LexicalConventions/7.1-1.js index 7fa415c20d99..2e8725552e9e 100644 --- a/js/src/tests/ecma/LexicalConventions/7.1-1.js +++ b/js/src/tests/ecma/LexicalConventions/7.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.1-1.js'; /** File Name: 7.1-1.js diff --git a/js/src/tests/ecma/LexicalConventions/7.1-2.js b/js/src/tests/ecma/LexicalConventions/7.1-2.js index aa0c3fb373dd..7a29fb890617 100644 --- a/js/src/tests/ecma/LexicalConventions/7.1-2.js +++ b/js/src/tests/ecma/LexicalConventions/7.1-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.1-2.js'; /** File Name: 7.1-2.js diff --git a/js/src/tests/ecma/LexicalConventions/7.1-3.js b/js/src/tests/ecma/LexicalConventions/7.1-3.js index c405106ade17..99e9ec87b048 100644 --- a/js/src/tests/ecma/LexicalConventions/7.1-3.js +++ b/js/src/tests/ecma/LexicalConventions/7.1-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.1-3.js'; /** File Name: 7.1-3.js diff --git a/js/src/tests/ecma/LexicalConventions/7.2-1.js b/js/src/tests/ecma/LexicalConventions/7.2-1.js index dd4f2fcbedd9..6484d3331d29 100644 --- a/js/src/tests/ecma/LexicalConventions/7.2-1.js +++ b/js/src/tests/ecma/LexicalConventions/7.2-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.2-1.js'; /** File Name: 7.2-1.js diff --git a/js/src/tests/ecma/LexicalConventions/7.2-2-n.js b/js/src/tests/ecma/LexicalConventions/7.2-2-n.js index d94511583284..edb7593ff55e 100644 --- a/js/src/tests/ecma/LexicalConventions/7.2-2-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.2-2-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.2-2-n.js'; /** File Name: 7.2.js diff --git a/js/src/tests/ecma/LexicalConventions/7.2-3-n.js b/js/src/tests/ecma/LexicalConventions/7.2-3-n.js index c62410d20295..45db54717a3d 100644 --- a/js/src/tests/ecma/LexicalConventions/7.2-3-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.2-3-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.2-3-n.js'; /** File Name: 7.2-3.js diff --git a/js/src/tests/ecma/LexicalConventions/7.2-4-n.js b/js/src/tests/ecma/LexicalConventions/7.2-4-n.js index b29f9997392d..407d94da5fe8 100644 --- a/js/src/tests/ecma/LexicalConventions/7.2-4-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.2-4-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.2-4-n.js'; /** File Name: 7.2.js diff --git a/js/src/tests/ecma/LexicalConventions/7.2-5-n.js b/js/src/tests/ecma/LexicalConventions/7.2-5-n.js index b563d8643739..d8397c4e1e9a 100644 --- a/js/src/tests/ecma/LexicalConventions/7.2-5-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.2-5-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.2-5-n.js'; /** File Name: 7.2.js diff --git a/js/src/tests/ecma/LexicalConventions/7.2-6.js b/js/src/tests/ecma/LexicalConventions/7.2-6.js index 220548e78ebc..bb0e2b63d1c8 100644 --- a/js/src/tests/ecma/LexicalConventions/7.2-6.js +++ b/js/src/tests/ecma/LexicalConventions/7.2-6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.2-6.js'; /** File Name: 7.2-6.js diff --git a/js/src/tests/ecma/LexicalConventions/7.3-1.js b/js/src/tests/ecma/LexicalConventions/7.3-1.js index 9701660576a0..22cb716d85fd 100644 --- a/js/src/tests/ecma/LexicalConventions/7.3-1.js +++ b/js/src/tests/ecma/LexicalConventions/7.3-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.3-1.js'; /** File Name: 7.3-1.js diff --git a/js/src/tests/ecma/LexicalConventions/7.3-10.js b/js/src/tests/ecma/LexicalConventions/7.3-10.js index 1cd0f18a90e5..9efa5909e0fe 100644 --- a/js/src/tests/ecma/LexicalConventions/7.3-10.js +++ b/js/src/tests/ecma/LexicalConventions/7.3-10.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.3-10.js'; /** File Name: 7.3-10.js diff --git a/js/src/tests/ecma/LexicalConventions/7.3-11.js b/js/src/tests/ecma/LexicalConventions/7.3-11.js index f9033cd05aa2..5b8ac9eb8929 100644 --- a/js/src/tests/ecma/LexicalConventions/7.3-11.js +++ b/js/src/tests/ecma/LexicalConventions/7.3-11.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.3-11.js'; /** File Name: 7.3-11.js diff --git a/js/src/tests/ecma/LexicalConventions/7.3-12.js b/js/src/tests/ecma/LexicalConventions/7.3-12.js index 04ceb81409cd..ecb68fe610f9 100644 --- a/js/src/tests/ecma/LexicalConventions/7.3-12.js +++ b/js/src/tests/ecma/LexicalConventions/7.3-12.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.3-12.js'; /** File Name: 7.3-12.js diff --git a/js/src/tests/ecma/LexicalConventions/7.3-13-n.js b/js/src/tests/ecma/LexicalConventions/7.3-13-n.js index 714de99a9aca..66ac71df6269 100644 --- a/js/src/tests/ecma/LexicalConventions/7.3-13-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.3-13-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.3-13-n.js'; /** File Name: 7.3-13-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.3-2.js b/js/src/tests/ecma/LexicalConventions/7.3-2.js index 7aa029feda92..56a36a24216b 100644 --- a/js/src/tests/ecma/LexicalConventions/7.3-2.js +++ b/js/src/tests/ecma/LexicalConventions/7.3-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.3-2.js'; /** File Name: 7.3-2.js diff --git a/js/src/tests/ecma/LexicalConventions/7.3-3.js b/js/src/tests/ecma/LexicalConventions/7.3-3.js index 1886639e26c2..486e7c5c852a 100644 --- a/js/src/tests/ecma/LexicalConventions/7.3-3.js +++ b/js/src/tests/ecma/LexicalConventions/7.3-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.3-3.js'; /** File Name: 7.3-3.js diff --git a/js/src/tests/ecma/LexicalConventions/7.3-4.js b/js/src/tests/ecma/LexicalConventions/7.3-4.js index 4cb53af0fbd5..7f3a74d13eae 100644 --- a/js/src/tests/ecma/LexicalConventions/7.3-4.js +++ b/js/src/tests/ecma/LexicalConventions/7.3-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.3-4.js'; /** File Name: 7.3-4.js diff --git a/js/src/tests/ecma/LexicalConventions/7.3-5.js b/js/src/tests/ecma/LexicalConventions/7.3-5.js index 22d9e08a60c1..75e7f8aadc1d 100644 --- a/js/src/tests/ecma/LexicalConventions/7.3-5.js +++ b/js/src/tests/ecma/LexicalConventions/7.3-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.3-5.js'; /** File Name: 7.3-5.js diff --git a/js/src/tests/ecma/LexicalConventions/7.3-6.js b/js/src/tests/ecma/LexicalConventions/7.3-6.js index 91afd319a4ad..b07f465f48b0 100644 --- a/js/src/tests/ecma/LexicalConventions/7.3-6.js +++ b/js/src/tests/ecma/LexicalConventions/7.3-6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.3-6.js'; /** File Name: 7.3-6.js diff --git a/js/src/tests/ecma/LexicalConventions/7.3-7.js b/js/src/tests/ecma/LexicalConventions/7.3-7.js index a35cd542899e..71c74169167c 100644 --- a/js/src/tests/ecma/LexicalConventions/7.3-7.js +++ b/js/src/tests/ecma/LexicalConventions/7.3-7.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.3-7.js'; /** File Name: 7.3-7.js diff --git a/js/src/tests/ecma/LexicalConventions/7.3-8.js b/js/src/tests/ecma/LexicalConventions/7.3-8.js index 2d665c4ff03e..948a2d77d5d3 100644 --- a/js/src/tests/ecma/LexicalConventions/7.3-8.js +++ b/js/src/tests/ecma/LexicalConventions/7.3-8.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.3-8.js'; /** File Name: 7.3-7.js diff --git a/js/src/tests/ecma/LexicalConventions/7.3-9.js b/js/src/tests/ecma/LexicalConventions/7.3-9.js index caff9f7f0911..384cd2a5e81f 100644 --- a/js/src/tests/ecma/LexicalConventions/7.3-9.js +++ b/js/src/tests/ecma/LexicalConventions/7.3-9.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.3-9.js'; /** File Name: 7.3-9.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.1-1-n.js b/js/src/tests/ecma/LexicalConventions/7.4.1-1-n.js index 2153cc263894..5673585ee5a0 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.1-1-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.1-1-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.1-1-n.js'; /** File Name: 7.4.1-1-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.1-2-n.js b/js/src/tests/ecma/LexicalConventions/7.4.1-2-n.js index a50bd6020f75..46e8f9913b85 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.1-2-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.1-2-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.1-2-n.js'; /** File Name: 7.4.1-2.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.1-3-n.js b/js/src/tests/ecma/LexicalConventions/7.4.1-3-n.js index b49fe7937bd4..83f735025f74 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.1-3-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.1-3-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.1-3-n.js'; /** File Name: 7.4.1-3-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.2-1-n.js b/js/src/tests/ecma/LexicalConventions/7.4.2-1-n.js index 36723173f5d9..caa5b0b01141 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.2-1-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.2-1-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.2-1-n.js'; /** File Name: 7.4.2-1.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.2-10-n.js b/js/src/tests/ecma/LexicalConventions/7.4.2-10-n.js index 89003d360138..07d9b18dcbb7 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.2-10-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.2-10-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.2-10-n.js'; /** File Name: 7.4.2-10.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.2-11-n.js b/js/src/tests/ecma/LexicalConventions/7.4.2-11-n.js index 3aff749e513a..f5b838b82128 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.2-11-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.2-11-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.2-11-n.js'; /** File Name: 7.4.2-11-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.2-12-n.js b/js/src/tests/ecma/LexicalConventions/7.4.2-12-n.js index f19ed8c90421..0b8d9ff1b71a 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.2-12-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.2-12-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.2-12-n.js'; /** File Name: 7.4.2-12-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.2-13-n.js b/js/src/tests/ecma/LexicalConventions/7.4.2-13-n.js index 22a5284dcc06..a575fedb4e59 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.2-13-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.2-13-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.2-13-n.js'; /** File Name: 7.4.2-13-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.2-14-n.js b/js/src/tests/ecma/LexicalConventions/7.4.2-14-n.js index b9b05f42b70e..16aef0ce5112 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.2-14-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.2-14-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.2-14-n.js'; /** File Name: 7.4.2-14-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.2-15-n.js b/js/src/tests/ecma/LexicalConventions/7.4.2-15-n.js index 27e83972c34f..786cd498f148 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.2-15-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.2-15-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.2-15-n.js'; /** File Name: 7.4.2-15-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.2-16-n.js b/js/src/tests/ecma/LexicalConventions/7.4.2-16-n.js index 988920538c99..83d219ffe445 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.2-16-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.2-16-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.2-16-n.js'; /** File Name: 7.4.2-16-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.2-2-n.js b/js/src/tests/ecma/LexicalConventions/7.4.2-2-n.js index 648610a9e64e..c5162e16a48e 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.2-2-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.2-2-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.2-2-n.js'; /** File Name: 7.4.2-2-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.2-3-n.js b/js/src/tests/ecma/LexicalConventions/7.4.2-3-n.js index d8b74d6b0ed6..0859c51d752a 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.2-3-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.2-3-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.2-3-n.js'; /** File Name: 7.4.2-3-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.2-4-n.js b/js/src/tests/ecma/LexicalConventions/7.4.2-4-n.js index 2bb0aa260b79..e6f17a1e577f 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.2-4-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.2-4-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.2-4-n.js'; /** File Name: 7.4.2-4-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.2-5-n.js b/js/src/tests/ecma/LexicalConventions/7.4.2-5-n.js index 3fdf06b2c16e..4d9510f80da7 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.2-5-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.2-5-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.2-5-n.js'; /** File Name: 7.4.2-5-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.2-6-n.js b/js/src/tests/ecma/LexicalConventions/7.4.2-6-n.js index 00f3f99a4cab..35e91ef430e0 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.2-6-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.2-6-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.2-6-n.js'; /** File Name: 7.4.2-6.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.2-7-n.js b/js/src/tests/ecma/LexicalConventions/7.4.2-7-n.js index 6a85b261ce81..1c3a737f44a1 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.2-7-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.2-7-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.2-7-n.js'; /** File Name: 7.4.2-7-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.2-8-n.js b/js/src/tests/ecma/LexicalConventions/7.4.2-8-n.js index 5f5122e0f288..edcbbe26e41a 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.2-8-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.2-8-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.2-8-n.js'; /** File Name: 7.4.2-8-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.2-9-n.js b/js/src/tests/ecma/LexicalConventions/7.4.2-9-n.js index c1c4df6d9b23..5cc7fd313494 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.2-9-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.2-9-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.2-9-n.js'; /** File Name: 7.4.2-9-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.3-1-n.js b/js/src/tests/ecma/LexicalConventions/7.4.3-1-n.js index dee163d8e598..825dfa8d9f3a 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.3-1-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.3-1-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.3-1-n.js'; /** File Name: 7.4.3-1-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.3-10-n.js b/js/src/tests/ecma/LexicalConventions/7.4.3-10-n.js index 8d717f323d03..61678b4d79e7 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.3-10-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.3-10-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.3-10-n.js'; /** File Name: 7.4.3-10-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.3-11-n.js b/js/src/tests/ecma/LexicalConventions/7.4.3-11-n.js index 4e29e9c3af14..2f2d83f46548 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.3-11-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.3-11-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.3-11-n.js'; /** File Name: 7.4.3-11-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.3-12-n.js b/js/src/tests/ecma/LexicalConventions/7.4.3-12-n.js index 913fae905ba7..45c3024a278c 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.3-12-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.3-12-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.3-12-n.js'; /** File Name: 7.4.3-12-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.3-13-n.js b/js/src/tests/ecma/LexicalConventions/7.4.3-13-n.js index c196ea241869..56ca5c1008ae 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.3-13-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.3-13-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.3-13-n.js'; /** File Name: 7.4.3-13-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.3-14-n.js b/js/src/tests/ecma/LexicalConventions/7.4.3-14-n.js index 84ab7bd28afe..45a3a3d35cc1 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.3-14-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.3-14-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.3-14-n.js'; /** File Name: 7.4.3-14-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.3-15-n.js b/js/src/tests/ecma/LexicalConventions/7.4.3-15-n.js index f855132d8ad6..8878a0b5b6c8 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.3-15-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.3-15-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.3-15-n.js'; /** File Name: 7.4.3-15-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.3-16-n.js b/js/src/tests/ecma/LexicalConventions/7.4.3-16-n.js index 6d86d357f263..9d6b904c056f 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.3-16-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.3-16-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.3-16-n.js'; /** File Name: lexical-023.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.3-2-n.js b/js/src/tests/ecma/LexicalConventions/7.4.3-2-n.js index fe5f6ffac1fb..75bd202a11f0 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.3-2-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.3-2-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.3-2-n.js'; /** File Name: 7.4.3-2-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.3-3-n.js b/js/src/tests/ecma/LexicalConventions/7.4.3-3-n.js index b95c8ecbe019..56eef462f931 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.3-3-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.3-3-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.3-3-n.js'; /** File Name: 7.4.3-3-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.3-4-n.js b/js/src/tests/ecma/LexicalConventions/7.4.3-4-n.js index 7d9475cb1a1b..be6ce7d655d2 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.3-4-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.3-4-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.3-4-n.js'; /** File Name: 7.4.3-4-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.3-5-n.js b/js/src/tests/ecma/LexicalConventions/7.4.3-5-n.js index d76025b3cc58..12e141c1eede 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.3-5-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.3-5-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.3-5-n.js'; /** File Name: 7.4.3-5-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.3-6-n.js b/js/src/tests/ecma/LexicalConventions/7.4.3-6-n.js index 36ffe639772a..4d19131480e9 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.3-6-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.3-6-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.3-6-n.js'; /** File Name: 7.4.3-6-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.3-7-n.js b/js/src/tests/ecma/LexicalConventions/7.4.3-7-n.js index 5f5636ef5e4f..cbfe0f513bbc 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.3-7-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.3-7-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.3-7-n.js'; /** File Name: 7.4.3-7-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.3-8-n.js b/js/src/tests/ecma/LexicalConventions/7.4.3-8-n.js index 666abcc0c841..36d6dfc2194c 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.3-8-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.3-8-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.3-8-n.js'; /** File Name: 7.4.3-8-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.4.3-9-n.js b/js/src/tests/ecma/LexicalConventions/7.4.3-9-n.js index b75cf1c0e67b..b6d46d840c25 100644 --- a/js/src/tests/ecma/LexicalConventions/7.4.3-9-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.4.3-9-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.4.3-9-n.js'; /** File Name: 7.4.3-9-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.5-1.js b/js/src/tests/ecma/LexicalConventions/7.5-1.js index 57be9b63ee2d..c639afe6dc68 100644 --- a/js/src/tests/ecma/LexicalConventions/7.5-1.js +++ b/js/src/tests/ecma/LexicalConventions/7.5-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.5-1.js'; /** File Name: 7.5-1.js diff --git a/js/src/tests/ecma/LexicalConventions/7.5-10-n.js b/js/src/tests/ecma/LexicalConventions/7.5-10-n.js index 2561a3deda85..f1695f098a72 100644 --- a/js/src/tests/ecma/LexicalConventions/7.5-10-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.5-10-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.5-10-n.js'; /** File Name: 7.5-9-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.5-2-n.js b/js/src/tests/ecma/LexicalConventions/7.5-2-n.js index 3401fe489194..2d982334b43c 100644 --- a/js/src/tests/ecma/LexicalConventions/7.5-2-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.5-2-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.5-2-n.js'; /** File Name: 7.5-2-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.5-3-n.js b/js/src/tests/ecma/LexicalConventions/7.5-3-n.js index 778c284cfbf4..88a6cdc2a00c 100644 --- a/js/src/tests/ecma/LexicalConventions/7.5-3-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.5-3-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.5-3-n.js'; /** File Name: 7.5-2.js diff --git a/js/src/tests/ecma/LexicalConventions/7.5-4-n.js b/js/src/tests/ecma/LexicalConventions/7.5-4-n.js index 0f4b0fb2f162..c0e836a9b7d9 100644 --- a/js/src/tests/ecma/LexicalConventions/7.5-4-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.5-4-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.5-4-n.js'; /** File Name: 7.5-4-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.5-5-n.js b/js/src/tests/ecma/LexicalConventions/7.5-5-n.js index 97a61e344918..cf3683a43276 100644 --- a/js/src/tests/ecma/LexicalConventions/7.5-5-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.5-5-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.5-5-n.js'; /** File Name: 7.5-5-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.5-6.js b/js/src/tests/ecma/LexicalConventions/7.5-6.js index a53f4413ebf3..64edd25fb3f5 100644 --- a/js/src/tests/ecma/LexicalConventions/7.5-6.js +++ b/js/src/tests/ecma/LexicalConventions/7.5-6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.5-6.js'; /** File Name: 7.5-6.js diff --git a/js/src/tests/ecma/LexicalConventions/7.5-7.js b/js/src/tests/ecma/LexicalConventions/7.5-7.js index c3446c6c0d31..00ddf69444b0 100644 --- a/js/src/tests/ecma/LexicalConventions/7.5-7.js +++ b/js/src/tests/ecma/LexicalConventions/7.5-7.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.5-7.js'; /** File Name: 7.5-7.js diff --git a/js/src/tests/ecma/LexicalConventions/7.5-8-n.js b/js/src/tests/ecma/LexicalConventions/7.5-8-n.js index e36366614896..98503ef83cd5 100644 --- a/js/src/tests/ecma/LexicalConventions/7.5-8-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.5-8-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.5-8-n.js'; /** File Name: 7.5-8-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.5-9-n.js b/js/src/tests/ecma/LexicalConventions/7.5-9-n.js index c1ac68512abe..72cab7e0e71e 100644 --- a/js/src/tests/ecma/LexicalConventions/7.5-9-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.5-9-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.5-9-n.js'; /** File Name: 7.5-9-n.js diff --git a/js/src/tests/ecma/LexicalConventions/7.6.js b/js/src/tests/ecma/LexicalConventions/7.6.js index 091c74d7db5f..ecafec74b6ea 100644 --- a/js/src/tests/ecma/LexicalConventions/7.6.js +++ b/js/src/tests/ecma/LexicalConventions/7.6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.6.js'; /** File Name: 7.6.js diff --git a/js/src/tests/ecma/LexicalConventions/7.7.1.js b/js/src/tests/ecma/LexicalConventions/7.7.1.js index 83325b5f3296..05c49631f28c 100644 --- a/js/src/tests/ecma/LexicalConventions/7.7.1.js +++ b/js/src/tests/ecma/LexicalConventions/7.7.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.7.1.js'; /** File Name: 7.7.1.js diff --git a/js/src/tests/ecma/LexicalConventions/7.7.2.js b/js/src/tests/ecma/LexicalConventions/7.7.2.js index f021eb9b18b4..71b0ccf7bbb3 100644 --- a/js/src/tests/ecma/LexicalConventions/7.7.2.js +++ b/js/src/tests/ecma/LexicalConventions/7.7.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.7.2.js'; /** File Name: 7.7.2.js diff --git a/js/src/tests/ecma/LexicalConventions/7.7.3-1.js b/js/src/tests/ecma/LexicalConventions/7.7.3-1.js index fb13b24e07fb..2e3393a47cf5 100644 --- a/js/src/tests/ecma/LexicalConventions/7.7.3-1.js +++ b/js/src/tests/ecma/LexicalConventions/7.7.3-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.7.3-1.js'; /** File Name: 7.7.3-1.js diff --git a/js/src/tests/ecma/LexicalConventions/7.7.3-2.js b/js/src/tests/ecma/LexicalConventions/7.7.3-2.js index 8fbe16cb8f98..b3e4d46131b3 100644 --- a/js/src/tests/ecma/LexicalConventions/7.7.3-2.js +++ b/js/src/tests/ecma/LexicalConventions/7.7.3-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.7.3-2.js'; /** File Name: 7.7.3-2.js diff --git a/js/src/tests/ecma/LexicalConventions/7.7.3.js b/js/src/tests/ecma/LexicalConventions/7.7.3.js index 9ccb9127522a..f6666b184a96 100644 --- a/js/src/tests/ecma/LexicalConventions/7.7.3.js +++ b/js/src/tests/ecma/LexicalConventions/7.7.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.7.3.js'; /** File Name: 7.7.3.js diff --git a/js/src/tests/ecma/LexicalConventions/7.7.4.js b/js/src/tests/ecma/LexicalConventions/7.7.4.js index 015a3852209d..ccb667a3591c 100644 --- a/js/src/tests/ecma/LexicalConventions/7.7.4.js +++ b/js/src/tests/ecma/LexicalConventions/7.7.4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.7.4.js'; /** File Name: 7.7.4.js diff --git a/js/src/tests/ecma/LexicalConventions/7.8.2-n.js b/js/src/tests/ecma/LexicalConventions/7.8.2-n.js index b8d844e41d21..9444b1724f5e 100644 --- a/js/src/tests/ecma/LexicalConventions/7.8.2-n.js +++ b/js/src/tests/ecma/LexicalConventions/7.8.2-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '7.8.2-n.js'; /** File Name: 7.8.2.js diff --git a/js/src/tests/ecma/LexicalConventions/shell.js b/js/src/tests/ecma/LexicalConventions/shell.js index 4e1d61d68af6..e69de29bb2d1 100644 --- a/js/src/tests/ecma/LexicalConventions/shell.js +++ b/js/src/tests/ecma/LexicalConventions/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'LexicalConventions'; diff --git a/js/src/tests/ecma/Math/15.8-2-n.js b/js/src/tests/ecma/Math/15.8-2-n.js index 40c2ae8d2deb..f9d7914e5ef5 100644 --- a/js/src/tests/ecma/Math/15.8-2-n.js +++ b/js/src/tests/ecma/Math/15.8-2-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8-2-n.js'; /** File Name: 15.8-2.js diff --git a/js/src/tests/ecma/Math/15.8-3-n.js b/js/src/tests/ecma/Math/15.8-3-n.js index f6333d7ec732..83b9436252f3 100644 --- a/js/src/tests/ecma/Math/15.8-3-n.js +++ b/js/src/tests/ecma/Math/15.8-3-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8-3-n.js'; /** File Name: 15.8-3.js diff --git a/js/src/tests/ecma/Math/15.8.1.1-1.js b/js/src/tests/ecma/Math/15.8.1.1-1.js index f90f74b9e8b6..4f53b0c04983 100644 --- a/js/src/tests/ecma/Math/15.8.1.1-1.js +++ b/js/src/tests/ecma/Math/15.8.1.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.1.1-1.js'; /** File Name: 15.8.1.1-1.js diff --git a/js/src/tests/ecma/Math/15.8.1.1-2.js b/js/src/tests/ecma/Math/15.8.1.1-2.js index 9f136f2fb81a..db3d2cb62cbd 100644 --- a/js/src/tests/ecma/Math/15.8.1.1-2.js +++ b/js/src/tests/ecma/Math/15.8.1.1-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.1.1-2.js'; /** File Name: 15.8.1.1-2.js diff --git a/js/src/tests/ecma/Math/15.8.1.2-1.js b/js/src/tests/ecma/Math/15.8.1.2-1.js index 0cbc65a4fbdf..26a2e34e3382 100644 --- a/js/src/tests/ecma/Math/15.8.1.2-1.js +++ b/js/src/tests/ecma/Math/15.8.1.2-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.1.2-1.js'; /** File Name: 15.8.1.2-1.js diff --git a/js/src/tests/ecma/Math/15.8.1.2-2.js b/js/src/tests/ecma/Math/15.8.1.2-2.js index 6937b3520bc5..0ab9cb9c2be0 100644 --- a/js/src/tests/ecma/Math/15.8.1.2-2.js +++ b/js/src/tests/ecma/Math/15.8.1.2-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.1.2-2.js'; /** File Name: 15.8.1.2-1.js diff --git a/js/src/tests/ecma/Math/15.8.1.3-1.js b/js/src/tests/ecma/Math/15.8.1.3-1.js index 8289cc2a4689..d3fa65133571 100644 --- a/js/src/tests/ecma/Math/15.8.1.3-1.js +++ b/js/src/tests/ecma/Math/15.8.1.3-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.1.3-1.js'; /** File Name: 15.8.1.3-1.js diff --git a/js/src/tests/ecma/Math/15.8.1.3-2.js b/js/src/tests/ecma/Math/15.8.1.3-2.js index 24a8b182312b..c07d289dc3ba 100644 --- a/js/src/tests/ecma/Math/15.8.1.3-2.js +++ b/js/src/tests/ecma/Math/15.8.1.3-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.1.3-2.js'; /** File Name: 15.8.1.3-3.js diff --git a/js/src/tests/ecma/Math/15.8.1.4-1.js b/js/src/tests/ecma/Math/15.8.1.4-1.js index 227dbb3e2a4f..334cca1b9de8 100644 --- a/js/src/tests/ecma/Math/15.8.1.4-1.js +++ b/js/src/tests/ecma/Math/15.8.1.4-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.1.4-1.js'; /** File Name: 15.8.1.4-1.js diff --git a/js/src/tests/ecma/Math/15.8.1.4-2.js b/js/src/tests/ecma/Math/15.8.1.4-2.js index c9aa98e77a79..e362e520f256 100644 --- a/js/src/tests/ecma/Math/15.8.1.4-2.js +++ b/js/src/tests/ecma/Math/15.8.1.4-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.1.4-2.js'; /** File Name: 15.8.1.4-2.js diff --git a/js/src/tests/ecma/Math/15.8.1.5-1.js b/js/src/tests/ecma/Math/15.8.1.5-1.js index b753025c8a5c..562bb855ba27 100644 --- a/js/src/tests/ecma/Math/15.8.1.5-1.js +++ b/js/src/tests/ecma/Math/15.8.1.5-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.1.5-1.js'; /** File Name: 15.8.1.5-1.js diff --git a/js/src/tests/ecma/Math/15.8.1.5-2.js b/js/src/tests/ecma/Math/15.8.1.5-2.js index c134e4a57705..0cfcd6fe3ad0 100644 --- a/js/src/tests/ecma/Math/15.8.1.5-2.js +++ b/js/src/tests/ecma/Math/15.8.1.5-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.1.5-2.js'; /** File Name: 15.8.1.5-2.js diff --git a/js/src/tests/ecma/Math/15.8.1.6-1.js b/js/src/tests/ecma/Math/15.8.1.6-1.js index f2a395618c4a..cfa194dc2b59 100644 --- a/js/src/tests/ecma/Math/15.8.1.6-1.js +++ b/js/src/tests/ecma/Math/15.8.1.6-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.1.6-1.js'; /** File Name: 15.8.1.6-1.js diff --git a/js/src/tests/ecma/Math/15.8.1.6-2.js b/js/src/tests/ecma/Math/15.8.1.6-2.js index ba53e78de5c0..16674def723e 100644 --- a/js/src/tests/ecma/Math/15.8.1.6-2.js +++ b/js/src/tests/ecma/Math/15.8.1.6-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.1.6-2.js'; /** File Name: 15.8.1.6-2.js diff --git a/js/src/tests/ecma/Math/15.8.1.7-1.js b/js/src/tests/ecma/Math/15.8.1.7-1.js index aa60aead5b9b..05f72646ce5f 100644 --- a/js/src/tests/ecma/Math/15.8.1.7-1.js +++ b/js/src/tests/ecma/Math/15.8.1.7-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.1.7-1.js'; /** File Name: 15.8.1.7-1.js diff --git a/js/src/tests/ecma/Math/15.8.1.7-2.js b/js/src/tests/ecma/Math/15.8.1.7-2.js index 2f8c45c9f9bb..816c21fcae18 100644 --- a/js/src/tests/ecma/Math/15.8.1.7-2.js +++ b/js/src/tests/ecma/Math/15.8.1.7-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.1.7-2.js'; /** File Name: 15.8.1.7-2.js diff --git a/js/src/tests/ecma/Math/15.8.1.8-1.js b/js/src/tests/ecma/Math/15.8.1.8-1.js index 3c5764d0194e..372030e7b583 100644 --- a/js/src/tests/ecma/Math/15.8.1.8-1.js +++ b/js/src/tests/ecma/Math/15.8.1.8-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.1.8-1.js'; /** File Name: 15.8.1.8-1.js diff --git a/js/src/tests/ecma/Math/15.8.1.8-2.js b/js/src/tests/ecma/Math/15.8.1.8-2.js index f999dac920a3..40978626dce5 100644 --- a/js/src/tests/ecma/Math/15.8.1.8-2.js +++ b/js/src/tests/ecma/Math/15.8.1.8-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.1.8-2.js'; /** File Name: 15.8.1.8-2.js diff --git a/js/src/tests/ecma/Math/15.8.1.8-3.js b/js/src/tests/ecma/Math/15.8.1.8-3.js index 0c823aea572f..c04e4d7769b8 100644 --- a/js/src/tests/ecma/Math/15.8.1.8-3.js +++ b/js/src/tests/ecma/Math/15.8.1.8-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.1.8-3.js'; /** File Name: 15.8.1.8-3.js diff --git a/js/src/tests/ecma/Math/15.8.1.js b/js/src/tests/ecma/Math/15.8.1.js index 009325640bb0..6712c895a544 100644 --- a/js/src/tests/ecma/Math/15.8.1.js +++ b/js/src/tests/ecma/Math/15.8.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.1.js'; /** File Name: 15.8.1.js diff --git a/js/src/tests/ecma/Math/15.8.2.1.js b/js/src/tests/ecma/Math/15.8.2.1.js index 0412742767a8..b362735a5d00 100644 --- a/js/src/tests/ecma/Math/15.8.2.1.js +++ b/js/src/tests/ecma/Math/15.8.2.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.2.1.js'; /** File Name: 15.8.2.1.js diff --git a/js/src/tests/ecma/Math/15.8.2.10.js b/js/src/tests/ecma/Math/15.8.2.10.js index 05d4c187c99d..87d8b841c885 100644 --- a/js/src/tests/ecma/Math/15.8.2.10.js +++ b/js/src/tests/ecma/Math/15.8.2.10.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.2.10.js'; /** File Name: 15.8.2.10.js diff --git a/js/src/tests/ecma/Math/15.8.2.11.js b/js/src/tests/ecma/Math/15.8.2.11.js index 5a957b3de43c..2abdb71a9900 100644 --- a/js/src/tests/ecma/Math/15.8.2.11.js +++ b/js/src/tests/ecma/Math/15.8.2.11.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.2.11.js'; /** File Name: 15.8.2.11.js diff --git a/js/src/tests/ecma/Math/15.8.2.12.js b/js/src/tests/ecma/Math/15.8.2.12.js index a33a5aca4a06..1014b7eb2664 100644 --- a/js/src/tests/ecma/Math/15.8.2.12.js +++ b/js/src/tests/ecma/Math/15.8.2.12.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.2.12.js'; /** File Name: 15.8.2.12.js diff --git a/js/src/tests/ecma/Math/15.8.2.13.js b/js/src/tests/ecma/Math/15.8.2.13.js index 341b3e765169..2382a85f899b 100644 --- a/js/src/tests/ecma/Math/15.8.2.13.js +++ b/js/src/tests/ecma/Math/15.8.2.13.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.2.13.js'; /** File Name: 15.8.2.13.js diff --git a/js/src/tests/ecma/Math/15.8.2.14.js b/js/src/tests/ecma/Math/15.8.2.14.js index 1972518c81dc..f4bac7c6f2cc 100644 --- a/js/src/tests/ecma/Math/15.8.2.14.js +++ b/js/src/tests/ecma/Math/15.8.2.14.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.2.14.js'; /** File Name: 15.8.2.14.js diff --git a/js/src/tests/ecma/Math/15.8.2.15.js b/js/src/tests/ecma/Math/15.8.2.15.js index a5c36b4e6119..5a0f3ea30730 100644 --- a/js/src/tests/ecma/Math/15.8.2.15.js +++ b/js/src/tests/ecma/Math/15.8.2.15.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.2.15.js'; /** File Name: 15.8.2.15.js diff --git a/js/src/tests/ecma/Math/15.8.2.16.js b/js/src/tests/ecma/Math/15.8.2.16.js index deb873cdaab0..20b2e03a66b8 100644 --- a/js/src/tests/ecma/Math/15.8.2.16.js +++ b/js/src/tests/ecma/Math/15.8.2.16.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.2.16.js'; /** File Name: 15.8.2.16.js diff --git a/js/src/tests/ecma/Math/15.8.2.17.js b/js/src/tests/ecma/Math/15.8.2.17.js index 2f12f1d93bfb..87b9d92f9143 100644 --- a/js/src/tests/ecma/Math/15.8.2.17.js +++ b/js/src/tests/ecma/Math/15.8.2.17.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.2.17.js'; /** File Name: 15.8.2.17.js diff --git a/js/src/tests/ecma/Math/15.8.2.18.js b/js/src/tests/ecma/Math/15.8.2.18.js index be68ea191fb1..7ac2ee96b6f2 100644 --- a/js/src/tests/ecma/Math/15.8.2.18.js +++ b/js/src/tests/ecma/Math/15.8.2.18.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.2.18.js'; /** File Name: 15.8.2.18.js diff --git a/js/src/tests/ecma/Math/15.8.2.2.js b/js/src/tests/ecma/Math/15.8.2.2.js index 9dba4a318388..e7ca83252356 100644 --- a/js/src/tests/ecma/Math/15.8.2.2.js +++ b/js/src/tests/ecma/Math/15.8.2.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.2.2.js'; /** File Name: 15.8.2.2.js diff --git a/js/src/tests/ecma/Math/15.8.2.3.js b/js/src/tests/ecma/Math/15.8.2.3.js index 11c6d7365700..c6480c48cbba 100644 --- a/js/src/tests/ecma/Math/15.8.2.3.js +++ b/js/src/tests/ecma/Math/15.8.2.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.2.3.js'; /** File Name: 15.8.2.3.js diff --git a/js/src/tests/ecma/Math/15.8.2.4.js b/js/src/tests/ecma/Math/15.8.2.4.js index c67ac6d4ea55..badf5c0b0530 100644 --- a/js/src/tests/ecma/Math/15.8.2.4.js +++ b/js/src/tests/ecma/Math/15.8.2.4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.2.4.js'; /** File Name: 15.8.2.4.js diff --git a/js/src/tests/ecma/Math/15.8.2.5.js b/js/src/tests/ecma/Math/15.8.2.5.js index 0adc6907433c..e0242c12912f 100644 --- a/js/src/tests/ecma/Math/15.8.2.5.js +++ b/js/src/tests/ecma/Math/15.8.2.5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.2.5.js'; /** File Name: 15.8.2.5.js diff --git a/js/src/tests/ecma/Math/15.8.2.6.js b/js/src/tests/ecma/Math/15.8.2.6.js index 1c20a1c93e0a..41c67bf6ef2f 100644 --- a/js/src/tests/ecma/Math/15.8.2.6.js +++ b/js/src/tests/ecma/Math/15.8.2.6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.2.6.js'; /** File Name: 15.8.2.6.js diff --git a/js/src/tests/ecma/Math/15.8.2.7.js b/js/src/tests/ecma/Math/15.8.2.7.js index 2b19b5986e34..66a8ca613789 100644 --- a/js/src/tests/ecma/Math/15.8.2.7.js +++ b/js/src/tests/ecma/Math/15.8.2.7.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.2.7.js'; /** File Name: 15.8.2.7.js diff --git a/js/src/tests/ecma/Math/15.8.2.8.js b/js/src/tests/ecma/Math/15.8.2.8.js index 96b6231da281..09b39c8ee035 100644 --- a/js/src/tests/ecma/Math/15.8.2.8.js +++ b/js/src/tests/ecma/Math/15.8.2.8.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.2.8.js'; /** File Name: 15.8.2.8.js diff --git a/js/src/tests/ecma/Math/15.8.2.9.js b/js/src/tests/ecma/Math/15.8.2.9.js index b68a57d5bbb4..4f0b66c52c90 100644 --- a/js/src/tests/ecma/Math/15.8.2.9.js +++ b/js/src/tests/ecma/Math/15.8.2.9.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8.2.9.js'; /** File Name: 15.8.2.9.js diff --git a/js/src/tests/ecma/Math/shell.js b/js/src/tests/ecma/Math/shell.js index fbcc5c3f9209..e69de29bb2d1 100644 --- a/js/src/tests/ecma/Math/shell.js +++ b/js/src/tests/ecma/Math/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Math'; diff --git a/js/src/tests/ecma/NativeObjects/shell.js b/js/src/tests/ecma/NativeObjects/shell.js index 4ddb940f71bb..e69de29bb2d1 100644 --- a/js/src/tests/ecma/NativeObjects/shell.js +++ b/js/src/tests/ecma/NativeObjects/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'NativeObjects'; diff --git a/js/src/tests/ecma/Number/0x-without-following-hexdigits.js b/js/src/tests/ecma/Number/0x-without-following-hexdigits.js index aed484f2a89e..ffb329e5c882 100644 --- a/js/src/tests/ecma/Number/0x-without-following-hexdigits.js +++ b/js/src/tests/ecma/Number/0x-without-following-hexdigits.js @@ -1,7 +1,6 @@ // Any copyright is dedicated to the Public Domain. // http://creativecommons.org/licenses/publicdomain/ -var gTestfile = '0x-without-following-hexdigits.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 582643; var summary = "'0x' not followed by hex digits should be a syntax error"; diff --git a/js/src/tests/ecma/Number/15.7.1.js b/js/src/tests/ecma/Number/15.7.1.js index 34cec9f378f3..f359ad04af4f 100644 --- a/js/src/tests/ecma/Number/15.7.1.js +++ b/js/src/tests/ecma/Number/15.7.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.1.js'; /** File Name: 15.7.1.js @@ -50,7 +49,7 @@ gTestfile = '15.7.1.js'; computed by ToNumber( value ) 15.7.1.2 Number() returns 0. - need to add more test cases. see the gTestcases for + need to add more test cases. see the testcases for TypeConversion ToNumber. Author: christine@netscape.com diff --git a/js/src/tests/ecma/Number/15.7.2.js b/js/src/tests/ecma/Number/15.7.2.js index 4c2c8a298c47..ae09994b1ff5 100644 --- a/js/src/tests/ecma/Number/15.7.2.js +++ b/js/src/tests/ecma/Number/15.7.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.2.js'; /** File Name: 15.7.2.js @@ -58,7 +57,7 @@ gTestfile = '15.7.2.js'; 15.7.2.2 new Number(). same as in 15.7.2.1, except the [[Value]] property is set to +0. - need to add more test cases. see the gTestcases for + need to add more test cases. see the testcases for TypeConversion ToNumber. Author: christine@netscape.com diff --git a/js/src/tests/ecma/Number/15.7.3.1-1.js b/js/src/tests/ecma/Number/15.7.3.1-1.js index d275f50a1230..be7abe9abb5f 100644 --- a/js/src/tests/ecma/Number/15.7.3.1-1.js +++ b/js/src/tests/ecma/Number/15.7.3.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.1-1.js'; /** File Name: 15.7.3.1-2.js diff --git a/js/src/tests/ecma/Number/15.7.3.1-2.js b/js/src/tests/ecma/Number/15.7.3.1-2.js index ff26a03e63fa..9afd4d114783 100644 --- a/js/src/tests/ecma/Number/15.7.3.1-2.js +++ b/js/src/tests/ecma/Number/15.7.3.1-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.1-2.js'; /** File Name: 15.7.3.1-2.js diff --git a/js/src/tests/ecma/Number/15.7.3.1-3.js b/js/src/tests/ecma/Number/15.7.3.1-3.js index 4669e969a7b5..148c8924fd5d 100644 --- a/js/src/tests/ecma/Number/15.7.3.1-3.js +++ b/js/src/tests/ecma/Number/15.7.3.1-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.1-3.js'; /** File Name: 15.7.3.1-4.js diff --git a/js/src/tests/ecma/Number/15.7.3.2-1.js b/js/src/tests/ecma/Number/15.7.3.2-1.js index 35ff1b25c3a7..efef0d73e4c8 100644 --- a/js/src/tests/ecma/Number/15.7.3.2-1.js +++ b/js/src/tests/ecma/Number/15.7.3.2-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.2-1.js'; /** File Name: 15.7.3.2-1.js diff --git a/js/src/tests/ecma/Number/15.7.3.2-2.js b/js/src/tests/ecma/Number/15.7.3.2-2.js index 980b688bb612..d243bd26fe3b 100644 --- a/js/src/tests/ecma/Number/15.7.3.2-2.js +++ b/js/src/tests/ecma/Number/15.7.3.2-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.2-2.js'; /** File Name: 15.7.3.2-2.js diff --git a/js/src/tests/ecma/Number/15.7.3.2-3.js b/js/src/tests/ecma/Number/15.7.3.2-3.js index 2f20efe2a84a..581fefc83597 100644 --- a/js/src/tests/ecma/Number/15.7.3.2-3.js +++ b/js/src/tests/ecma/Number/15.7.3.2-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.2-3.js'; /** File Name: 15.7.3.2-3.js diff --git a/js/src/tests/ecma/Number/15.7.3.2-4.js b/js/src/tests/ecma/Number/15.7.3.2-4.js index 04d70ce3a968..1f28d670bd98 100644 --- a/js/src/tests/ecma/Number/15.7.3.2-4.js +++ b/js/src/tests/ecma/Number/15.7.3.2-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.2-4.js'; /** File Name: 15.7.3.2-4.js diff --git a/js/src/tests/ecma/Number/15.7.3.3-1.js b/js/src/tests/ecma/Number/15.7.3.3-1.js index ed7f0e88a97f..a6a08adba8ee 100644 --- a/js/src/tests/ecma/Number/15.7.3.3-1.js +++ b/js/src/tests/ecma/Number/15.7.3.3-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.3-1.js'; /** File Name: 15.7.3.3-1.js diff --git a/js/src/tests/ecma/Number/15.7.3.3-2.js b/js/src/tests/ecma/Number/15.7.3.3-2.js index 2b73147c2af5..3758ab038a19 100644 --- a/js/src/tests/ecma/Number/15.7.3.3-2.js +++ b/js/src/tests/ecma/Number/15.7.3.3-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.3-2.js'; /** File Name: 15.7.3.3-2.js diff --git a/js/src/tests/ecma/Number/15.7.3.3-3.js b/js/src/tests/ecma/Number/15.7.3.3-3.js index d0c98282dde5..71c7216b6e28 100644 --- a/js/src/tests/ecma/Number/15.7.3.3-3.js +++ b/js/src/tests/ecma/Number/15.7.3.3-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.3-3.js'; /** File Name: 15.7.3.3-3.js diff --git a/js/src/tests/ecma/Number/15.7.3.3-4.js b/js/src/tests/ecma/Number/15.7.3.3-4.js index e9427c62f2dd..631f8c355661 100644 --- a/js/src/tests/ecma/Number/15.7.3.3-4.js +++ b/js/src/tests/ecma/Number/15.7.3.3-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.3-4.js'; /** File Name: 15.7.3.3-4.js diff --git a/js/src/tests/ecma/Number/15.7.3.4-1.js b/js/src/tests/ecma/Number/15.7.3.4-1.js index 6a6835f04da6..224c225cb92f 100644 --- a/js/src/tests/ecma/Number/15.7.3.4-1.js +++ b/js/src/tests/ecma/Number/15.7.3.4-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.4-1.js'; /** File Name: 15.7.3.4-1.js diff --git a/js/src/tests/ecma/Number/15.7.3.4-2.js b/js/src/tests/ecma/Number/15.7.3.4-2.js index fd1e630d54f3..3b21144f2144 100644 --- a/js/src/tests/ecma/Number/15.7.3.4-2.js +++ b/js/src/tests/ecma/Number/15.7.3.4-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.4-2.js'; /** File Name: 15.7.3.4-2.js diff --git a/js/src/tests/ecma/Number/15.7.3.4-3.js b/js/src/tests/ecma/Number/15.7.3.4-3.js index 6cf1072e2001..691ca4a6886a 100644 --- a/js/src/tests/ecma/Number/15.7.3.4-3.js +++ b/js/src/tests/ecma/Number/15.7.3.4-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.4-3.js'; /** File Name: 15.7.3.4-3.js diff --git a/js/src/tests/ecma/Number/15.7.3.4-4.js b/js/src/tests/ecma/Number/15.7.3.4-4.js index 3e1db5b9d2a5..768b3d39508f 100644 --- a/js/src/tests/ecma/Number/15.7.3.4-4.js +++ b/js/src/tests/ecma/Number/15.7.3.4-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.4-4.js'; /** File Name: 15.7.3.4-4.js diff --git a/js/src/tests/ecma/Number/15.7.3.5-1.js b/js/src/tests/ecma/Number/15.7.3.5-1.js index 8bcb3e378212..de6ad1df7cac 100644 --- a/js/src/tests/ecma/Number/15.7.3.5-1.js +++ b/js/src/tests/ecma/Number/15.7.3.5-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.5-1.js'; /** File Name: 15.7.3.5-1.js diff --git a/js/src/tests/ecma/Number/15.7.3.5-2.js b/js/src/tests/ecma/Number/15.7.3.5-2.js index e0c2c440ac6b..2a8a31054af1 100644 --- a/js/src/tests/ecma/Number/15.7.3.5-2.js +++ b/js/src/tests/ecma/Number/15.7.3.5-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.5-2.js'; /** File Name: 15.7.3.5-2.js diff --git a/js/src/tests/ecma/Number/15.7.3.5-3.js b/js/src/tests/ecma/Number/15.7.3.5-3.js index 983cdd314743..4b305b30277a 100644 --- a/js/src/tests/ecma/Number/15.7.3.5-3.js +++ b/js/src/tests/ecma/Number/15.7.3.5-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.5-3.js'; /** File Name: 15.7.3.5-3.js diff --git a/js/src/tests/ecma/Number/15.7.3.5-4.js b/js/src/tests/ecma/Number/15.7.3.5-4.js index acf7b0f543b9..d35e8114922f 100644 --- a/js/src/tests/ecma/Number/15.7.3.5-4.js +++ b/js/src/tests/ecma/Number/15.7.3.5-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.5-4.js'; /** File Name: 15.7.3.5-4.js diff --git a/js/src/tests/ecma/Number/15.7.3.6-1.js b/js/src/tests/ecma/Number/15.7.3.6-1.js index 466267f7d421..e48340719316 100644 --- a/js/src/tests/ecma/Number/15.7.3.6-1.js +++ b/js/src/tests/ecma/Number/15.7.3.6-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.6-1.js'; /** File Name: 15.7.3.6-1.js diff --git a/js/src/tests/ecma/Number/15.7.3.6-2.js b/js/src/tests/ecma/Number/15.7.3.6-2.js index c3e6dbd0fb77..802d171706c9 100644 --- a/js/src/tests/ecma/Number/15.7.3.6-2.js +++ b/js/src/tests/ecma/Number/15.7.3.6-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.6-2.js'; /** File Name: 15.7.3.6-2.js diff --git a/js/src/tests/ecma/Number/15.7.3.6-3.js b/js/src/tests/ecma/Number/15.7.3.6-3.js index 6055f49374ca..bb54d637101b 100644 --- a/js/src/tests/ecma/Number/15.7.3.6-3.js +++ b/js/src/tests/ecma/Number/15.7.3.6-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.6-3.js'; /** File Name: 15.7.3.6-3.js diff --git a/js/src/tests/ecma/Number/15.7.3.6-4.js b/js/src/tests/ecma/Number/15.7.3.6-4.js index 75fa6ee485d7..1b006bcd109a 100644 --- a/js/src/tests/ecma/Number/15.7.3.6-4.js +++ b/js/src/tests/ecma/Number/15.7.3.6-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.6-4.js'; /** File Name: 15.7.3.6-4.js diff --git a/js/src/tests/ecma/Number/15.7.3.js b/js/src/tests/ecma/Number/15.7.3.js index bc5e7a3fa130..a5af05f4ad5e 100644 --- a/js/src/tests/ecma/Number/15.7.3.js +++ b/js/src/tests/ecma/Number/15.7.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.js'; /** File Name: 15.7.3.js diff --git a/js/src/tests/ecma/Number/15.7.4-1.js b/js/src/tests/ecma/Number/15.7.4-1.js index 175835987a2c..317467d23a5b 100644 --- a/js/src/tests/ecma/Number/15.7.4-1.js +++ b/js/src/tests/ecma/Number/15.7.4-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.4-1.js'; /** File Name: 15.7.4-1.js diff --git a/js/src/tests/ecma/Number/15.7.4.1.js b/js/src/tests/ecma/Number/15.7.4.1.js index 27c0a0a9e4fb..dcf6b68a5bc2 100644 --- a/js/src/tests/ecma/Number/15.7.4.1.js +++ b/js/src/tests/ecma/Number/15.7.4.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.4.1.js'; /** File Name: 15.7.4.1.js diff --git a/js/src/tests/ecma/Number/15.7.4.2-1.js b/js/src/tests/ecma/Number/15.7.4.2-1.js index 531876d98032..4b40671286f1 100644 --- a/js/src/tests/ecma/Number/15.7.4.2-1.js +++ b/js/src/tests/ecma/Number/15.7.4.2-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.4.2-1.js'; /** File Name: 15.7.4.2.js diff --git a/js/src/tests/ecma/Number/15.7.4.2-2-n.js b/js/src/tests/ecma/Number/15.7.4.2-2-n.js index a99b1deb4562..d9390e694307 100644 --- a/js/src/tests/ecma/Number/15.7.4.2-2-n.js +++ b/js/src/tests/ecma/Number/15.7.4.2-2-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.4.2-2-n.js'; /** File Name: 15.7.4.2-2-n.js diff --git a/js/src/tests/ecma/Number/15.7.4.2-3-n.js b/js/src/tests/ecma/Number/15.7.4.2-3-n.js index f6148db1cc9b..70b4171c7c6e 100644 --- a/js/src/tests/ecma/Number/15.7.4.2-3-n.js +++ b/js/src/tests/ecma/Number/15.7.4.2-3-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.4.2-3-n.js'; /** File Name: 15.7.4.2-3-n.js diff --git a/js/src/tests/ecma/Number/15.7.4.2-4.js b/js/src/tests/ecma/Number/15.7.4.2-4.js index c2fd40dd17e1..b3d0b3a965a8 100644 --- a/js/src/tests/ecma/Number/15.7.4.2-4.js +++ b/js/src/tests/ecma/Number/15.7.4.2-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.4.2-4.js'; /** File Name: 15.7.4.2-4.js diff --git a/js/src/tests/ecma/Number/15.7.4.3-1.js b/js/src/tests/ecma/Number/15.7.4.3-1.js index 755e2281b390..347311b99c5f 100644 --- a/js/src/tests/ecma/Number/15.7.4.3-1.js +++ b/js/src/tests/ecma/Number/15.7.4.3-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.4.3-1.js'; /** File Name: 15.7.4.3-1.js diff --git a/js/src/tests/ecma/Number/15.7.4.3-2.js b/js/src/tests/ecma/Number/15.7.4.3-2.js index 1bfed1d4aff4..ddbb033822fd 100644 --- a/js/src/tests/ecma/Number/15.7.4.3-2.js +++ b/js/src/tests/ecma/Number/15.7.4.3-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.4.3-2.js'; /** File Name: 15.7.4.3-2.js diff --git a/js/src/tests/ecma/Number/15.7.4.3-3-n.js b/js/src/tests/ecma/Number/15.7.4.3-3-n.js index 7df413ae48c2..84c7bfba5fe3 100644 --- a/js/src/tests/ecma/Number/15.7.4.3-3-n.js +++ b/js/src/tests/ecma/Number/15.7.4.3-3-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.4.3-3-n.js'; /** File Name: 15.7.4.3-3.js diff --git a/js/src/tests/ecma/Number/shell.js b/js/src/tests/ecma/Number/shell.js index 03cca1d55122..e69de29bb2d1 100644 --- a/js/src/tests/ecma/Number/shell.js +++ b/js/src/tests/ecma/Number/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Number'; diff --git a/js/src/tests/ecma/ObjectObjects/15.2.1.1.js b/js/src/tests/ecma/ObjectObjects/15.2.1.1.js index 73ddd2894cd8..667a537beca7 100644 --- a/js/src/tests/ecma/ObjectObjects/15.2.1.1.js +++ b/js/src/tests/ecma/ObjectObjects/15.2.1.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.2.1.1.js'; /** File Name: 15.2.1.1.js diff --git a/js/src/tests/ecma/ObjectObjects/15.2.1.2.js b/js/src/tests/ecma/ObjectObjects/15.2.1.2.js index 9e4159443045..bbe44f514781 100644 --- a/js/src/tests/ecma/ObjectObjects/15.2.1.2.js +++ b/js/src/tests/ecma/ObjectObjects/15.2.1.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.2.1.2.js'; /** File Name: 15.2.1.2.js diff --git a/js/src/tests/ecma/ObjectObjects/15.2.2.1.js b/js/src/tests/ecma/ObjectObjects/15.2.2.1.js index dfdfaeb4ab63..2c41d98ffe9d 100644 --- a/js/src/tests/ecma/ObjectObjects/15.2.2.1.js +++ b/js/src/tests/ecma/ObjectObjects/15.2.2.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.2.2.1.js'; /** File Name: 15.2.2.1.js diff --git a/js/src/tests/ecma/ObjectObjects/15.2.2.2.js b/js/src/tests/ecma/ObjectObjects/15.2.2.2.js index 2a5743a8261e..f5f1350a1b67 100644 --- a/js/src/tests/ecma/ObjectObjects/15.2.2.2.js +++ b/js/src/tests/ecma/ObjectObjects/15.2.2.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.2.2.2.js'; /** File Name: 15.2.2.2.js diff --git a/js/src/tests/ecma/ObjectObjects/15.2.3-1.js b/js/src/tests/ecma/ObjectObjects/15.2.3-1.js index 5242d7e6a584..182230940c2f 100644 --- a/js/src/tests/ecma/ObjectObjects/15.2.3-1.js +++ b/js/src/tests/ecma/ObjectObjects/15.2.3-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.2.3-1.js'; /** File Name: 15.2.3-1.js diff --git a/js/src/tests/ecma/ObjectObjects/15.2.3.1-1.js b/js/src/tests/ecma/ObjectObjects/15.2.3.1-1.js index 39510b6b22e6..1d6636d9583f 100644 --- a/js/src/tests/ecma/ObjectObjects/15.2.3.1-1.js +++ b/js/src/tests/ecma/ObjectObjects/15.2.3.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.2.3.1-1.js'; /** File Name: 15.2.3.1-1.js diff --git a/js/src/tests/ecma/ObjectObjects/15.2.3.1-2.js b/js/src/tests/ecma/ObjectObjects/15.2.3.1-2.js index a92739f2d11d..c5f0da68be73 100644 --- a/js/src/tests/ecma/ObjectObjects/15.2.3.1-2.js +++ b/js/src/tests/ecma/ObjectObjects/15.2.3.1-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.2.3.1-2.js'; /** File Name: 15.2.3.1-2.js diff --git a/js/src/tests/ecma/ObjectObjects/15.2.3.1-3.js b/js/src/tests/ecma/ObjectObjects/15.2.3.1-3.js index 0a82c6cd027f..a9ad571f9cf4 100644 --- a/js/src/tests/ecma/ObjectObjects/15.2.3.1-3.js +++ b/js/src/tests/ecma/ObjectObjects/15.2.3.1-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.2.3.1-3.js'; /** File Name: 15.2.3.1-3.js diff --git a/js/src/tests/ecma/ObjectObjects/15.2.3.1-4.js b/js/src/tests/ecma/ObjectObjects/15.2.3.1-4.js index 86be98e1adb3..44cae0cc8173 100644 --- a/js/src/tests/ecma/ObjectObjects/15.2.3.1-4.js +++ b/js/src/tests/ecma/ObjectObjects/15.2.3.1-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.2.3.1-4.js'; /** File Name: 15.2.3.1-4.js diff --git a/js/src/tests/ecma/ObjectObjects/15.2.3.js b/js/src/tests/ecma/ObjectObjects/15.2.3.js index 70a9605c2ec4..4e501366ef0c 100644 --- a/js/src/tests/ecma/ObjectObjects/15.2.3.js +++ b/js/src/tests/ecma/ObjectObjects/15.2.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.2.3.js'; /** File Name: 15.2.3.js diff --git a/js/src/tests/ecma/ObjectObjects/15.2.4.1.js b/js/src/tests/ecma/ObjectObjects/15.2.4.1.js index bff668f43c34..a5ccc6652cfd 100644 --- a/js/src/tests/ecma/ObjectObjects/15.2.4.1.js +++ b/js/src/tests/ecma/ObjectObjects/15.2.4.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.2.4.1.js'; /** File Name: 15.2.4.1.js diff --git a/js/src/tests/ecma/ObjectObjects/15.2.4.2.js b/js/src/tests/ecma/ObjectObjects/15.2.4.2.js index c52a825bb85f..25a79a13de5b 100644 --- a/js/src/tests/ecma/ObjectObjects/15.2.4.2.js +++ b/js/src/tests/ecma/ObjectObjects/15.2.4.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.2.4.2.js'; /** File Name: 15.2.4.2.js diff --git a/js/src/tests/ecma/ObjectObjects/15.2.4.3.js b/js/src/tests/ecma/ObjectObjects/15.2.4.3.js index 17c455867965..92f46da944f0 100644 --- a/js/src/tests/ecma/ObjectObjects/15.2.4.3.js +++ b/js/src/tests/ecma/ObjectObjects/15.2.4.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.2.4.3.js'; /** File Name: 15.2.4.3.js diff --git a/js/src/tests/ecma/ObjectObjects/shell.js b/js/src/tests/ecma/ObjectObjects/shell.js index 1a7120796791..e69de29bb2d1 100644 --- a/js/src/tests/ecma/ObjectObjects/shell.js +++ b/js/src/tests/ecma/ObjectObjects/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'ObjectObjects'; diff --git a/js/src/tests/ecma/SourceText/6-1.js b/js/src/tests/ecma/SourceText/6-1.js index 487a47e3aaf7..08bf9d3be81e 100644 --- a/js/src/tests/ecma/SourceText/6-1.js +++ b/js/src/tests/ecma/SourceText/6-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '6-1.js'; /** File Name: 6-1.js diff --git a/js/src/tests/ecma/SourceText/6-2.js b/js/src/tests/ecma/SourceText/6-2.js index 404430805303..08436cb1f76e 100644 --- a/js/src/tests/ecma/SourceText/6-2.js +++ b/js/src/tests/ecma/SourceText/6-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '6-2.js'; /** File Name: 6-1.js diff --git a/js/src/tests/ecma/SourceText/shell.js b/js/src/tests/ecma/SourceText/shell.js index c8f9f0267183..e69de29bb2d1 100644 --- a/js/src/tests/ecma/SourceText/shell.js +++ b/js/src/tests/ecma/SourceText/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'SourceText'; diff --git a/js/src/tests/ecma/Statements/12.10-1.js b/js/src/tests/ecma/Statements/12.10-1.js index 7cb13789eb5f..9d80f293047f 100644 --- a/js/src/tests/ecma/Statements/12.10-1.js +++ b/js/src/tests/ecma/Statements/12.10-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.10-1.js'; /** File Name: 12.10-1.js diff --git a/js/src/tests/ecma/Statements/12.10.js b/js/src/tests/ecma/Statements/12.10.js index b8d27c64e992..eb22997405da 100644 --- a/js/src/tests/ecma/Statements/12.10.js +++ b/js/src/tests/ecma/Statements/12.10.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.10.js'; /** File Name: 12.10-1.js diff --git a/js/src/tests/ecma/Statements/12.2-1.js b/js/src/tests/ecma/Statements/12.2-1.js index d6f3b97f6d2a..e75fe5d3a88b 100644 --- a/js/src/tests/ecma/Statements/12.2-1.js +++ b/js/src/tests/ecma/Statements/12.2-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.2-1.js'; /** File Name: 12.2-1.js diff --git a/js/src/tests/ecma/Statements/12.5-1.js b/js/src/tests/ecma/Statements/12.5-1.js index 0745428c4acb..5627014a1d08 100644 --- a/js/src/tests/ecma/Statements/12.5-1.js +++ b/js/src/tests/ecma/Statements/12.5-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.5-1.js'; /** File Name: 12.5-1.js diff --git a/js/src/tests/ecma/Statements/12.5-2.js b/js/src/tests/ecma/Statements/12.5-2.js index 143edb070534..ffda5d767fbd 100644 --- a/js/src/tests/ecma/Statements/12.5-2.js +++ b/js/src/tests/ecma/Statements/12.5-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.5-2.js'; /** File Name: 12.5-2.js diff --git a/js/src/tests/ecma/Statements/12.6.1-1.js b/js/src/tests/ecma/Statements/12.6.1-1.js index 97b9afaa82fb..4cbf900d6c3a 100644 --- a/js/src/tests/ecma/Statements/12.6.1-1.js +++ b/js/src/tests/ecma/Statements/12.6.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.1-1.js'; /** File Name: 12.6.1-1.js diff --git a/js/src/tests/ecma/Statements/12.6.2-1.js b/js/src/tests/ecma/Statements/12.6.2-1.js index 2ef9378f5a5b..1ec75d76e412 100644 --- a/js/src/tests/ecma/Statements/12.6.2-1.js +++ b/js/src/tests/ecma/Statements/12.6.2-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.2-1.js'; /** File Name: 12.6.2-1.js diff --git a/js/src/tests/ecma/Statements/12.6.2-2.js b/js/src/tests/ecma/Statements/12.6.2-2.js index cc8676cd29a3..a70a1adda156 100644 --- a/js/src/tests/ecma/Statements/12.6.2-2.js +++ b/js/src/tests/ecma/Statements/12.6.2-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.2-2.js'; /** File Name: 12.6.2-2.js diff --git a/js/src/tests/ecma/Statements/12.6.2-3.js b/js/src/tests/ecma/Statements/12.6.2-3.js index a16b7aa18ef7..eb1f5e5db602 100644 --- a/js/src/tests/ecma/Statements/12.6.2-3.js +++ b/js/src/tests/ecma/Statements/12.6.2-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.2-3.js'; /** File Name: 12.6.2-3.js diff --git a/js/src/tests/ecma/Statements/12.6.2-4.js b/js/src/tests/ecma/Statements/12.6.2-4.js index 6b1500d3a493..b0ade5b3d50f 100644 --- a/js/src/tests/ecma/Statements/12.6.2-4.js +++ b/js/src/tests/ecma/Statements/12.6.2-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.2-4.js'; /** File Name: 12.6.2-4.js diff --git a/js/src/tests/ecma/Statements/12.6.2-5.js b/js/src/tests/ecma/Statements/12.6.2-5.js index a6f86ecc88bb..b9f8b7cfa754 100644 --- a/js/src/tests/ecma/Statements/12.6.2-5.js +++ b/js/src/tests/ecma/Statements/12.6.2-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.2-5.js'; /** File Name: 12.6.2-5.js diff --git a/js/src/tests/ecma/Statements/12.6.2-6.js b/js/src/tests/ecma/Statements/12.6.2-6.js index 48a4e2e607df..5ff42622ee6f 100644 --- a/js/src/tests/ecma/Statements/12.6.2-6.js +++ b/js/src/tests/ecma/Statements/12.6.2-6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.2-6.js'; /** File Name: 12.6.2-6.js diff --git a/js/src/tests/ecma/Statements/12.6.2-7.js b/js/src/tests/ecma/Statements/12.6.2-7.js index a14ced04972f..639f4c697ced 100644 --- a/js/src/tests/ecma/Statements/12.6.2-7.js +++ b/js/src/tests/ecma/Statements/12.6.2-7.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.2-7.js'; /** File Name: 12.6.2-7.js diff --git a/js/src/tests/ecma/Statements/12.6.2-8.js b/js/src/tests/ecma/Statements/12.6.2-8.js index 73d931d838f0..d0725bdf36b9 100644 --- a/js/src/tests/ecma/Statements/12.6.2-8.js +++ b/js/src/tests/ecma/Statements/12.6.2-8.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.2-8.js'; /** File Name: 12.6.2-8.js diff --git a/js/src/tests/ecma/Statements/12.6.2-9-n.js b/js/src/tests/ecma/Statements/12.6.2-9-n.js index 3e2f942a227c..21b78dd17428 100644 --- a/js/src/tests/ecma/Statements/12.6.2-9-n.js +++ b/js/src/tests/ecma/Statements/12.6.2-9-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.2-9-n.js'; /** File Name: 12.6.2-9-n.js diff --git a/js/src/tests/ecma/Statements/12.6.3-1.js b/js/src/tests/ecma/Statements/12.6.3-1.js index 6e23b84a48d8..08617208680c 100644 --- a/js/src/tests/ecma/Statements/12.6.3-1.js +++ b/js/src/tests/ecma/Statements/12.6.3-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.3-1.js'; /** File Name: 12.6.3-1.js diff --git a/js/src/tests/ecma/Statements/12.6.3-10.js b/js/src/tests/ecma/Statements/12.6.3-10.js index 0e74f14eceee..a57bc21c2290 100644 --- a/js/src/tests/ecma/Statements/12.6.3-10.js +++ b/js/src/tests/ecma/Statements/12.6.3-10.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.3-10.js'; /** File Name: 12.6.3-10.js diff --git a/js/src/tests/ecma/Statements/12.6.3-11.js b/js/src/tests/ecma/Statements/12.6.3-11.js index efc65ee14ed4..039392c17915 100644 --- a/js/src/tests/ecma/Statements/12.6.3-11.js +++ b/js/src/tests/ecma/Statements/12.6.3-11.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.3-11.js'; /** File Name: 12.6.3-11.js diff --git a/js/src/tests/ecma/Statements/12.6.3-12.js b/js/src/tests/ecma/Statements/12.6.3-12.js index 840ca9da6551..1c21110dc8c6 100644 --- a/js/src/tests/ecma/Statements/12.6.3-12.js +++ b/js/src/tests/ecma/Statements/12.6.3-12.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.3-12.js'; /** File Name: 12.6.3-12.js diff --git a/js/src/tests/ecma/Statements/12.6.3-19.js b/js/src/tests/ecma/Statements/12.6.3-19.js index 5acbee712799..0ad9822b381a 100644 --- a/js/src/tests/ecma/Statements/12.6.3-19.js +++ b/js/src/tests/ecma/Statements/12.6.3-19.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.3-19.js'; /** File Name: 12.6.3-1.js diff --git a/js/src/tests/ecma/Statements/12.6.3-2.js b/js/src/tests/ecma/Statements/12.6.3-2.js index 3ed93dc9a1cf..b631e3446180 100644 --- a/js/src/tests/ecma/Statements/12.6.3-2.js +++ b/js/src/tests/ecma/Statements/12.6.3-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.3-2.js'; /** File Name: 12.6.3-2.js diff --git a/js/src/tests/ecma/Statements/12.6.3-3.js b/js/src/tests/ecma/Statements/12.6.3-3.js index f52569bba296..186627620338 100644 --- a/js/src/tests/ecma/Statements/12.6.3-3.js +++ b/js/src/tests/ecma/Statements/12.6.3-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.3-3.js'; /** File Name: 12.6.3-3.js diff --git a/js/src/tests/ecma/Statements/12.6.3-4.js b/js/src/tests/ecma/Statements/12.6.3-4.js index c30641f8bb7c..35d1fca47373 100644 --- a/js/src/tests/ecma/Statements/12.6.3-4.js +++ b/js/src/tests/ecma/Statements/12.6.3-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.3-4.js'; /** File Name: 12.6.3-1.js diff --git a/js/src/tests/ecma/Statements/12.6.3-5-n.js b/js/src/tests/ecma/Statements/12.6.3-5-n.js index 295d059c39b5..aa1064f5a7c5 100644 --- a/js/src/tests/ecma/Statements/12.6.3-5-n.js +++ b/js/src/tests/ecma/Statements/12.6.3-5-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.3-5-n.js'; /** File Name: 12.6.3-1.js diff --git a/js/src/tests/ecma/Statements/12.6.3-6-n.js b/js/src/tests/ecma/Statements/12.6.3-6-n.js index 8cb4c7f638ab..9dd90aef8845 100644 --- a/js/src/tests/ecma/Statements/12.6.3-6-n.js +++ b/js/src/tests/ecma/Statements/12.6.3-6-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.3-6-n.js'; /** File Name: 12.6.3-1.js diff --git a/js/src/tests/ecma/Statements/12.6.3-7-n.js b/js/src/tests/ecma/Statements/12.6.3-7-n.js index 871dd474cb0b..4a92387c2803 100644 --- a/js/src/tests/ecma/Statements/12.6.3-7-n.js +++ b/js/src/tests/ecma/Statements/12.6.3-7-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.3-7-n.js'; /** File Name: 12.6.3-1.js diff --git a/js/src/tests/ecma/Statements/12.6.3-8-n.js b/js/src/tests/ecma/Statements/12.6.3-8-n.js index b75a7b5f378d..9cfbf703d130 100644 --- a/js/src/tests/ecma/Statements/12.6.3-8-n.js +++ b/js/src/tests/ecma/Statements/12.6.3-8-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.3-8-n.js'; /** File Name: 12.6.3-8-n.js diff --git a/js/src/tests/ecma/Statements/12.6.3-9-n.js b/js/src/tests/ecma/Statements/12.6.3-9-n.js index f83a8ed65a7c..7a4ecd5b0b3f 100644 --- a/js/src/tests/ecma/Statements/12.6.3-9-n.js +++ b/js/src/tests/ecma/Statements/12.6.3-9-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.6.3-9-n.js'; /** File Name: 12.6.3-9-n.js diff --git a/js/src/tests/ecma/Statements/12.7-1-n.js b/js/src/tests/ecma/Statements/12.7-1-n.js index 7978f3be5626..567ba4f41a79 100644 --- a/js/src/tests/ecma/Statements/12.7-1-n.js +++ b/js/src/tests/ecma/Statements/12.7-1-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.7-1-n.js'; /** File Name: 12.7-1-n.js diff --git a/js/src/tests/ecma/Statements/12.8-1-n.js b/js/src/tests/ecma/Statements/12.8-1-n.js index 29f46cf29e29..027ec000efde 100644 --- a/js/src/tests/ecma/Statements/12.8-1-n.js +++ b/js/src/tests/ecma/Statements/12.8-1-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.8-1-n.js'; /** File Name: 12.8-1-n.js diff --git a/js/src/tests/ecma/Statements/12.9-1-n.js b/js/src/tests/ecma/Statements/12.9-1-n.js index 450cb665931a..927bf162ab47 100644 --- a/js/src/tests/ecma/Statements/12.9-1-n.js +++ b/js/src/tests/ecma/Statements/12.9-1-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '12.9-1-n.js'; /** File Name: 12.9-1-n.js diff --git a/js/src/tests/ecma/Statements/shell.js b/js/src/tests/ecma/Statements/shell.js index 7346f697a5ba..e69de29bb2d1 100644 --- a/js/src/tests/ecma/Statements/shell.js +++ b/js/src/tests/ecma/Statements/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Statements'; diff --git a/js/src/tests/ecma/String/15.5.1.js b/js/src/tests/ecma/String/15.5.1.js index cf7ab8b420a1..2b295903ebce 100644 --- a/js/src/tests/ecma/String/15.5.1.js +++ b/js/src/tests/ecma/String/15.5.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.1.js'; /** File Name: 15.5.1.js diff --git a/js/src/tests/ecma/String/15.5.2.js b/js/src/tests/ecma/String/15.5.2.js index 062d31cdc2db..6a25ea83feb8 100644 --- a/js/src/tests/ecma/String/15.5.2.js +++ b/js/src/tests/ecma/String/15.5.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.2.js'; /** File Name: 15.5.2.js diff --git a/js/src/tests/ecma/String/15.5.3.1-1.js b/js/src/tests/ecma/String/15.5.3.1-1.js index cc62c9ed5161..6b6c2b350249 100644 --- a/js/src/tests/ecma/String/15.5.3.1-1.js +++ b/js/src/tests/ecma/String/15.5.3.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.3.1-1.js'; /** File Name: 15.5.3.1-1.js diff --git a/js/src/tests/ecma/String/15.5.3.1-2.js b/js/src/tests/ecma/String/15.5.3.1-2.js index b87137a140ff..62e7a4f7118d 100644 --- a/js/src/tests/ecma/String/15.5.3.1-2.js +++ b/js/src/tests/ecma/String/15.5.3.1-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.3.1-2.js'; /** File Name: 15.5.3.1-2.js diff --git a/js/src/tests/ecma/String/15.5.3.1-3.js b/js/src/tests/ecma/String/15.5.3.1-3.js index f94f83db114e..7aaba7d6f982 100644 --- a/js/src/tests/ecma/String/15.5.3.1-3.js +++ b/js/src/tests/ecma/String/15.5.3.1-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.3.1-3.js'; /** File Name: 15.5.3.1-3.js diff --git a/js/src/tests/ecma/String/15.5.3.1-4.js b/js/src/tests/ecma/String/15.5.3.1-4.js index af8c1b956044..ba259bedd776 100644 --- a/js/src/tests/ecma/String/15.5.3.1-4.js +++ b/js/src/tests/ecma/String/15.5.3.1-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.3.1-4.js'; /** File Name: 15.5.3.1-4.js diff --git a/js/src/tests/ecma/String/15.5.3.2-1.js b/js/src/tests/ecma/String/15.5.3.2-1.js index 17e715bca00b..ebc424f0bc91 100644 --- a/js/src/tests/ecma/String/15.5.3.2-1.js +++ b/js/src/tests/ecma/String/15.5.3.2-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.3.2-1.js'; /** File Name: 15.5.3.2-1.js diff --git a/js/src/tests/ecma/String/15.5.3.2-2.js b/js/src/tests/ecma/String/15.5.3.2-2.js index 563623e6e30e..65ec6ed02485 100644 --- a/js/src/tests/ecma/String/15.5.3.2-2.js +++ b/js/src/tests/ecma/String/15.5.3.2-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.3.2-2.js'; /** File Name: 15.5.3.2-2.js diff --git a/js/src/tests/ecma/String/15.5.3.2-3.js b/js/src/tests/ecma/String/15.5.3.2-3.js index ae41742be2f5..876cfbd9f385 100644 --- a/js/src/tests/ecma/String/15.5.3.2-3.js +++ b/js/src/tests/ecma/String/15.5.3.2-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.3.2-3.js'; /** File Name: 15.5.3.2-1.js diff --git a/js/src/tests/ecma/String/15.5.3.js b/js/src/tests/ecma/String/15.5.3.js index 5370484568fa..65aac9a36e99 100644 --- a/js/src/tests/ecma/String/15.5.3.js +++ b/js/src/tests/ecma/String/15.5.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.3.js'; /** File Name: 15.5.3.1.js diff --git a/js/src/tests/ecma/String/15.5.4.1.js b/js/src/tests/ecma/String/15.5.4.1.js index ae8e12463d39..5044099823b3 100644 --- a/js/src/tests/ecma/String/15.5.4.1.js +++ b/js/src/tests/ecma/String/15.5.4.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.1.js'; /** File Name: 15.5.4.1.js diff --git a/js/src/tests/ecma/String/15.5.4.10-1.js b/js/src/tests/ecma/String/15.5.4.10-1.js index 2647d18cb2eb..e37fd06a8b8c 100644 --- a/js/src/tests/ecma/String/15.5.4.10-1.js +++ b/js/src/tests/ecma/String/15.5.4.10-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.10-1.js'; /** File Name: 15.5.4.10-1.js diff --git a/js/src/tests/ecma/String/15.5.4.11-1.js b/js/src/tests/ecma/String/15.5.4.11-1.js index a705f3bbda7a..917c0f7fefcf 100644 --- a/js/src/tests/ecma/String/15.5.4.11-1.js +++ b/js/src/tests/ecma/String/15.5.4.11-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.11-1.js'; /** File Name: 15.5.4.11-1.js diff --git a/js/src/tests/ecma/String/15.5.4.11-2.js b/js/src/tests/ecma/String/15.5.4.11-2.js index 7377dc8247c9..c4b7534137fb 100644 --- a/js/src/tests/ecma/String/15.5.4.11-2.js +++ b/js/src/tests/ecma/String/15.5.4.11-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.11-2.js'; /** File Name: 15.5.4.11-2.js diff --git a/js/src/tests/ecma/String/15.5.4.11-3.js b/js/src/tests/ecma/String/15.5.4.11-3.js index 0a37dcd28a49..f282ba43e7e3 100644 --- a/js/src/tests/ecma/String/15.5.4.11-3.js +++ b/js/src/tests/ecma/String/15.5.4.11-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.11-3.js'; /** File Name: 15.5.4.11-2.js diff --git a/js/src/tests/ecma/String/15.5.4.11-4.js b/js/src/tests/ecma/String/15.5.4.11-4.js index 1196e61c08b4..fd25c177c6d9 100644 --- a/js/src/tests/ecma/String/15.5.4.11-4.js +++ b/js/src/tests/ecma/String/15.5.4.11-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.11-4.js'; /** File Name: 15.5.4.11-2.js diff --git a/js/src/tests/ecma/String/15.5.4.11-5.js b/js/src/tests/ecma/String/15.5.4.11-5.js index eec64102007e..d925b1afdd6e 100644 --- a/js/src/tests/ecma/String/15.5.4.11-5.js +++ b/js/src/tests/ecma/String/15.5.4.11-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.11-5.js'; /** File Name: 15.5.4.11-5.js diff --git a/js/src/tests/ecma/String/15.5.4.11-6.js b/js/src/tests/ecma/String/15.5.4.11-6.js index e3cc6039d4a3..371efd86c728 100644 --- a/js/src/tests/ecma/String/15.5.4.11-6.js +++ b/js/src/tests/ecma/String/15.5.4.11-6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.11-6.js'; /** File Name: 15.5.4.11-6.js diff --git a/js/src/tests/ecma/String/15.5.4.12-1.js b/js/src/tests/ecma/String/15.5.4.12-1.js index ecc497db48bd..46cc536039b3 100644 --- a/js/src/tests/ecma/String/15.5.4.12-1.js +++ b/js/src/tests/ecma/String/15.5.4.12-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.12-1.js'; /** File Name: 15.5.4.12-1.js diff --git a/js/src/tests/ecma/String/15.5.4.12-2.js b/js/src/tests/ecma/String/15.5.4.12-2.js index c22b87b4dc1a..745e3426a756 100644 --- a/js/src/tests/ecma/String/15.5.4.12-2.js +++ b/js/src/tests/ecma/String/15.5.4.12-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.12-2.js'; /** File Name: 15.5.4.12-2.js diff --git a/js/src/tests/ecma/String/15.5.4.12-3.js b/js/src/tests/ecma/String/15.5.4.12-3.js index d9d8bc69ced4..11e7fbff50c1 100644 --- a/js/src/tests/ecma/String/15.5.4.12-3.js +++ b/js/src/tests/ecma/String/15.5.4.12-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.12-3.js'; /** File Name: 15.5.4.12-3.js diff --git a/js/src/tests/ecma/String/15.5.4.12-4.js b/js/src/tests/ecma/String/15.5.4.12-4.js index caf5663f07e3..f10cf2e0b725 100644 --- a/js/src/tests/ecma/String/15.5.4.12-4.js +++ b/js/src/tests/ecma/String/15.5.4.12-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.12-4.js'; /** File Name: 15.5.4.12-1.js diff --git a/js/src/tests/ecma/String/15.5.4.12-5.js b/js/src/tests/ecma/String/15.5.4.12-5.js index 2fbed42202fd..791fcebd5563 100644 --- a/js/src/tests/ecma/String/15.5.4.12-5.js +++ b/js/src/tests/ecma/String/15.5.4.12-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.12-5.js'; /** File Name: 15.5.4.12-1.js diff --git a/js/src/tests/ecma/String/15.5.4.2-1.js b/js/src/tests/ecma/String/15.5.4.2-1.js index e607ed51e4b5..6b203f2d1c01 100644 --- a/js/src/tests/ecma/String/15.5.4.2-1.js +++ b/js/src/tests/ecma/String/15.5.4.2-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.2-1.js'; /** File Name: 15.5.4.2-1.js diff --git a/js/src/tests/ecma/String/15.5.4.2-2-n.js b/js/src/tests/ecma/String/15.5.4.2-2-n.js index 930c1f813626..a02eb00fa5ab 100644 --- a/js/src/tests/ecma/String/15.5.4.2-2-n.js +++ b/js/src/tests/ecma/String/15.5.4.2-2-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.2-2-n.js'; /** File Name: 15.5.4.2-2-n.js diff --git a/js/src/tests/ecma/String/15.5.4.2-3.js b/js/src/tests/ecma/String/15.5.4.2-3.js index 1e306a06f31d..3610de143b96 100644 --- a/js/src/tests/ecma/String/15.5.4.2-3.js +++ b/js/src/tests/ecma/String/15.5.4.2-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.2-3.js'; /** File Name: 15.5.4.2-3.js diff --git a/js/src/tests/ecma/String/15.5.4.2.js b/js/src/tests/ecma/String/15.5.4.2.js index 0a1100fc63cc..b310f03b6766 100644 --- a/js/src/tests/ecma/String/15.5.4.2.js +++ b/js/src/tests/ecma/String/15.5.4.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.2.js'; /** File Name: 15.5.4.2.js diff --git a/js/src/tests/ecma/String/15.5.4.3-1.js b/js/src/tests/ecma/String/15.5.4.3-1.js index b990876fe800..7d19bbec5495 100644 --- a/js/src/tests/ecma/String/15.5.4.3-1.js +++ b/js/src/tests/ecma/String/15.5.4.3-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.3-1.js'; /** File Name: 15.5.4.3-1.js diff --git a/js/src/tests/ecma/String/15.5.4.3-2.js b/js/src/tests/ecma/String/15.5.4.3-2.js index 4747e013e6ff..54fcda57c562 100644 --- a/js/src/tests/ecma/String/15.5.4.3-2.js +++ b/js/src/tests/ecma/String/15.5.4.3-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.3-2.js'; /** File Name: 15.5.4.3-2.js diff --git a/js/src/tests/ecma/String/15.5.4.3-3-n.js b/js/src/tests/ecma/String/15.5.4.3-3-n.js index bdfa52ece0e7..97d31cb925be 100644 --- a/js/src/tests/ecma/String/15.5.4.3-3-n.js +++ b/js/src/tests/ecma/String/15.5.4.3-3-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.3-3-n.js'; /** File Name: 15.5.4.3-3-n.js diff --git a/js/src/tests/ecma/String/15.5.4.4-1.js b/js/src/tests/ecma/String/15.5.4.4-1.js index 5dbffb1d1490..502adb04048c 100644 --- a/js/src/tests/ecma/String/15.5.4.4-1.js +++ b/js/src/tests/ecma/String/15.5.4.4-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.4-1.js'; /** File Name: 15.5.4.4-1.js diff --git a/js/src/tests/ecma/String/15.5.4.4-2.js b/js/src/tests/ecma/String/15.5.4.4-2.js index c822a1d5f774..5a75d77b268c 100644 --- a/js/src/tests/ecma/String/15.5.4.4-2.js +++ b/js/src/tests/ecma/String/15.5.4.4-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.4-2.js'; /** File Name: 15.5.4.4-1.js diff --git a/js/src/tests/ecma/String/15.5.4.4-3.js b/js/src/tests/ecma/String/15.5.4.4-3.js index 96b4759c9849..cfd65ff54340 100644 --- a/js/src/tests/ecma/String/15.5.4.4-3.js +++ b/js/src/tests/ecma/String/15.5.4.4-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.4-3.js'; /** File Name: 15.5.4.4-3.js diff --git a/js/src/tests/ecma/String/15.5.4.4-4.js b/js/src/tests/ecma/String/15.5.4.4-4.js index bf9f7a6898af..47ba026eab03 100644 --- a/js/src/tests/ecma/String/15.5.4.4-4.js +++ b/js/src/tests/ecma/String/15.5.4.4-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.4-4.js'; /** File Name: 15.5.4.4-4.js diff --git a/js/src/tests/ecma/String/15.5.4.5-1.js b/js/src/tests/ecma/String/15.5.4.5-1.js index 6f116764f845..9f449b05005a 100644 --- a/js/src/tests/ecma/String/15.5.4.5-1.js +++ b/js/src/tests/ecma/String/15.5.4.5-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.5-1.js'; /** File Name: 15.5.4.5.1.js diff --git a/js/src/tests/ecma/String/15.5.4.5-2.js b/js/src/tests/ecma/String/15.5.4.5-2.js index 472e69fc40ed..3079443670dc 100644 --- a/js/src/tests/ecma/String/15.5.4.5-2.js +++ b/js/src/tests/ecma/String/15.5.4.5-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.5-2.js'; /** File Name: 15.5.4.5.1.js diff --git a/js/src/tests/ecma/String/15.5.4.5-3.js b/js/src/tests/ecma/String/15.5.4.5-3.js index 42b61da34a21..f840df4cb25a 100644 --- a/js/src/tests/ecma/String/15.5.4.5-3.js +++ b/js/src/tests/ecma/String/15.5.4.5-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.5-3.js'; /** File Name: 15.5.4.5-3.js diff --git a/js/src/tests/ecma/String/15.5.4.5-4.js b/js/src/tests/ecma/String/15.5.4.5-4.js index e1d42c820f66..63e437e4dd15 100644 --- a/js/src/tests/ecma/String/15.5.4.5-4.js +++ b/js/src/tests/ecma/String/15.5.4.5-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.5-4.js'; /** File Name: 15.5.4.5-4.js diff --git a/js/src/tests/ecma/String/15.5.4.5-5.js b/js/src/tests/ecma/String/15.5.4.5-5.js index d5f34e4f2e97..fae024fe9708 100644 --- a/js/src/tests/ecma/String/15.5.4.5-5.js +++ b/js/src/tests/ecma/String/15.5.4.5-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.5-5.js'; /** File Name: 15.5.4.5.1.js diff --git a/js/src/tests/ecma/String/15.5.4.6-1.js b/js/src/tests/ecma/String/15.5.4.6-1.js index 94e34ad5edb8..e2b1bca2a813 100644 --- a/js/src/tests/ecma/String/15.5.4.6-1.js +++ b/js/src/tests/ecma/String/15.5.4.6-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.6-1.js'; /** File Name: 15.5.4.6-1.js diff --git a/js/src/tests/ecma/String/15.5.4.6-2.js b/js/src/tests/ecma/String/15.5.4.6-2.js index acaeffb38a3d..1e40dafbfb48 100644 --- a/js/src/tests/ecma/String/15.5.4.6-2.js +++ b/js/src/tests/ecma/String/15.5.4.6-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.6-2.js'; /** File Name: 15.5.4.6-1.js diff --git a/js/src/tests/ecma/String/15.5.4.7-1.js b/js/src/tests/ecma/String/15.5.4.7-1.js index 094be2ed628a..7e082bb1de00 100644 --- a/js/src/tests/ecma/String/15.5.4.7-1.js +++ b/js/src/tests/ecma/String/15.5.4.7-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.7-1.js'; /** File Name: 15.5.4.7-1.js diff --git a/js/src/tests/ecma/String/15.5.4.7-2.js b/js/src/tests/ecma/String/15.5.4.7-2.js index 0252eae00f45..01d96b134469 100644 --- a/js/src/tests/ecma/String/15.5.4.7-2.js +++ b/js/src/tests/ecma/String/15.5.4.7-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.7-2.js'; /** File Name: 15.5.4.7-2.js diff --git a/js/src/tests/ecma/String/15.5.4.8-1.js b/js/src/tests/ecma/String/15.5.4.8-1.js index 4aa16d5ea0d3..7902859f0263 100644 --- a/js/src/tests/ecma/String/15.5.4.8-1.js +++ b/js/src/tests/ecma/String/15.5.4.8-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.8-1.js'; /** File Name: 15.5.4.8-1.js diff --git a/js/src/tests/ecma/String/15.5.4.8-2.js b/js/src/tests/ecma/String/15.5.4.8-2.js index ff33e62ba6e1..de4d1d7b9d7a 100644 --- a/js/src/tests/ecma/String/15.5.4.8-2.js +++ b/js/src/tests/ecma/String/15.5.4.8-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.8-2.js'; /** File Name: 15.5.4.8-2.js diff --git a/js/src/tests/ecma/String/15.5.4.8-3.js b/js/src/tests/ecma/String/15.5.4.8-3.js index fe10284a9c6a..1c58348808e5 100644 --- a/js/src/tests/ecma/String/15.5.4.8-3.js +++ b/js/src/tests/ecma/String/15.5.4.8-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.8-3.js'; /** File Name: 15.5.4.8-3.js diff --git a/js/src/tests/ecma/String/15.5.4.9-1.js b/js/src/tests/ecma/String/15.5.4.9-1.js index 2184c60f45c6..85128cb5ec5d 100644 --- a/js/src/tests/ecma/String/15.5.4.9-1.js +++ b/js/src/tests/ecma/String/15.5.4.9-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.9-1.js'; /** File Name: 15.5.4.9-1.js diff --git a/js/src/tests/ecma/String/15.5.4.js b/js/src/tests/ecma/String/15.5.4.js index 063e4e68d192..1eb713a6c972 100644 --- a/js/src/tests/ecma/String/15.5.4.js +++ b/js/src/tests/ecma/String/15.5.4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.js'; /** File Name: 15.5.4.js diff --git a/js/src/tests/ecma/String/15.5.5.1.js b/js/src/tests/ecma/String/15.5.5.1.js index 85d3d24ef2ef..2d9fc41080b2 100644 --- a/js/src/tests/ecma/String/15.5.5.1.js +++ b/js/src/tests/ecma/String/15.5.5.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.5.1.js'; /** File Name: 15.5.5.1 diff --git a/js/src/tests/ecma/String/shell.js b/js/src/tests/ecma/String/shell.js index 7d850446cce8..e69de29bb2d1 100644 --- a/js/src/tests/ecma/String/shell.js +++ b/js/src/tests/ecma/String/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'String'; diff --git a/js/src/tests/ecma/TypeConversion/9.2.js b/js/src/tests/ecma/TypeConversion/9.2.js index 2d428b9a9e03..27d4721516b9 100644 --- a/js/src/tests/ecma/TypeConversion/9.2.js +++ b/js/src/tests/ecma/TypeConversion/9.2.js @@ -37,7 +37,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.2.js'; /** File Name: 9.2.js diff --git a/js/src/tests/ecma/TypeConversion/9.3-1.js b/js/src/tests/ecma/TypeConversion/9.3-1.js index a4bbab416cb2..557bebf09a48 100644 --- a/js/src/tests/ecma/TypeConversion/9.3-1.js +++ b/js/src/tests/ecma/TypeConversion/9.3-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.3-1.js'; /** File Name: 9.3-1.js diff --git a/js/src/tests/ecma/TypeConversion/9.3.1-1.js b/js/src/tests/ecma/TypeConversion/9.3.1-1.js index e05016c2d0f4..079f42554865 100644 --- a/js/src/tests/ecma/TypeConversion/9.3.1-1.js +++ b/js/src/tests/ecma/TypeConversion/9.3.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.3.1-1.js'; /** File Name: 9.3.1-1.js diff --git a/js/src/tests/ecma/TypeConversion/9.3.1-2.js b/js/src/tests/ecma/TypeConversion/9.3.1-2.js index 911ec84b9460..418666a3f4fb 100644 --- a/js/src/tests/ecma/TypeConversion/9.3.1-2.js +++ b/js/src/tests/ecma/TypeConversion/9.3.1-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.3.1-2.js'; /** File Name: 9.3.1-2.js diff --git a/js/src/tests/ecma/TypeConversion/9.3.1-3.js b/js/src/tests/ecma/TypeConversion/9.3.1-3.js index 5eb27cec5414..0ff43f92ebe1 100644 --- a/js/src/tests/ecma/TypeConversion/9.3.1-3.js +++ b/js/src/tests/ecma/TypeConversion/9.3.1-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.3.1-3.js'; /** File Name: 9.3.1-3.js diff --git a/js/src/tests/ecma/TypeConversion/9.3.js b/js/src/tests/ecma/TypeConversion/9.3.js index c4b866e7f37d..391273a5dd7f 100644 --- a/js/src/tests/ecma/TypeConversion/9.3.js +++ b/js/src/tests/ecma/TypeConversion/9.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.3.js'; /** File Name: 9.3.js diff --git a/js/src/tests/ecma/TypeConversion/9.4-1.js b/js/src/tests/ecma/TypeConversion/9.4-1.js index e99875697a1b..4e232c99b179 100644 --- a/js/src/tests/ecma/TypeConversion/9.4-1.js +++ b/js/src/tests/ecma/TypeConversion/9.4-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.4-1.js'; /** File Name: 9.4-1.js diff --git a/js/src/tests/ecma/TypeConversion/9.4-2.js b/js/src/tests/ecma/TypeConversion/9.4-2.js index 9b26a67facff..4e232c99b179 100644 --- a/js/src/tests/ecma/TypeConversion/9.4-2.js +++ b/js/src/tests/ecma/TypeConversion/9.4-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.4-2.js'; /** File Name: 9.4-1.js diff --git a/js/src/tests/ecma/TypeConversion/9.5-2.js b/js/src/tests/ecma/TypeConversion/9.5-2.js index 2773052340f7..9bca101ea61b 100644 --- a/js/src/tests/ecma/TypeConversion/9.5-2.js +++ b/js/src/tests/ecma/TypeConversion/9.5-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.5-2.js'; /** File Name: 9.5-2.js diff --git a/js/src/tests/ecma/TypeConversion/9.6.js b/js/src/tests/ecma/TypeConversion/9.6.js index 3d958b3f9d3d..a616be5d2ec0 100644 --- a/js/src/tests/ecma/TypeConversion/9.6.js +++ b/js/src/tests/ecma/TypeConversion/9.6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.6.js'; /** File Name: 9.6.js diff --git a/js/src/tests/ecma/TypeConversion/9.7.js b/js/src/tests/ecma/TypeConversion/9.7.js index 34e4857fd716..7d5f59356b23 100644 --- a/js/src/tests/ecma/TypeConversion/9.7.js +++ b/js/src/tests/ecma/TypeConversion/9.7.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.7.js'; /** File Name: 9.7.js diff --git a/js/src/tests/ecma/TypeConversion/9.8.1.js b/js/src/tests/ecma/TypeConversion/9.8.1.js index 897dc59f6f07..faa473067bb1 100644 --- a/js/src/tests/ecma/TypeConversion/9.8.1.js +++ b/js/src/tests/ecma/TypeConversion/9.8.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.8.1.js'; /** File Name: 9.8.1.js diff --git a/js/src/tests/ecma/TypeConversion/9.9-1.js b/js/src/tests/ecma/TypeConversion/9.9-1.js index ea22980767e7..44a8ad480299 100644 --- a/js/src/tests/ecma/TypeConversion/9.9-1.js +++ b/js/src/tests/ecma/TypeConversion/9.9-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.9-1.js'; /** File Name: 9.9-1.js diff --git a/js/src/tests/ecma/TypeConversion/shell.js b/js/src/tests/ecma/TypeConversion/shell.js index 49ce60f62744..e69de29bb2d1 100644 --- a/js/src/tests/ecma/TypeConversion/shell.js +++ b/js/src/tests/ecma/TypeConversion/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'TypeConversion'; diff --git a/js/src/tests/ecma/Types/8.1.js b/js/src/tests/ecma/Types/8.1.js index 7abcb93c02d7..c998ee7ba433 100644 --- a/js/src/tests/ecma/Types/8.1.js +++ b/js/src/tests/ecma/Types/8.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '8.1.js'; /** File Name: 8.1.js diff --git a/js/src/tests/ecma/Types/8.4.js b/js/src/tests/ecma/Types/8.4.js index 7d3465f8b23b..22469ced4a83 100644 --- a/js/src/tests/ecma/Types/8.4.js +++ b/js/src/tests/ecma/Types/8.4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '8.4.js'; /** File Name: 8.4.js diff --git a/js/src/tests/ecma/Types/8.6.2.1-1.js b/js/src/tests/ecma/Types/8.6.2.1-1.js index c06999c42cad..2c9b6049cf33 100644 --- a/js/src/tests/ecma/Types/8.6.2.1-1.js +++ b/js/src/tests/ecma/Types/8.6.2.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '8.6.2.1-1.js'; /** File Name: 8.6.2.1-1.js diff --git a/js/src/tests/ecma/Types/shell.js b/js/src/tests/ecma/Types/shell.js index a16b996e00d2..e69de29bb2d1 100644 --- a/js/src/tests/ecma/Types/shell.js +++ b/js/src/tests/ecma/Types/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Types'; diff --git a/js/src/tests/ecma/extensions/10.1.4-9.js b/js/src/tests/ecma/extensions/10.1.4-9.js index 91982de20cbc..cff28dee76fb 100644 --- a/js/src/tests/ecma/extensions/10.1.4-9.js +++ b/js/src/tests/ecma/extensions/10.1.4-9.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.4-9.js'; /** File Name: 10.1.4-9.js diff --git a/js/src/tests/ecma/extensions/10.1.6.js b/js/src/tests/ecma/extensions/10.1.6.js index 99fd4a7ff143..05d39c0e5796 100644 --- a/js/src/tests/ecma/extensions/10.1.6.js +++ b/js/src/tests/ecma/extensions/10.1.6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.6.js'; /** File Name: 10.1.6 diff --git a/js/src/tests/ecma/extensions/10.1.8-1.js b/js/src/tests/ecma/extensions/10.1.8-1.js index adfc8d5df58b..eb750213bc87 100644 --- a/js/src/tests/ecma/extensions/10.1.8-1.js +++ b/js/src/tests/ecma/extensions/10.1.8-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '10.1.8-1.js'; /** File Name: 10.1.8 diff --git a/js/src/tests/ecma/extensions/11.6.1-1.js b/js/src/tests/ecma/extensions/11.6.1-1.js index e467157441a8..066c0ef70a51 100644 --- a/js/src/tests/ecma/extensions/11.6.1-1.js +++ b/js/src/tests/ecma/extensions/11.6.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.6.1-1.js'; /** File Name: 11.6.1-1.js diff --git a/js/src/tests/ecma/extensions/11.6.1-2.js b/js/src/tests/ecma/extensions/11.6.1-2.js index a486885b7f9c..cee7658dd881 100644 --- a/js/src/tests/ecma/extensions/11.6.1-2.js +++ b/js/src/tests/ecma/extensions/11.6.1-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.6.1-2.js'; /** File Name: 11.6.1-2.js diff --git a/js/src/tests/ecma/extensions/11.6.1-3.js b/js/src/tests/ecma/extensions/11.6.1-3.js index 7d66e585302e..7f6ada537e78 100644 --- a/js/src/tests/ecma/extensions/11.6.1-3.js +++ b/js/src/tests/ecma/extensions/11.6.1-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.6.1-3.js'; /** File Name: 11.6.1-3.js diff --git a/js/src/tests/ecma/extensions/11.6.2-1.js b/js/src/tests/ecma/extensions/11.6.2-1.js index be8a6f6c98ed..732c33af2c22 100644 --- a/js/src/tests/ecma/extensions/11.6.2-1.js +++ b/js/src/tests/ecma/extensions/11.6.2-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '11.6.2-1.js'; /** File Name: 11.6.2-1.js diff --git a/js/src/tests/ecma/extensions/15-1.js b/js/src/tests/ecma/extensions/15-1.js index fc037873a5ae..9dec9fc589cc 100644 --- a/js/src/tests/ecma/extensions/15-1.js +++ b/js/src/tests/ecma/extensions/15-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15-1.js'; /** File Name: 15.js diff --git a/js/src/tests/ecma/extensions/15-2.js b/js/src/tests/ecma/extensions/15-2.js index e403e46e8e71..58f02bb49d00 100644 --- a/js/src/tests/ecma/extensions/15-2.js +++ b/js/src/tests/ecma/extensions/15-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15-2.js'; /** File Name: 15-2.js diff --git a/js/src/tests/ecma/extensions/15.1.2.1-1.js b/js/src/tests/ecma/extensions/15.1.2.1-1.js index a7f82aae5b20..6cd58db23878 100644 --- a/js/src/tests/ecma/extensions/15.1.2.1-1.js +++ b/js/src/tests/ecma/extensions/15.1.2.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.1.2.1-1.js'; /** File Name: 15.1.2.1-1.js diff --git a/js/src/tests/ecma/extensions/15.2.1.1.js b/js/src/tests/ecma/extensions/15.2.1.1.js index f4f821877d70..bbe44fe11501 100644 --- a/js/src/tests/ecma/extensions/15.2.1.1.js +++ b/js/src/tests/ecma/extensions/15.2.1.1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.2.1.1.js'; /** File Name: 15.2.1.1.js diff --git a/js/src/tests/ecma/extensions/15.2.3-1.js b/js/src/tests/ecma/extensions/15.2.3-1.js index 6d49db24810e..87762fa3f9a6 100644 --- a/js/src/tests/ecma/extensions/15.2.3-1.js +++ b/js/src/tests/ecma/extensions/15.2.3-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.2.3-1.js'; /** File Name: 15.2.3-1.js diff --git a/js/src/tests/ecma/extensions/15.2.4.js b/js/src/tests/ecma/extensions/15.2.4.js index df55e0894a7f..70d541264f65 100644 --- a/js/src/tests/ecma/extensions/15.2.4.js +++ b/js/src/tests/ecma/extensions/15.2.4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.2.4.js'; /** File Name: 15.2.4.js diff --git a/js/src/tests/ecma/extensions/15.3.1.1-1.js b/js/src/tests/ecma/extensions/15.3.1.1-1.js index 169cf50851c4..d74720190ce1 100644 --- a/js/src/tests/ecma/extensions/15.3.1.1-1.js +++ b/js/src/tests/ecma/extensions/15.3.1.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.1.1-1.js'; /** File Name: 15.3.1.1.js diff --git a/js/src/tests/ecma/extensions/15.3.1.1-2.js b/js/src/tests/ecma/extensions/15.3.1.1-2.js index 42165465bc04..8617a4f30e7a 100644 --- a/js/src/tests/ecma/extensions/15.3.1.1-2.js +++ b/js/src/tests/ecma/extensions/15.3.1.1-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.1.1-2.js'; /** File Name: 15.3.1.1-2.js diff --git a/js/src/tests/ecma/extensions/15.3.2.1-1.js b/js/src/tests/ecma/extensions/15.3.2.1-1.js index e61293e866b9..c033c23d38dd 100644 --- a/js/src/tests/ecma/extensions/15.3.2.1-1.js +++ b/js/src/tests/ecma/extensions/15.3.2.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.2.1-1.js'; /** File Name: 15.3.2.1.js diff --git a/js/src/tests/ecma/extensions/15.3.2.1-2.js b/js/src/tests/ecma/extensions/15.3.2.1-2.js index 0b37e2102873..baeb28925191 100644 --- a/js/src/tests/ecma/extensions/15.3.2.1-2.js +++ b/js/src/tests/ecma/extensions/15.3.2.1-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.2.1-2.js'; /** File Name: 15.3.2.1.js diff --git a/js/src/tests/ecma/extensions/15.3.3.1-1.js b/js/src/tests/ecma/extensions/15.3.3.1-1.js index d4f22ff25796..6d944678661d 100644 --- a/js/src/tests/ecma/extensions/15.3.3.1-1.js +++ b/js/src/tests/ecma/extensions/15.3.3.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.3.3.1-1.js'; /** File Name: 15.3.3.1-1.js diff --git a/js/src/tests/ecma/extensions/15.4.3.js b/js/src/tests/ecma/extensions/15.4.3.js index 8cbf9498551c..117bd66e6b3c 100644 --- a/js/src/tests/ecma/extensions/15.4.3.js +++ b/js/src/tests/ecma/extensions/15.4.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.4.3.js'; /** File Name: 15.4.3.js diff --git a/js/src/tests/ecma/extensions/15.5.3.js b/js/src/tests/ecma/extensions/15.5.3.js index c25398c4f43f..5f467c84d414 100644 --- a/js/src/tests/ecma/extensions/15.5.3.js +++ b/js/src/tests/ecma/extensions/15.5.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.3.js'; /** File Name: 15.5.3.1.js diff --git a/js/src/tests/ecma/extensions/15.5.4.2.js b/js/src/tests/ecma/extensions/15.5.4.2.js index ebf4d03781fb..a31f7460679c 100644 --- a/js/src/tests/ecma/extensions/15.5.4.2.js +++ b/js/src/tests/ecma/extensions/15.5.4.2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.2.js'; /** File Name: 15.5.4.2.js diff --git a/js/src/tests/ecma/extensions/15.5.4.4-4.js b/js/src/tests/ecma/extensions/15.5.4.4-4.js index c2e115e0c62d..0eb3e71ef465 100644 --- a/js/src/tests/ecma/extensions/15.5.4.4-4.js +++ b/js/src/tests/ecma/extensions/15.5.4.4-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.4-4.js'; /** File Name: 15.5.4.4-4.js diff --git a/js/src/tests/ecma/extensions/15.5.4.5-6.js b/js/src/tests/ecma/extensions/15.5.4.5-6.js index 57e8ebe67e38..cd0466a99680 100644 --- a/js/src/tests/ecma/extensions/15.5.4.5-6.js +++ b/js/src/tests/ecma/extensions/15.5.4.5-6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.5-6.js'; /** File Name: 15.5.4.5-6.js diff --git a/js/src/tests/ecma/extensions/15.5.4.7-3.js b/js/src/tests/ecma/extensions/15.5.4.7-3.js index c5832fd477df..ab5a322e97c9 100644 --- a/js/src/tests/ecma/extensions/15.5.4.7-3.js +++ b/js/src/tests/ecma/extensions/15.5.4.7-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.5.4.7-3.js'; /** File Name: 15.5.4.7-3.js diff --git a/js/src/tests/ecma/extensions/15.6.3.1-5.js b/js/src/tests/ecma/extensions/15.6.3.1-5.js index b9f35b822508..a751e3241985 100644 --- a/js/src/tests/ecma/extensions/15.6.3.1-5.js +++ b/js/src/tests/ecma/extensions/15.6.3.1-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.3.1-5.js'; /** File Name: 15.6.3.1-5.js diff --git a/js/src/tests/ecma/extensions/15.6.3.js b/js/src/tests/ecma/extensions/15.6.3.js index 0ae48c59f267..4deab3f27263 100644 --- a/js/src/tests/ecma/extensions/15.6.3.js +++ b/js/src/tests/ecma/extensions/15.6.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.3.js'; /** File Name: 15.6.3.js diff --git a/js/src/tests/ecma/extensions/15.6.4-2.js b/js/src/tests/ecma/extensions/15.6.4-2.js index 7ca222235fcf..051fd42cd1c5 100644 --- a/js/src/tests/ecma/extensions/15.6.4-2.js +++ b/js/src/tests/ecma/extensions/15.6.4-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.6.4-2.js'; /** File Name: 15.6.4-2.js diff --git a/js/src/tests/ecma/extensions/15.7.3.js b/js/src/tests/ecma/extensions/15.7.3.js index 84e362c2dbd5..aece52e7e0ae 100644 --- a/js/src/tests/ecma/extensions/15.7.3.js +++ b/js/src/tests/ecma/extensions/15.7.3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.3.js'; /** File Name: 15.7.3.js diff --git a/js/src/tests/ecma/extensions/15.7.4.js b/js/src/tests/ecma/extensions/15.7.4.js index 733b937e55bf..841152aec43f 100644 --- a/js/src/tests/ecma/extensions/15.7.4.js +++ b/js/src/tests/ecma/extensions/15.7.4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.7.4.js'; /** File Name: 15.7.4.js diff --git a/js/src/tests/ecma/extensions/15.8-1.js b/js/src/tests/ecma/extensions/15.8-1.js index 0f51cf5e61c2..318ed415c01d 100644 --- a/js/src/tests/ecma/extensions/15.8-1.js +++ b/js/src/tests/ecma/extensions/15.8-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.8-1.js'; /** File Name: 15.8-1.js diff --git a/js/src/tests/ecma/extensions/15.9.5.js b/js/src/tests/ecma/extensions/15.9.5.js index 54e6bb6f0f9d..e2bf138ebecd 100644 --- a/js/src/tests/ecma/extensions/15.9.5.js +++ b/js/src/tests/ecma/extensions/15.9.5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '15.9.5.js'; /** File Name: 15.9.5.js diff --git a/js/src/tests/ecma/extensions/8.6.2.1-1.js b/js/src/tests/ecma/extensions/8.6.2.1-1.js index a99bb01ee688..481b091a7002 100644 --- a/js/src/tests/ecma/extensions/8.6.2.1-1.js +++ b/js/src/tests/ecma/extensions/8.6.2.1-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '8.6.2.1-1.js'; /** File Name: 8.6.2.1-1.js diff --git a/js/src/tests/ecma/extensions/9.9-1.js b/js/src/tests/ecma/extensions/9.9-1.js index 0df44013cd44..1c827a885467 100644 --- a/js/src/tests/ecma/extensions/9.9-1.js +++ b/js/src/tests/ecma/extensions/9.9-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = '9.9-1.js'; /** File Name: 9.9-1.js diff --git a/js/src/tests/ecma/extensions/shell.js b/js/src/tests/ecma/extensions/shell.js index 3f52cffbc059..e69de29bb2d1 100644 --- a/js/src/tests/ecma/extensions/shell.js +++ b/js/src/tests/ecma/extensions/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'extensions'; diff --git a/js/src/tests/ecma/extensions/trapflatclosure.js b/js/src/tests/ecma/extensions/trapflatclosure.js index 3f4bb343de76..4981aaf322bc 100644 --- a/js/src/tests/ecma/extensions/trapflatclosure.js +++ b/js/src/tests/ecma/extensions/trapflatclosure.js @@ -3,7 +3,6 @@ * http://creativecommons.org/licenses/publicdomain/ */ -var gTestfile = 'trapflatclosure.js'; var BUGNUMBER = 549617; var summary = 'flat closure debugged via trap while still active'; diff --git a/js/src/tests/ecma/shell.js b/js/src/tests/ecma/shell.js index 9f55d7437754..1542a3257949 100644 --- a/js/src/tests/ecma/shell.js +++ b/js/src/tests/ecma/shell.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestsuite = 'ecma'; /* * Date functions used by tests in Date suite @@ -91,7 +90,7 @@ function adjustResultArray(ResultArray, msMode) // If the tester's system clock is in PST, no need to continue - // if (!PST_DIFF) {return;} - /* The date gTestcases instantiate Date objects in two different ways: + /* The date testcases instantiate Date objects in two different ways: * * millisecond mode: e.g. dt = new Date(10000000); * year-month-day mode: dt = new Date(2000, 5, 1, ...); diff --git a/js/src/tests/ecma/template.js b/js/src/tests/ecma/template.js index e9b702a45dfe..b39655476e8f 100644 --- a/js/src/tests/ecma/template.js +++ b/js/src/tests/ecma/template.js @@ -5,7 +5,6 @@ * Contributor: */ -gTestfile = 'template.js'; /** * File Name: template.js diff --git a/js/src/tests/ecma_2/Exceptions/boolean-001.js b/js/src/tests/ecma_2/Exceptions/boolean-001.js index 7462df2f9812..2331fd9d03ad 100644 --- a/js/src/tests/ecma_2/Exceptions/boolean-001.js +++ b/js/src/tests/ecma_2/Exceptions/boolean-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'boolean-001.js'; /** File Name: boolean-001.js diff --git a/js/src/tests/ecma_2/Exceptions/boolean-002.js b/js/src/tests/ecma_2/Exceptions/boolean-002.js index 813e11cd39b7..ca7fc68a3bb9 100644 --- a/js/src/tests/ecma_2/Exceptions/boolean-002.js +++ b/js/src/tests/ecma_2/Exceptions/boolean-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'boolean-002.js'; /** File Name: boolean-001.js diff --git a/js/src/tests/ecma_2/Exceptions/date-001.js b/js/src/tests/ecma_2/Exceptions/date-001.js index 041bbb523cb2..eba4f6de98cb 100644 --- a/js/src/tests/ecma_2/Exceptions/date-001.js +++ b/js/src/tests/ecma_2/Exceptions/date-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'date-001.js'; /** File Name: date-001.js diff --git a/js/src/tests/ecma_2/Exceptions/date-002.js b/js/src/tests/ecma_2/Exceptions/date-002.js index 4fb11b38d9e4..6c1697b50fc7 100644 --- a/js/src/tests/ecma_2/Exceptions/date-002.js +++ b/js/src/tests/ecma_2/Exceptions/date-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'date-002.js'; /** File Name: date-002.js diff --git a/js/src/tests/ecma_2/Exceptions/date-003.js b/js/src/tests/ecma_2/Exceptions/date-003.js index 95129177c76c..03a3528eec10 100644 --- a/js/src/tests/ecma_2/Exceptions/date-003.js +++ b/js/src/tests/ecma_2/Exceptions/date-003.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'date-003.js'; /** File Name: date-003.js diff --git a/js/src/tests/ecma_2/Exceptions/date-004.js b/js/src/tests/ecma_2/Exceptions/date-004.js index d77bd1c272d3..89b57726f3d7 100644 --- a/js/src/tests/ecma_2/Exceptions/date-004.js +++ b/js/src/tests/ecma_2/Exceptions/date-004.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'date-004.js'; /** File Name: date-004.js diff --git a/js/src/tests/ecma_2/Exceptions/exception-001.js b/js/src/tests/ecma_2/Exceptions/exception-001.js index 3762c5b3c4f4..adb484601d56 100644 --- a/js/src/tests/ecma_2/Exceptions/exception-001.js +++ b/js/src/tests/ecma_2/Exceptions/exception-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'exception-001.js'; /** * File Name: exception-001 diff --git a/js/src/tests/ecma_2/Exceptions/exception-002.js b/js/src/tests/ecma_2/Exceptions/exception-002.js index e5328b8b817b..40289d9203bf 100644 --- a/js/src/tests/ecma_2/Exceptions/exception-002.js +++ b/js/src/tests/ecma_2/Exceptions/exception-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'exception-002.js'; /** * File Name: exception-002 diff --git a/js/src/tests/ecma_2/Exceptions/exception-003.js b/js/src/tests/ecma_2/Exceptions/exception-003.js index c5956ffc9549..d29c376df5bf 100644 --- a/js/src/tests/ecma_2/Exceptions/exception-003.js +++ b/js/src/tests/ecma_2/Exceptions/exception-003.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'exception-003.js'; /** * File Name: exception-003 diff --git a/js/src/tests/ecma_2/Exceptions/exception-004.js b/js/src/tests/ecma_2/Exceptions/exception-004.js index 15a07a806f8b..15ca546462ee 100644 --- a/js/src/tests/ecma_2/Exceptions/exception-004.js +++ b/js/src/tests/ecma_2/Exceptions/exception-004.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'exception-004.js'; /** * File Name: exception-004 diff --git a/js/src/tests/ecma_2/Exceptions/exception-005.js b/js/src/tests/ecma_2/Exceptions/exception-005.js index e5532ff40c4d..977e5f7eb032 100644 --- a/js/src/tests/ecma_2/Exceptions/exception-005.js +++ b/js/src/tests/ecma_2/Exceptions/exception-005.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'exception-005.js'; /** * File Name: exception-005 diff --git a/js/src/tests/ecma_2/Exceptions/exception-006.js b/js/src/tests/ecma_2/Exceptions/exception-006.js index b37b52becb6d..2c22579c1151 100644 --- a/js/src/tests/ecma_2/Exceptions/exception-006.js +++ b/js/src/tests/ecma_2/Exceptions/exception-006.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'exception-006.js'; /** * File Name: exception-006 diff --git a/js/src/tests/ecma_2/Exceptions/exception-007.js b/js/src/tests/ecma_2/Exceptions/exception-007.js index a63ed0e3f8c6..da676adf4ab1 100644 --- a/js/src/tests/ecma_2/Exceptions/exception-007.js +++ b/js/src/tests/ecma_2/Exceptions/exception-007.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'exception-007.js'; /** * File Name: exception-007 diff --git a/js/src/tests/ecma_2/Exceptions/exception-008.js b/js/src/tests/ecma_2/Exceptions/exception-008.js index 39326183a4ad..97546f7f502b 100644 --- a/js/src/tests/ecma_2/Exceptions/exception-008.js +++ b/js/src/tests/ecma_2/Exceptions/exception-008.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'exception-008.js'; /** * File Name: exception-008 diff --git a/js/src/tests/ecma_2/Exceptions/exception-009.js b/js/src/tests/ecma_2/Exceptions/exception-009.js index bd5cbe7f40dc..f40454149377 100644 --- a/js/src/tests/ecma_2/Exceptions/exception-009.js +++ b/js/src/tests/ecma_2/Exceptions/exception-009.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'exception-009.js'; /** * File Name: exception-009 diff --git a/js/src/tests/ecma_2/Exceptions/exception-010-n.js b/js/src/tests/ecma_2/Exceptions/exception-010-n.js index cb28d635a60f..4dbbaa2c8257 100644 --- a/js/src/tests/ecma_2/Exceptions/exception-010-n.js +++ b/js/src/tests/ecma_2/Exceptions/exception-010-n.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'exception-010-n.js'; var SECTION = "exception-010"; var VERSION = "ECMA_2"; diff --git a/js/src/tests/ecma_2/Exceptions/exception-011-n.js b/js/src/tests/ecma_2/Exceptions/exception-011-n.js index ec5302c24793..3cc81e4e98a1 100644 --- a/js/src/tests/ecma_2/Exceptions/exception-011-n.js +++ b/js/src/tests/ecma_2/Exceptions/exception-011-n.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'exception-011-n.js'; var SECTION = "exception-011"; var VERSION = "ECMA_2"; diff --git a/js/src/tests/ecma_2/Exceptions/expression-001.js b/js/src/tests/ecma_2/Exceptions/expression-001.js index c3ae4f21e622..55fe0dab0c05 100644 --- a/js/src/tests/ecma_2/Exceptions/expression-001.js +++ b/js/src/tests/ecma_2/Exceptions/expression-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'expression-001.js'; /** File Name: expression-001.js diff --git a/js/src/tests/ecma_2/Exceptions/expression-002.js b/js/src/tests/ecma_2/Exceptions/expression-002.js index 2f060936ae71..ac154b37fc41 100644 --- a/js/src/tests/ecma_2/Exceptions/expression-002.js +++ b/js/src/tests/ecma_2/Exceptions/expression-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'expression-002.js'; /** File Name: expressions-002.js diff --git a/js/src/tests/ecma_2/Exceptions/expression-003.js b/js/src/tests/ecma_2/Exceptions/expression-003.js index 5007b83adf34..b92771b73d68 100644 --- a/js/src/tests/ecma_2/Exceptions/expression-003.js +++ b/js/src/tests/ecma_2/Exceptions/expression-003.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'expression-003.js'; /** File Name: expressions-003.js diff --git a/js/src/tests/ecma_2/Exceptions/expression-004.js b/js/src/tests/ecma_2/Exceptions/expression-004.js index 2befdd10f334..39c973236d7a 100644 --- a/js/src/tests/ecma_2/Exceptions/expression-004.js +++ b/js/src/tests/ecma_2/Exceptions/expression-004.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'expression-004.js'; /** File Name: expression-004.js diff --git a/js/src/tests/ecma_2/Exceptions/expression-005.js b/js/src/tests/ecma_2/Exceptions/expression-005.js index 2d76593ea23c..7fa361d7a41f 100644 --- a/js/src/tests/ecma_2/Exceptions/expression-005.js +++ b/js/src/tests/ecma_2/Exceptions/expression-005.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'expression-005.js'; /** File Name: expression-005.js diff --git a/js/src/tests/ecma_2/Exceptions/expression-006.js b/js/src/tests/ecma_2/Exceptions/expression-006.js index eb21e0308cb8..5e2735ee37a3 100644 --- a/js/src/tests/ecma_2/Exceptions/expression-006.js +++ b/js/src/tests/ecma_2/Exceptions/expression-006.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'expression-006.js'; /** File Name: expression-006.js diff --git a/js/src/tests/ecma_2/Exceptions/expression-007.js b/js/src/tests/ecma_2/Exceptions/expression-007.js index a2305be16d6f..f9dedeb2ebcf 100644 --- a/js/src/tests/ecma_2/Exceptions/expression-007.js +++ b/js/src/tests/ecma_2/Exceptions/expression-007.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'expression-007.js'; /** File Name: expression-007.js diff --git a/js/src/tests/ecma_2/Exceptions/expression-008.js b/js/src/tests/ecma_2/Exceptions/expression-008.js index c85310f9576a..9d1b6725f2fa 100644 --- a/js/src/tests/ecma_2/Exceptions/expression-008.js +++ b/js/src/tests/ecma_2/Exceptions/expression-008.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'expression-008.js'; /** File Name: expression-008 diff --git a/js/src/tests/ecma_2/Exceptions/expression-009.js b/js/src/tests/ecma_2/Exceptions/expression-009.js index feec2cd052bd..3b0deda68225 100644 --- a/js/src/tests/ecma_2/Exceptions/expression-009.js +++ b/js/src/tests/ecma_2/Exceptions/expression-009.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'expression-009.js'; /** File Name: expression-009 diff --git a/js/src/tests/ecma_2/Exceptions/expression-010.js b/js/src/tests/ecma_2/Exceptions/expression-010.js index e0b38a48388a..1371f36711e7 100644 --- a/js/src/tests/ecma_2/Exceptions/expression-010.js +++ b/js/src/tests/ecma_2/Exceptions/expression-010.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'expression-010.js'; /** File Name: expression-010.js diff --git a/js/src/tests/ecma_2/Exceptions/expression-011.js b/js/src/tests/ecma_2/Exceptions/expression-011.js index 75f872480d39..dc34c993209d 100644 --- a/js/src/tests/ecma_2/Exceptions/expression-011.js +++ b/js/src/tests/ecma_2/Exceptions/expression-011.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'expression-011.js'; /** File Name: expression-011.js diff --git a/js/src/tests/ecma_2/Exceptions/expression-012.js b/js/src/tests/ecma_2/Exceptions/expression-012.js index 5223abd48057..7fbb6e7b4b50 100644 --- a/js/src/tests/ecma_2/Exceptions/expression-012.js +++ b/js/src/tests/ecma_2/Exceptions/expression-012.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'expression-012.js'; /** File Name: expression-012.js diff --git a/js/src/tests/ecma_2/Exceptions/expression-013.js b/js/src/tests/ecma_2/Exceptions/expression-013.js index 10ad7266531d..a995e66698a3 100644 --- a/js/src/tests/ecma_2/Exceptions/expression-013.js +++ b/js/src/tests/ecma_2/Exceptions/expression-013.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'expression-013.js'; /** File Name: expression-013.js diff --git a/js/src/tests/ecma_2/Exceptions/expression-014.js b/js/src/tests/ecma_2/Exceptions/expression-014.js index fadca81c7aaa..b79f7cce7e4f 100644 --- a/js/src/tests/ecma_2/Exceptions/expression-014.js +++ b/js/src/tests/ecma_2/Exceptions/expression-014.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'expression-014.js'; /** File Name: expression-014.js diff --git a/js/src/tests/ecma_2/Exceptions/expression-015.js b/js/src/tests/ecma_2/Exceptions/expression-015.js index 2bd2b8d0940e..94c51c6ca495 100644 --- a/js/src/tests/ecma_2/Exceptions/expression-015.js +++ b/js/src/tests/ecma_2/Exceptions/expression-015.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'expression-015.js'; /** File Name: expression-015.js diff --git a/js/src/tests/ecma_2/Exceptions/expression-016.js b/js/src/tests/ecma_2/Exceptions/expression-016.js index 3c91495f3c2f..cab13b967be0 100644 --- a/js/src/tests/ecma_2/Exceptions/expression-016.js +++ b/js/src/tests/ecma_2/Exceptions/expression-016.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'expression-016.js'; /** File Name: expression-016.js diff --git a/js/src/tests/ecma_2/Exceptions/expression-017.js b/js/src/tests/ecma_2/Exceptions/expression-017.js index 4e762a54a9ba..c84f11cf3293 100644 --- a/js/src/tests/ecma_2/Exceptions/expression-017.js +++ b/js/src/tests/ecma_2/Exceptions/expression-017.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'expression-017.js'; /** File Name: expression-07.js diff --git a/js/src/tests/ecma_2/Exceptions/expression-019.js b/js/src/tests/ecma_2/Exceptions/expression-019.js index 11ee3a0063b6..7209dc99fa16 100644 --- a/js/src/tests/ecma_2/Exceptions/expression-019.js +++ b/js/src/tests/ecma_2/Exceptions/expression-019.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'expression-019.js'; /** File Name: expression-019.js diff --git a/js/src/tests/ecma_2/Exceptions/function-001.js b/js/src/tests/ecma_2/Exceptions/function-001.js index d5f7b452e234..a0c77996a2d1 100644 --- a/js/src/tests/ecma_2/Exceptions/function-001.js +++ b/js/src/tests/ecma_2/Exceptions/function-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'function-001.js'; /** * File Name: boolean-001.js diff --git a/js/src/tests/ecma_2/Exceptions/global-001.js b/js/src/tests/ecma_2/Exceptions/global-001.js index a186a51e64ac..16a98aaeb652 100644 --- a/js/src/tests/ecma_2/Exceptions/global-001.js +++ b/js/src/tests/ecma_2/Exceptions/global-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'global-001.js'; /** File Name: global-001 diff --git a/js/src/tests/ecma_2/Exceptions/global-002.js b/js/src/tests/ecma_2/Exceptions/global-002.js index c4ef14352990..74ddbda7f351 100644 --- a/js/src/tests/ecma_2/Exceptions/global-002.js +++ b/js/src/tests/ecma_2/Exceptions/global-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'global-002.js'; /** File Name: global-002 diff --git a/js/src/tests/ecma_2/Exceptions/lexical-001.js b/js/src/tests/ecma_2/Exceptions/lexical-001.js index cc2e3a46aa04..88c798b75254 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-001.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-001.js'; /** File Name: lexical-001.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-002.js b/js/src/tests/ecma_2/Exceptions/lexical-002.js index f7f691a04977..a395faba0cf5 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-002.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-002.js'; /** File Name: lexical-002.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-003.js b/js/src/tests/ecma_2/Exceptions/lexical-003.js index 482382eeed2f..864e6719a1e1 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-003.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-003.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-003.js'; /** File Name: lexical-003.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-004.js b/js/src/tests/ecma_2/Exceptions/lexical-004.js index ccf612410936..bb898647502a 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-004.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-004.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-004.js'; /** File Name: lexical-004.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-005.js b/js/src/tests/ecma_2/Exceptions/lexical-005.js index 44b2ea9c8770..db519c5efdd0 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-005.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-005.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-005.js'; /** File Name: lexical-005.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-006.js b/js/src/tests/ecma_2/Exceptions/lexical-006.js index 6f693d8ad2a5..8ea0b8fcef9a 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-006.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-006.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-006.js'; /** File Name: lexical-006.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-007.js b/js/src/tests/ecma_2/Exceptions/lexical-007.js index b6d5152ea04e..25c8288147cb 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-007.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-007.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-007.js'; /** File Name: lexical-005.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-008.js b/js/src/tests/ecma_2/Exceptions/lexical-008.js index eed455c243de..9c920cbd5c65 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-008.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-008.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-008.js'; /** File Name: lexical-008.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-009.js b/js/src/tests/ecma_2/Exceptions/lexical-009.js index d79657480935..f3a9a7130643 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-009.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-009.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-009.js'; /** File Name: lexical-009 diff --git a/js/src/tests/ecma_2/Exceptions/lexical-010.js b/js/src/tests/ecma_2/Exceptions/lexical-010.js index 059b5a06beae..a0e706425a11 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-010.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-010.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-010.js'; /** File Name: lexical-010.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-011.js b/js/src/tests/ecma_2/Exceptions/lexical-011.js index 7f01041c41c3..989f34c97da3 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-011.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-011.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-011.js'; /** File Name: lexical-011.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-012.js b/js/src/tests/ecma_2/Exceptions/lexical-012.js index e55b6eb30f28..a36fa3f99201 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-012.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-012.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-012.js'; /** File Name: lexical-012.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-013.js b/js/src/tests/ecma_2/Exceptions/lexical-013.js index fbbf20b263bf..f8c667dd8c5d 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-013.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-013.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-013.js'; /** File Name: lexical-013.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-014.js b/js/src/tests/ecma_2/Exceptions/lexical-014.js index 880d2800e5b1..e666dd125d7f 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-014.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-014.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-014.js'; /** File Name: lexical-014.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-015.js b/js/src/tests/ecma_2/Exceptions/lexical-015.js index a15a2be54453..4d1905affe64 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-015.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-015.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-015.js'; /** File Name: lexical-015.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-016.js b/js/src/tests/ecma_2/Exceptions/lexical-016.js index 021594d0521e..09cc86899db0 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-016.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-016.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-016.js'; /** File Name: lexical-016 diff --git a/js/src/tests/ecma_2/Exceptions/lexical-017.js b/js/src/tests/ecma_2/Exceptions/lexical-017.js index b89a526229c2..d7bba80839fe 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-017.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-017.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-017.js'; /** File Name: lexical-017.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-018.js b/js/src/tests/ecma_2/Exceptions/lexical-018.js index 18773dafe608..a8c36102cdef 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-018.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-018.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-018.js'; /** File Name: lexical-018 diff --git a/js/src/tests/ecma_2/Exceptions/lexical-019.js b/js/src/tests/ecma_2/Exceptions/lexical-019.js index c1c34a93c19a..d502bae66b17 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-019.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-019.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-019.js'; /** File Name: lexical-019.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-020.js b/js/src/tests/ecma_2/Exceptions/lexical-020.js index e82e1e50b932..ea45160ec4b3 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-020.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-020.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-020.js'; /** File Name: lexical-020.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-021.js b/js/src/tests/ecma_2/Exceptions/lexical-021.js index 47a0725a0970..e466184940ce 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-021.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-021.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-021.js'; /** File Name: lexical-021.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-022.js b/js/src/tests/ecma_2/Exceptions/lexical-022.js index 75d72aa5b68c..e63f37da77c7 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-022.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-022.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-022.js'; /** File Name: lexical-022 diff --git a/js/src/tests/ecma_2/Exceptions/lexical-023.js b/js/src/tests/ecma_2/Exceptions/lexical-023.js index aa89c0478288..e979a2539448 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-023.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-023.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-023.js'; /** File Name: lexical-023.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-024.js b/js/src/tests/ecma_2/Exceptions/lexical-024.js index 7c1f22f745a0..79734533f1e5 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-024.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-024.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-024.js'; /** File Name: lexical-024 diff --git a/js/src/tests/ecma_2/Exceptions/lexical-025.js b/js/src/tests/ecma_2/Exceptions/lexical-025.js index f1c7b93daff0..73b7652b9e4d 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-025.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-025.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-025.js'; /** File Name: lexical-025.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-026.js b/js/src/tests/ecma_2/Exceptions/lexical-026.js index 31b5aaaf6123..15b562174f36 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-026.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-026.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-026.js'; /** File Name: lexical-026.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-027.js b/js/src/tests/ecma_2/Exceptions/lexical-027.js index 573025b59106..4588b522de42 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-027.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-027.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-027.js'; /** File Name: lexical-027.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-028.js b/js/src/tests/ecma_2/Exceptions/lexical-028.js index 1b76a2216941..5b97779ec956 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-028.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-028.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-028.js'; /** File Name: lexical-028.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-029.js b/js/src/tests/ecma_2/Exceptions/lexical-029.js index f978b8ef8926..9db33a3b7af2 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-029.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-029.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-029.js'; /** File Name: lexical-029.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-030.js b/js/src/tests/ecma_2/Exceptions/lexical-030.js index 3796551698b9..1a7b5fca344d 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-030.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-030.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-030.js'; /** File Name: lexical-030.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-031.js b/js/src/tests/ecma_2/Exceptions/lexical-031.js index 13379fed0124..d0d8b469fb60 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-031.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-031.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-031.js'; /** File Name: lexical-031.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-032.js b/js/src/tests/ecma_2/Exceptions/lexical-032.js index 48e6e9aac53d..0ccc623d82a6 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-032.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-032.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-032.js'; /** File Name: lexical-032.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-033.js b/js/src/tests/ecma_2/Exceptions/lexical-033.js index cc223c228222..2ee90bf6bc17 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-033.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-033.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-033.js'; /** File Name: lexical-033.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-034.js b/js/src/tests/ecma_2/Exceptions/lexical-034.js index 4d3c7d5fc0d7..23fde7f18948 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-034.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-034.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-034.js'; /** File Name: 7.4.2-11-n.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-035.js b/js/src/tests/ecma_2/Exceptions/lexical-035.js index 2a61b437baea..3081d490f773 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-035.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-035.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-035.js'; /** File Name: lexical-035.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-036.js b/js/src/tests/ecma_2/Exceptions/lexical-036.js index a1923b730374..deb82910b17c 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-036.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-036.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-036.js'; /** File Name: lexical-036.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-037.js b/js/src/tests/ecma_2/Exceptions/lexical-037.js index e3cd75bd6024..1e51d8790ee9 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-037.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-037.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-037.js'; /** File Name: lexical-037.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-038.js b/js/src/tests/ecma_2/Exceptions/lexical-038.js index 1bf8c6c4e494..caf8afdf4ada 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-038.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-038.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-038.js'; /** File Name: lexical-038.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-039.js b/js/src/tests/ecma_2/Exceptions/lexical-039.js index 2f193af89a79..45564213056d 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-039.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-039.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-039.js'; /** File Name: lexical-039 diff --git a/js/src/tests/ecma_2/Exceptions/lexical-040.js b/js/src/tests/ecma_2/Exceptions/lexical-040.js index f5ba3533dd19..5fb6b653f6a3 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-040.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-040.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-040.js'; /** File Name: lexical-040.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-041.js b/js/src/tests/ecma_2/Exceptions/lexical-041.js index 06d63bddb3f9..fcebb78360a0 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-041.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-041.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-041.js'; /** File Name: lexical-041.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-042.js b/js/src/tests/ecma_2/Exceptions/lexical-042.js index c2cedb0b81e2..58db683d8367 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-042.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-042.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-042.js'; /** File Name: lexical-042.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-047.js b/js/src/tests/ecma_2/Exceptions/lexical-047.js index e809c241493e..f82104dd3c36 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-047.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-047.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-047.js'; /** File Name: lexical-047.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-048.js b/js/src/tests/ecma_2/Exceptions/lexical-048.js index 18054d43288e..58c3510db505 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-048.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-048.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-048.js'; /** File Name: lexical-048.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-049.js b/js/src/tests/ecma_2/Exceptions/lexical-049.js index e4ce84082941..68e98044e2ef 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-049.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-049.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-049.js'; /** File Name: lexical-049 diff --git a/js/src/tests/ecma_2/Exceptions/lexical-050.js b/js/src/tests/ecma_2/Exceptions/lexical-050.js index d9161c4b8f6e..1a63b726fb75 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-050.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-050.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-050.js'; /** File Name: lexical-050.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-051.js b/js/src/tests/ecma_2/Exceptions/lexical-051.js index 97ccbc6b43a9..746d2c222feb 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-051.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-051.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-051.js'; /** File Name: lexical-051.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-052.js b/js/src/tests/ecma_2/Exceptions/lexical-052.js index 20d2d3c254f0..7322b2d09a02 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-052.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-052.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-052.js'; /** File Name: lexical-052.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-053.js b/js/src/tests/ecma_2/Exceptions/lexical-053.js index 4e64fa1322b9..0cfde6e97d5c 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-053.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-053.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-053.js'; /** File Name: lexical-053.js diff --git a/js/src/tests/ecma_2/Exceptions/lexical-054.js b/js/src/tests/ecma_2/Exceptions/lexical-054.js index 3e25c36ef825..6f7fd04f47cb 100644 --- a/js/src/tests/ecma_2/Exceptions/lexical-054.js +++ b/js/src/tests/ecma_2/Exceptions/lexical-054.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'lexical-054.js'; /** File Name: lexical-054.js diff --git a/js/src/tests/ecma_2/Exceptions/number-001.js b/js/src/tests/ecma_2/Exceptions/number-001.js index eb49a5b9bd5e..181945364f31 100644 --- a/js/src/tests/ecma_2/Exceptions/number-001.js +++ b/js/src/tests/ecma_2/Exceptions/number-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'number-001.js'; /** File Name: number-001 diff --git a/js/src/tests/ecma_2/Exceptions/number-002.js b/js/src/tests/ecma_2/Exceptions/number-002.js index fef61fd527a2..ec7dd0501e34 100644 --- a/js/src/tests/ecma_2/Exceptions/number-002.js +++ b/js/src/tests/ecma_2/Exceptions/number-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'number-002.js'; /** File Name: number-002.js diff --git a/js/src/tests/ecma_2/Exceptions/number-003.js b/js/src/tests/ecma_2/Exceptions/number-003.js index 46920b707210..6b41b174712d 100644 --- a/js/src/tests/ecma_2/Exceptions/number-003.js +++ b/js/src/tests/ecma_2/Exceptions/number-003.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'number-003.js'; /** File Name: number-003.js diff --git a/js/src/tests/ecma_2/Exceptions/shell.js b/js/src/tests/ecma_2/Exceptions/shell.js index 6c671f1eea44..e69de29bb2d1 100644 --- a/js/src/tests/ecma_2/Exceptions/shell.js +++ b/js/src/tests/ecma_2/Exceptions/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Exceptions'; diff --git a/js/src/tests/ecma_2/Exceptions/statement-001.js b/js/src/tests/ecma_2/Exceptions/statement-001.js index 98e3d61a0c7e..786a360dba5a 100644 --- a/js/src/tests/ecma_2/Exceptions/statement-001.js +++ b/js/src/tests/ecma_2/Exceptions/statement-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'statement-001.js'; /** File Name: statement-001.js diff --git a/js/src/tests/ecma_2/Exceptions/statement-002.js b/js/src/tests/ecma_2/Exceptions/statement-002.js index da9931e9abb9..cb2e1be235af 100644 --- a/js/src/tests/ecma_2/Exceptions/statement-002.js +++ b/js/src/tests/ecma_2/Exceptions/statement-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'statement-002.js'; /** File Name: statement-002.js diff --git a/js/src/tests/ecma_2/Exceptions/statement-003.js b/js/src/tests/ecma_2/Exceptions/statement-003.js index d51083c4cf55..af317bea1c84 100644 --- a/js/src/tests/ecma_2/Exceptions/statement-003.js +++ b/js/src/tests/ecma_2/Exceptions/statement-003.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'statement-003.js'; /** File Name: statement-003 diff --git a/js/src/tests/ecma_2/Exceptions/statement-004.js b/js/src/tests/ecma_2/Exceptions/statement-004.js index 8b9789a92924..d726e248bb22 100644 --- a/js/src/tests/ecma_2/Exceptions/statement-004.js +++ b/js/src/tests/ecma_2/Exceptions/statement-004.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'statement-004.js'; /** File Name: statement-004.js diff --git a/js/src/tests/ecma_2/Exceptions/statement-005.js b/js/src/tests/ecma_2/Exceptions/statement-005.js index 62a8c45d9240..7f57bf4de4c8 100644 --- a/js/src/tests/ecma_2/Exceptions/statement-005.js +++ b/js/src/tests/ecma_2/Exceptions/statement-005.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'statement-005.js'; /** File Name: statement-005.js diff --git a/js/src/tests/ecma_2/Exceptions/statement-006.js b/js/src/tests/ecma_2/Exceptions/statement-006.js index ec5ba9757614..cc4c3dc24754 100644 --- a/js/src/tests/ecma_2/Exceptions/statement-006.js +++ b/js/src/tests/ecma_2/Exceptions/statement-006.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'statement-006.js'; /** File Name: statement-006.js diff --git a/js/src/tests/ecma_2/Exceptions/statement-007.js b/js/src/tests/ecma_2/Exceptions/statement-007.js index bb367c9924b0..994f6af1879d 100644 --- a/js/src/tests/ecma_2/Exceptions/statement-007.js +++ b/js/src/tests/ecma_2/Exceptions/statement-007.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'statement-007.js'; /** File Name: statement-007.js diff --git a/js/src/tests/ecma_2/Exceptions/statement-008.js b/js/src/tests/ecma_2/Exceptions/statement-008.js index 54ab39a9c992..9cfe4a778031 100644 --- a/js/src/tests/ecma_2/Exceptions/statement-008.js +++ b/js/src/tests/ecma_2/Exceptions/statement-008.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'statement-008.js'; /** File Name: statement-008.js diff --git a/js/src/tests/ecma_2/Exceptions/statement-009.js b/js/src/tests/ecma_2/Exceptions/statement-009.js index a63bd84e8e63..7a186f11a0e3 100644 --- a/js/src/tests/ecma_2/Exceptions/statement-009.js +++ b/js/src/tests/ecma_2/Exceptions/statement-009.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'statement-009.js'; /** File Name: 12.9-1-n.js diff --git a/js/src/tests/ecma_2/Exceptions/string-001.js b/js/src/tests/ecma_2/Exceptions/string-001.js index 551030db33f9..9af5c6a6fb96 100644 --- a/js/src/tests/ecma_2/Exceptions/string-001.js +++ b/js/src/tests/ecma_2/Exceptions/string-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'string-001.js'; /** File Name: string-001.js diff --git a/js/src/tests/ecma_2/Exceptions/string-002.js b/js/src/tests/ecma_2/Exceptions/string-002.js index 785e339080ac..bb75c4d1049a 100644 --- a/js/src/tests/ecma_2/Exceptions/string-002.js +++ b/js/src/tests/ecma_2/Exceptions/string-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'string-002.js'; /** File Name: string-002.js diff --git a/js/src/tests/ecma_2/Expressions/StrictEquality-001.js b/js/src/tests/ecma_2/Expressions/StrictEquality-001.js index db5c403d3d96..c9fc8250d125 100644 --- a/js/src/tests/ecma_2/Expressions/StrictEquality-001.js +++ b/js/src/tests/ecma_2/Expressions/StrictEquality-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'StrictEquality-001.js'; /** * File Name: StrictEquality-001.js diff --git a/js/src/tests/ecma_2/Expressions/shell.js b/js/src/tests/ecma_2/Expressions/shell.js index 8f5d1129d56e..e69de29bb2d1 100644 --- a/js/src/tests/ecma_2/Expressions/shell.js +++ b/js/src/tests/ecma_2/Expressions/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Expressions'; diff --git a/js/src/tests/ecma_2/FunctionObjects/apply-001-n.js b/js/src/tests/ecma_2/FunctionObjects/apply-001-n.js index e58d0871216f..046341acec83 100644 --- a/js/src/tests/ecma_2/FunctionObjects/apply-001-n.js +++ b/js/src/tests/ecma_2/FunctionObjects/apply-001-n.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'apply-001-n.js'; print("STATUS: f.apply crash test."); diff --git a/js/src/tests/ecma_2/FunctionObjects/call-1.js b/js/src/tests/ecma_2/FunctionObjects/call-1.js index 283e32379741..b025c5820532 100644 --- a/js/src/tests/ecma_2/FunctionObjects/call-1.js +++ b/js/src/tests/ecma_2/FunctionObjects/call-1.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'call-1.js'; /** File Name: call-1.js diff --git a/js/src/tests/ecma_2/FunctionObjects/shell.js b/js/src/tests/ecma_2/FunctionObjects/shell.js index 27aa7b1318d4..e69de29bb2d1 100644 --- a/js/src/tests/ecma_2/FunctionObjects/shell.js +++ b/js/src/tests/ecma_2/FunctionObjects/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'FunctionObjects'; diff --git a/js/src/tests/ecma_2/LexicalConventions/keywords-001.js b/js/src/tests/ecma_2/LexicalConventions/keywords-001.js index 7362613783fc..02a108695b64 100644 --- a/js/src/tests/ecma_2/LexicalConventions/keywords-001.js +++ b/js/src/tests/ecma_2/LexicalConventions/keywords-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'keywords-001.js'; /** * File Name: diff --git a/js/src/tests/ecma_2/LexicalConventions/regexp-literals-001.js b/js/src/tests/ecma_2/LexicalConventions/regexp-literals-001.js index caa50fe363c4..fd73a34fe671 100644 --- a/js/src/tests/ecma_2/LexicalConventions/regexp-literals-001.js +++ b/js/src/tests/ecma_2/LexicalConventions/regexp-literals-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regexp-literals-001.js'; /** * File Name: LexicalConventions/regexp-literals-001.js diff --git a/js/src/tests/ecma_2/LexicalConventions/regexp-literals-002.js b/js/src/tests/ecma_2/LexicalConventions/regexp-literals-002.js index 911b5d117a7a..6124d1a42d34 100644 --- a/js/src/tests/ecma_2/LexicalConventions/regexp-literals-002.js +++ b/js/src/tests/ecma_2/LexicalConventions/regexp-literals-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regexp-literals-002.js'; /** * File Name: LexicalConventions/regexp-literals-002.js diff --git a/js/src/tests/ecma_2/LexicalConventions/shell.js b/js/src/tests/ecma_2/LexicalConventions/shell.js index 4e1d61d68af6..e69de29bb2d1 100644 --- a/js/src/tests/ecma_2/LexicalConventions/shell.js +++ b/js/src/tests/ecma_2/LexicalConventions/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'LexicalConventions'; diff --git a/js/src/tests/ecma_2/RegExp/constructor-001.js b/js/src/tests/ecma_2/RegExp/constructor-001.js index f1dba13b06f0..92947b466a17 100644 --- a/js/src/tests/ecma_2/RegExp/constructor-001.js +++ b/js/src/tests/ecma_2/RegExp/constructor-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'constructor-001.js'; /** * File Name: RegExp/constructor-001.js diff --git a/js/src/tests/ecma_2/RegExp/exec-001.js b/js/src/tests/ecma_2/RegExp/exec-001.js index 2d1bab472cef..253ee092bef1 100644 --- a/js/src/tests/ecma_2/RegExp/exec-001.js +++ b/js/src/tests/ecma_2/RegExp/exec-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'exec-001.js'; /** * File Name: RegExp/exec-001.js diff --git a/js/src/tests/ecma_2/RegExp/exec-002.js b/js/src/tests/ecma_2/RegExp/exec-002.js index 026f27d9d468..e5cad1eeb19d 100644 --- a/js/src/tests/ecma_2/RegExp/exec-002.js +++ b/js/src/tests/ecma_2/RegExp/exec-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'exec-002.js'; /** * File Name: RegExp/exec-002.js diff --git a/js/src/tests/ecma_2/RegExp/function-001.js b/js/src/tests/ecma_2/RegExp/function-001.js index 8b219b935bbb..15eb56722646 100644 --- a/js/src/tests/ecma_2/RegExp/function-001.js +++ b/js/src/tests/ecma_2/RegExp/function-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'function-001.js'; /** * File Name: RegExp/function-001.js diff --git a/js/src/tests/ecma_2/RegExp/hex-001.js b/js/src/tests/ecma_2/RegExp/hex-001.js index 3e85ac7abf95..7d88f3521cb2 100644 --- a/js/src/tests/ecma_2/RegExp/hex-001.js +++ b/js/src/tests/ecma_2/RegExp/hex-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'hex-001.js'; /** * File Name: RegExp/hex-001.js diff --git a/js/src/tests/ecma_2/RegExp/multiline-001.js b/js/src/tests/ecma_2/RegExp/multiline-001.js index 102f91fcd440..c23023ae8176 100644 --- a/js/src/tests/ecma_2/RegExp/multiline-001.js +++ b/js/src/tests/ecma_2/RegExp/multiline-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'multiline-001.js'; /** * File Name: RegExp/multiline-001.js diff --git a/js/src/tests/ecma_2/RegExp/octal-001.js b/js/src/tests/ecma_2/RegExp/octal-001.js index 1c520750ceb3..63966faeb68a 100644 --- a/js/src/tests/ecma_2/RegExp/octal-001.js +++ b/js/src/tests/ecma_2/RegExp/octal-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'octal-001.js'; /** * File Name: RegExp/octal-001.js diff --git a/js/src/tests/ecma_2/RegExp/octal-002.js b/js/src/tests/ecma_2/RegExp/octal-002.js index b654e5e68a60..ff9a1f252f2e 100644 --- a/js/src/tests/ecma_2/RegExp/octal-002.js +++ b/js/src/tests/ecma_2/RegExp/octal-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'octal-002.js'; /** * File Name: RegExp/octal-002.js diff --git a/js/src/tests/ecma_2/RegExp/octal-003.js b/js/src/tests/ecma_2/RegExp/octal-003.js index ee07ca602bf4..cf560a9af4e0 100644 --- a/js/src/tests/ecma_2/RegExp/octal-003.js +++ b/js/src/tests/ecma_2/RegExp/octal-003.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'octal-003.js'; /** * File Name: RegExp/octal-003.js diff --git a/js/src/tests/ecma_2/RegExp/properties-001.js b/js/src/tests/ecma_2/RegExp/properties-001.js index 7d2913cc539d..393203b6ba0d 100644 --- a/js/src/tests/ecma_2/RegExp/properties-001.js +++ b/js/src/tests/ecma_2/RegExp/properties-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'properties-001.js'; /** * File Name: RegExp/properties-001.js diff --git a/js/src/tests/ecma_2/RegExp/properties-002.js b/js/src/tests/ecma_2/RegExp/properties-002.js index 1fcfd8d21901..d43df1ec77c4 100644 --- a/js/src/tests/ecma_2/RegExp/properties-002.js +++ b/js/src/tests/ecma_2/RegExp/properties-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'properties-002.js'; /** * File Name: RegExp/properties-002.js diff --git a/js/src/tests/ecma_2/RegExp/regexp-enumerate-001.js b/js/src/tests/ecma_2/RegExp/regexp-enumerate-001.js index c26a1216ea75..1ccad5ec92eb 100644 --- a/js/src/tests/ecma_2/RegExp/regexp-enumerate-001.js +++ b/js/src/tests/ecma_2/RegExp/regexp-enumerate-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regexp-enumerate-001.js'; /** File Name: regexp-enumerate-001.js diff --git a/js/src/tests/ecma_2/RegExp/regress-001.js b/js/src/tests/ecma_2/RegExp/regress-001.js index 219ce245eeb6..051aa24c7e78 100644 --- a/js/src/tests/ecma_2/RegExp/regress-001.js +++ b/js/src/tests/ecma_2/RegExp/regress-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-001.js'; /** * File Name: RegExp/regress-001.js diff --git a/js/src/tests/ecma_2/RegExp/shell.js b/js/src/tests/ecma_2/RegExp/shell.js index 9b4657d9636a..e69de29bb2d1 100644 --- a/js/src/tests/ecma_2/RegExp/shell.js +++ b/js/src/tests/ecma_2/RegExp/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'RegExp'; diff --git a/js/src/tests/ecma_2/RegExp/unicode-001.js b/js/src/tests/ecma_2/RegExp/unicode-001.js index 79a3212a2ebd..bbb0b964c134 100644 --- a/js/src/tests/ecma_2/RegExp/unicode-001.js +++ b/js/src/tests/ecma_2/RegExp/unicode-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'unicode-001.js'; /** * File Name: RegExp/unicode-001.js diff --git a/js/src/tests/ecma_2/Statements/dowhile-001.js b/js/src/tests/ecma_2/Statements/dowhile-001.js index 8cfdc25dd676..6a94c403a403 100644 --- a/js/src/tests/ecma_2/Statements/dowhile-001.js +++ b/js/src/tests/ecma_2/Statements/dowhile-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'dowhile-001.js'; /** * File Name: dowhile-001 diff --git a/js/src/tests/ecma_2/Statements/dowhile-002.js b/js/src/tests/ecma_2/Statements/dowhile-002.js index ca53dff899b9..125a8e324912 100644 --- a/js/src/tests/ecma_2/Statements/dowhile-002.js +++ b/js/src/tests/ecma_2/Statements/dowhile-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'dowhile-002.js'; /** * File Name: dowhile-002 diff --git a/js/src/tests/ecma_2/Statements/dowhile-003.js b/js/src/tests/ecma_2/Statements/dowhile-003.js index 598f655f8d03..3c2b8ff36828 100644 --- a/js/src/tests/ecma_2/Statements/dowhile-003.js +++ b/js/src/tests/ecma_2/Statements/dowhile-003.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'dowhile-003.js'; /** * File Name: dowhile-003 diff --git a/js/src/tests/ecma_2/Statements/dowhile-004.js b/js/src/tests/ecma_2/Statements/dowhile-004.js index eb8e0c1b72e8..51965f856c6d 100644 --- a/js/src/tests/ecma_2/Statements/dowhile-004.js +++ b/js/src/tests/ecma_2/Statements/dowhile-004.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'dowhile-004.js'; /** * File Name: dowhile-004 diff --git a/js/src/tests/ecma_2/Statements/dowhile-005.js b/js/src/tests/ecma_2/Statements/dowhile-005.js index e4096f0d25c0..8a5ded3fd735 100644 --- a/js/src/tests/ecma_2/Statements/dowhile-005.js +++ b/js/src/tests/ecma_2/Statements/dowhile-005.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'dowhile-005.js'; /** * File Name: dowhile-005 diff --git a/js/src/tests/ecma_2/Statements/dowhile-006.js b/js/src/tests/ecma_2/Statements/dowhile-006.js index c8ad46f6297f..21a8ba556469 100644 --- a/js/src/tests/ecma_2/Statements/dowhile-006.js +++ b/js/src/tests/ecma_2/Statements/dowhile-006.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'dowhile-006.js'; /** * File Name: dowhile-006 diff --git a/js/src/tests/ecma_2/Statements/dowhile-007.js b/js/src/tests/ecma_2/Statements/dowhile-007.js index 5d148095d13d..bbb0690cb4ca 100644 --- a/js/src/tests/ecma_2/Statements/dowhile-007.js +++ b/js/src/tests/ecma_2/Statements/dowhile-007.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'dowhile-007.js'; /** * File Name: dowhile-007 diff --git a/js/src/tests/ecma_2/Statements/forin-001.js b/js/src/tests/ecma_2/Statements/forin-001.js index 0f20f6e953b9..280f60f3f3e5 100644 --- a/js/src/tests/ecma_2/Statements/forin-001.js +++ b/js/src/tests/ecma_2/Statements/forin-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'forin-001.js'; /** * File Name: forin-001.js diff --git a/js/src/tests/ecma_2/Statements/forin-002.js b/js/src/tests/ecma_2/Statements/forin-002.js index 524bf38b9ac8..bb00ae9f2514 100644 --- a/js/src/tests/ecma_2/Statements/forin-002.js +++ b/js/src/tests/ecma_2/Statements/forin-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'forin-002.js'; /** * File Name: forin-002.js diff --git a/js/src/tests/ecma_2/Statements/if-001.js b/js/src/tests/ecma_2/Statements/if-001.js index 439410c9a661..4fdee986e639 100644 --- a/js/src/tests/ecma_2/Statements/if-001.js +++ b/js/src/tests/ecma_2/Statements/if-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'if-001.js'; /** * File Name: if-001.js diff --git a/js/src/tests/ecma_2/Statements/label-001.js b/js/src/tests/ecma_2/Statements/label-001.js index 07bdeb6b8180..a65d7362a7c6 100644 --- a/js/src/tests/ecma_2/Statements/label-001.js +++ b/js/src/tests/ecma_2/Statements/label-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'label-001.js'; /** * File Name: label-001.js diff --git a/js/src/tests/ecma_2/Statements/label-002.js b/js/src/tests/ecma_2/Statements/label-002.js index 83b114d3f24c..cffe3dc3d844 100644 --- a/js/src/tests/ecma_2/Statements/label-002.js +++ b/js/src/tests/ecma_2/Statements/label-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'label-002.js'; /** * File Name: label-002.js diff --git a/js/src/tests/ecma_2/Statements/shell.js b/js/src/tests/ecma_2/Statements/shell.js index 7346f697a5ba..e69de29bb2d1 100644 --- a/js/src/tests/ecma_2/Statements/shell.js +++ b/js/src/tests/ecma_2/Statements/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Statements'; diff --git a/js/src/tests/ecma_2/Statements/switch-001.js b/js/src/tests/ecma_2/Statements/switch-001.js index 22ab0a7b6009..17b3f231f334 100644 --- a/js/src/tests/ecma_2/Statements/switch-001.js +++ b/js/src/tests/ecma_2/Statements/switch-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'switch-001.js'; /** * File Name: switch-001.js diff --git a/js/src/tests/ecma_2/Statements/switch-002.js b/js/src/tests/ecma_2/Statements/switch-002.js index 6cb5491bebd2..9f3e1d36f079 100644 --- a/js/src/tests/ecma_2/Statements/switch-002.js +++ b/js/src/tests/ecma_2/Statements/switch-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'switch-002.js'; /** * File Name: switch-002.js diff --git a/js/src/tests/ecma_2/Statements/switch-003.js b/js/src/tests/ecma_2/Statements/switch-003.js index 27ed593bfe95..cbb9c69ee71d 100644 --- a/js/src/tests/ecma_2/Statements/switch-003.js +++ b/js/src/tests/ecma_2/Statements/switch-003.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'switch-003.js'; /** * File Name: switch-003.js diff --git a/js/src/tests/ecma_2/Statements/switch-004.js b/js/src/tests/ecma_2/Statements/switch-004.js index e7605222d6e8..558f3e161120 100644 --- a/js/src/tests/ecma_2/Statements/switch-004.js +++ b/js/src/tests/ecma_2/Statements/switch-004.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'switch-004.js'; /** * File Name: switch-003.js diff --git a/js/src/tests/ecma_2/Statements/try-001.js b/js/src/tests/ecma_2/Statements/try-001.js index 4631505434d5..34aa61f86e62 100644 --- a/js/src/tests/ecma_2/Statements/try-001.js +++ b/js/src/tests/ecma_2/Statements/try-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'try-001.js'; /** * File Name: try-001.js diff --git a/js/src/tests/ecma_2/Statements/try-003.js b/js/src/tests/ecma_2/Statements/try-003.js index 2c39aac2439e..068c6cecd092 100644 --- a/js/src/tests/ecma_2/Statements/try-003.js +++ b/js/src/tests/ecma_2/Statements/try-003.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'try-003.js'; /** * File Name: try-003.js diff --git a/js/src/tests/ecma_2/Statements/try-004.js b/js/src/tests/ecma_2/Statements/try-004.js index d41903de1816..e9dca0b74a13 100644 --- a/js/src/tests/ecma_2/Statements/try-004.js +++ b/js/src/tests/ecma_2/Statements/try-004.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'try-004.js'; /** * File Name: try-004.js diff --git a/js/src/tests/ecma_2/Statements/try-005.js b/js/src/tests/ecma_2/Statements/try-005.js index 0b9a05532575..39cfd4edf5d8 100644 --- a/js/src/tests/ecma_2/Statements/try-005.js +++ b/js/src/tests/ecma_2/Statements/try-005.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'try-005.js'; /** * File Name: try-005.js diff --git a/js/src/tests/ecma_2/Statements/try-006.js b/js/src/tests/ecma_2/Statements/try-006.js index 1cfbd28656da..f90d37336f3b 100644 --- a/js/src/tests/ecma_2/Statements/try-006.js +++ b/js/src/tests/ecma_2/Statements/try-006.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'try-006.js'; /** * File Name: try-006.js diff --git a/js/src/tests/ecma_2/Statements/try-007.js b/js/src/tests/ecma_2/Statements/try-007.js index 566166755c3f..ac2dbba38a74 100644 --- a/js/src/tests/ecma_2/Statements/try-007.js +++ b/js/src/tests/ecma_2/Statements/try-007.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'try-007.js'; /** * File Name: try-007.js diff --git a/js/src/tests/ecma_2/Statements/try-008.js b/js/src/tests/ecma_2/Statements/try-008.js index 016ab29a31f6..07cddc1614d4 100644 --- a/js/src/tests/ecma_2/Statements/try-008.js +++ b/js/src/tests/ecma_2/Statements/try-008.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'try-008.js'; /** * File Name: try-008.js diff --git a/js/src/tests/ecma_2/Statements/try-009.js b/js/src/tests/ecma_2/Statements/try-009.js index d6ce368638ac..ca52432f4dd0 100644 --- a/js/src/tests/ecma_2/Statements/try-009.js +++ b/js/src/tests/ecma_2/Statements/try-009.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'try-009.js'; /** * File Name: try-009.js diff --git a/js/src/tests/ecma_2/Statements/try-010.js b/js/src/tests/ecma_2/Statements/try-010.js index 27e712c8951e..2873efcfec4b 100644 --- a/js/src/tests/ecma_2/Statements/try-010.js +++ b/js/src/tests/ecma_2/Statements/try-010.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'try-010.js'; /** * File Name: try-010.js diff --git a/js/src/tests/ecma_2/Statements/try-012.js b/js/src/tests/ecma_2/Statements/try-012.js index 79dfca2f03df..3d7dbe44294e 100644 --- a/js/src/tests/ecma_2/Statements/try-012.js +++ b/js/src/tests/ecma_2/Statements/try-012.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'try-012.js'; /** * File Name: try-012.js diff --git a/js/src/tests/ecma_2/Statements/while-001.js b/js/src/tests/ecma_2/Statements/while-001.js index 467efe7f02aa..eb82dc7b65a9 100644 --- a/js/src/tests/ecma_2/Statements/while-001.js +++ b/js/src/tests/ecma_2/Statements/while-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'while-001.js'; /** * File Name: while-001 diff --git a/js/src/tests/ecma_2/Statements/while-002.js b/js/src/tests/ecma_2/Statements/while-002.js index c89e195497d4..d2684f62e3f5 100644 --- a/js/src/tests/ecma_2/Statements/while-002.js +++ b/js/src/tests/ecma_2/Statements/while-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'while-002.js'; /** * File Name: while-002 diff --git a/js/src/tests/ecma_2/Statements/while-003.js b/js/src/tests/ecma_2/Statements/while-003.js index 5fb734cce6c6..86ff7ee0d6c1 100644 --- a/js/src/tests/ecma_2/Statements/while-003.js +++ b/js/src/tests/ecma_2/Statements/while-003.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'while-003.js'; /** * File Name: while-003 diff --git a/js/src/tests/ecma_2/Statements/while-004.js b/js/src/tests/ecma_2/Statements/while-004.js index c5e24728168a..9927fa37ba7e 100644 --- a/js/src/tests/ecma_2/Statements/while-004.js +++ b/js/src/tests/ecma_2/Statements/while-004.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'while-004.js'; /** * File Name: while-004 diff --git a/js/src/tests/ecma_2/String/match-001.js b/js/src/tests/ecma_2/String/match-001.js index de2275b5d640..ed78106f8bf8 100644 --- a/js/src/tests/ecma_2/String/match-001.js +++ b/js/src/tests/ecma_2/String/match-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'match-001.js'; /** * File Name: String/match-001.js diff --git a/js/src/tests/ecma_2/String/match-002.js b/js/src/tests/ecma_2/String/match-002.js index a57da2f77f44..f7da46973ed1 100644 --- a/js/src/tests/ecma_2/String/match-002.js +++ b/js/src/tests/ecma_2/String/match-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'match-002.js'; /** * File Name: String/match-002.js diff --git a/js/src/tests/ecma_2/String/match-003.js b/js/src/tests/ecma_2/String/match-003.js index cd3d80c9192c..8282f2b51547 100644 --- a/js/src/tests/ecma_2/String/match-003.js +++ b/js/src/tests/ecma_2/String/match-003.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'match-003.js'; /** * File Name: String/match-003.js diff --git a/js/src/tests/ecma_2/String/match-004.js b/js/src/tests/ecma_2/String/match-004.js index 5c26de8b6124..d2973ae65f19 100644 --- a/js/src/tests/ecma_2/String/match-004.js +++ b/js/src/tests/ecma_2/String/match-004.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'match-004.js'; /** * File Name: String/match-004.js diff --git a/js/src/tests/ecma_2/String/replace-001.js b/js/src/tests/ecma_2/String/replace-001.js index f0ae3cdbfa39..d975f34a64c6 100644 --- a/js/src/tests/ecma_2/String/replace-001.js +++ b/js/src/tests/ecma_2/String/replace-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'replace-001.js'; /** * File Name: String/replace-001.js diff --git a/js/src/tests/ecma_2/String/shell.js b/js/src/tests/ecma_2/String/shell.js index 7d850446cce8..e69de29bb2d1 100644 --- a/js/src/tests/ecma_2/String/shell.js +++ b/js/src/tests/ecma_2/String/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'String'; diff --git a/js/src/tests/ecma_2/String/split-001.js b/js/src/tests/ecma_2/String/split-001.js index bbab3b04280e..c022f1b805ed 100644 --- a/js/src/tests/ecma_2/String/split-001.js +++ b/js/src/tests/ecma_2/String/split-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'split-001.js'; /** * File Name: String/split-001.js diff --git a/js/src/tests/ecma_2/String/split-002.js b/js/src/tests/ecma_2/String/split-002.js index 9ae000790e6f..fc405bc3d711 100644 --- a/js/src/tests/ecma_2/String/split-002.js +++ b/js/src/tests/ecma_2/String/split-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'split-002.js'; /** * File Name: String/split-002.js diff --git a/js/src/tests/ecma_2/String/split-003.js b/js/src/tests/ecma_2/String/split-003.js index 5029fc98f916..03ef4b685331 100644 --- a/js/src/tests/ecma_2/String/split-003.js +++ b/js/src/tests/ecma_2/String/split-003.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'split-003.js'; /** * File Name: String/split-003.js diff --git a/js/src/tests/ecma_2/extensions/constructor-001.js b/js/src/tests/ecma_2/extensions/constructor-001.js index cc7907d006c4..a7681bdfcb4a 100644 --- a/js/src/tests/ecma_2/extensions/constructor-001.js +++ b/js/src/tests/ecma_2/extensions/constructor-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'constructor-001.js'; /** * File Name: RegExp/constructor-001.js diff --git a/js/src/tests/ecma_2/extensions/function-001.js b/js/src/tests/ecma_2/extensions/function-001.js index 5153d25f9d83..c8a91cf65fb7 100644 --- a/js/src/tests/ecma_2/extensions/function-001.js +++ b/js/src/tests/ecma_2/extensions/function-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'function-001.js'; /** * File Name: RegExp/function-001.js diff --git a/js/src/tests/ecma_2/extensions/instanceof-001.js b/js/src/tests/ecma_2/extensions/instanceof-001.js index 8ea446a24852..285b92e3a455 100644 --- a/js/src/tests/ecma_2/extensions/instanceof-001.js +++ b/js/src/tests/ecma_2/extensions/instanceof-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'instanceof-001.js'; /** * File Name: instanceof-001.js diff --git a/js/src/tests/ecma_2/extensions/instanceof-002.js b/js/src/tests/ecma_2/extensions/instanceof-002.js index 9cc837d8ef2c..11a63e621feb 100644 --- a/js/src/tests/ecma_2/extensions/instanceof-002.js +++ b/js/src/tests/ecma_2/extensions/instanceof-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'instanceof-002.js'; /** File Name: instanceof-002.js diff --git a/js/src/tests/ecma_2/extensions/instanceof-003-n.js b/js/src/tests/ecma_2/extensions/instanceof-003-n.js index 7a763a895c29..70282d8a8c74 100644 --- a/js/src/tests/ecma_2/extensions/instanceof-003-n.js +++ b/js/src/tests/ecma_2/extensions/instanceof-003-n.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'instanceof-003-n.js'; /** * File Name: instanceof-001.js diff --git a/js/src/tests/ecma_2/extensions/instanceof-004-n.js b/js/src/tests/ecma_2/extensions/instanceof-004-n.js index 1662ae566b66..428963a90c44 100644 --- a/js/src/tests/ecma_2/extensions/instanceof-004-n.js +++ b/js/src/tests/ecma_2/extensions/instanceof-004-n.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'instanceof-004-n.js'; /** * File Name: instanceof-001.js diff --git a/js/src/tests/ecma_2/extensions/instanceof-005-n.js b/js/src/tests/ecma_2/extensions/instanceof-005-n.js index 1a9b1b34379f..d9e930f374d4 100644 --- a/js/src/tests/ecma_2/extensions/instanceof-005-n.js +++ b/js/src/tests/ecma_2/extensions/instanceof-005-n.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'instanceof-005-n.js'; /** * File Name: instanceof-001.js diff --git a/js/src/tests/ecma_2/extensions/instanceof-006.js b/js/src/tests/ecma_2/extensions/instanceof-006.js index 03c0f16fb9fa..4ec2c30c6673 100644 --- a/js/src/tests/ecma_2/extensions/instanceof-006.js +++ b/js/src/tests/ecma_2/extensions/instanceof-006.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'instanceof-006.js'; /** * File Name: instanceof-001.js diff --git a/js/src/tests/ecma_2/extensions/shell.js b/js/src/tests/ecma_2/extensions/shell.js index 3f52cffbc059..e69de29bb2d1 100644 --- a/js/src/tests/ecma_2/extensions/shell.js +++ b/js/src/tests/ecma_2/extensions/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'extensions'; diff --git a/js/src/tests/ecma_2/instanceof/instanceof-001.js b/js/src/tests/ecma_2/instanceof/instanceof-001.js index 39ae96fa5be0..0fac237839fb 100644 --- a/js/src/tests/ecma_2/instanceof/instanceof-001.js +++ b/js/src/tests/ecma_2/instanceof/instanceof-001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'instanceof-001.js'; /** File Name: instanceof-1.js diff --git a/js/src/tests/ecma_2/instanceof/instanceof-002.js b/js/src/tests/ecma_2/instanceof/instanceof-002.js index c35fcb04867b..73f328d3ed21 100644 --- a/js/src/tests/ecma_2/instanceof/instanceof-002.js +++ b/js/src/tests/ecma_2/instanceof/instanceof-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'instanceof-002.js'; /** File Name: diff --git a/js/src/tests/ecma_2/instanceof/instanceof-003.js b/js/src/tests/ecma_2/instanceof/instanceof-003.js index 6c1279f86545..cb90b1977098 100644 --- a/js/src/tests/ecma_2/instanceof/instanceof-003.js +++ b/js/src/tests/ecma_2/instanceof/instanceof-003.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'instanceof-003.js'; /** File Name: instanceof-003.js diff --git a/js/src/tests/ecma_2/instanceof/regress-7635.js b/js/src/tests/ecma_2/instanceof/regress-7635.js index c643920b04c4..8252b3213ecf 100644 --- a/js/src/tests/ecma_2/instanceof/regress-7635.js +++ b/js/src/tests/ecma_2/instanceof/regress-7635.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-7635.js'; /** * File Name: regress-7635.js diff --git a/js/src/tests/ecma_2/instanceof/shell.js b/js/src/tests/ecma_2/instanceof/shell.js index b390356c38b2..e69de29bb2d1 100644 --- a/js/src/tests/ecma_2/instanceof/shell.js +++ b/js/src/tests/ecma_2/instanceof/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'instanceof'; diff --git a/js/src/tests/ecma_2/shell.js b/js/src/tests/ecma_2/shell.js index a83dd68ec2f2..d992cdf70763 100644 --- a/js/src/tests/ecma_2/shell.js +++ b/js/src/tests/ecma_2/shell.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestsuite = 'ecma_2'; var TZ_DIFF = getTimeZoneDiff(); diff --git a/js/src/tests/ecma_2/template.js b/js/src/tests/ecma_2/template.js index 4586082bdd71..c922c8207d69 100644 --- a/js/src/tests/ecma_2/template.js +++ b/js/src/tests/ecma_2/template.js @@ -5,7 +5,6 @@ * Contributor: */ -gTestfile = 'template.js'; /** * File Name: template.js diff --git a/js/src/tests/ecma_3/Array/15.4.4.11-01.js b/js/src/tests/ecma_3/Array/15.4.4.11-01.js index 0436b8c1e0c4..ae6359785123 100644 --- a/js/src/tests/ecma_3/Array/15.4.4.11-01.js +++ b/js/src/tests/ecma_3/Array/15.4.4.11-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '15.4.4.11-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 312138; var summary = 'Array.sort should not eat exceptions'; diff --git a/js/src/tests/ecma_3/Array/15.4.4.3-1.js b/js/src/tests/ecma_3/Array/15.4.4.3-1.js index e3de6fb11651..7b25234440a0 100644 --- a/js/src/tests/ecma_3/Array/15.4.4.3-1.js +++ b/js/src/tests/ecma_3/Array/15.4.4.3-1.js @@ -56,7 +56,6 @@ * end value of this variable should be myArray.length. */ //----------------------------------------------------------------------------- -var gTestfile = '15.4.4.3-1.js'; var BUGNUMBER = 56883; var summary = 'Testing Array.prototype.toLocaleString() -'; var actual = ''; diff --git a/js/src/tests/ecma_3/Array/15.4.4.4-001.js b/js/src/tests/ecma_3/Array/15.4.4.4-001.js index b87233ea9731..f2929600a6c5 100644 --- a/js/src/tests/ecma_3/Array/15.4.4.4-001.js +++ b/js/src/tests/ecma_3/Array/15.4.4.4-001.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = '15.4.4.4-001.js'; var UBound = 0; var BUGNUMBER = 169795; var summary = 'Testing Array.prototype.concat()'; diff --git a/js/src/tests/ecma_3/Array/15.4.5.1-01.js b/js/src/tests/ecma_3/Array/15.4.5.1-01.js index b55430b44e2e..c2c0410ed4a0 100644 --- a/js/src/tests/ecma_3/Array/15.4.5.1-01.js +++ b/js/src/tests/ecma_3/Array/15.4.5.1-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '15.4.5.1-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = "(none)"; var summary = '15.4.5.1 - array.length coverage'; diff --git a/js/src/tests/ecma_3/Array/15.5.4.8-01.js b/js/src/tests/ecma_3/Array/15.5.4.8-01.js index 6ec11fa1f536..960958c0d28e 100644 --- a/js/src/tests/ecma_3/Array/15.5.4.8-01.js +++ b/js/src/tests/ecma_3/Array/15.5.4.8-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '15.5.4.8-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 480096; var summary = 'Array.lastIndexOf'; diff --git a/js/src/tests/ecma_3/Array/regress-101488.js b/js/src/tests/ecma_3/Array/regress-101488.js index 15a455629832..10da28e0306a 100644 --- a/js/src/tests/ecma_3/Array/regress-101488.js +++ b/js/src/tests/ecma_3/Array/regress-101488.js @@ -54,7 +54,6 @@ * be thrown only if ToUint32(length_value) != ToNumber(length_value) */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-101488.js'; var UBound = 0; var BUGNUMBER = 101488; var summary = 'Try assigning arr.length = new Number(n)'; diff --git a/js/src/tests/ecma_3/Array/regress-130451.js b/js/src/tests/ecma_3/Array/regress-130451.js index a738bf63565d..88839fd609f5 100644 --- a/js/src/tests/ecma_3/Array/regress-130451.js +++ b/js/src/tests/ecma_3/Array/regress-130451.js @@ -54,7 +54,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-130451.js'; var UBound = 0; var BUGNUMBER = 130451; var summary = 'Array.prototype.sort() should not (re-)define .length'; diff --git a/js/src/tests/ecma_3/Array/regress-322135-01.js b/js/src/tests/ecma_3/Array/regress-322135-01.js index 4e277e6da5d9..a5feb499d166 100644 --- a/js/src/tests/ecma_3/Array/regress-322135-01.js +++ b/js/src/tests/ecma_3/Array/regress-322135-01.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-322135-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 322135; var summary = 'Array.prototype.push on Array with length 2^32-1'; diff --git a/js/src/tests/ecma_3/Array/regress-322135-02.js b/js/src/tests/ecma_3/Array/regress-322135-02.js index ee426a0cecd7..c1950ef18aae 100644 --- a/js/src/tests/ecma_3/Array/regress-322135-02.js +++ b/js/src/tests/ecma_3/Array/regress-322135-02.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-322135-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 322135; var summary = 'Array.prototype.concat on Array with length 2^32-1'; diff --git a/js/src/tests/ecma_3/Array/regress-322135-03.js b/js/src/tests/ecma_3/Array/regress-322135-03.js index 95ee7f7a927d..6f5b04cd28ad 100644 --- a/js/src/tests/ecma_3/Array/regress-322135-03.js +++ b/js/src/tests/ecma_3/Array/regress-322135-03.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-322135-03.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 322135; var summary = 'Array.prototype.splice on Array with length 2^32-1'; diff --git a/js/src/tests/ecma_3/Array/regress-322135-04.js b/js/src/tests/ecma_3/Array/regress-322135-04.js index fe9f8fc71e9f..f2ebc8557294 100644 --- a/js/src/tests/ecma_3/Array/regress-322135-04.js +++ b/js/src/tests/ecma_3/Array/regress-322135-04.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-322135-04.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 322135; var summary = 'Array.prototype.unshift on Array with length 2^32-1'; diff --git a/js/src/tests/ecma_3/Array/regress-387501.js b/js/src/tests/ecma_3/Array/regress-387501.js index fa1ab0fe863b..6aa9ab4c910a 100644 --- a/js/src/tests/ecma_3/Array/regress-387501.js +++ b/js/src/tests/ecma_3/Array/regress-387501.js @@ -35,8 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-387501.js'; - //----------------------------------------------------------------------------- var BUGNUMBER = 387501; var summary = diff --git a/js/src/tests/ecma_3/Array/regress-390598.js b/js/src/tests/ecma_3/Array/regress-390598.js index cb7ebcf0d99d..285761474a4f 100755 --- a/js/src/tests/ecma_3/Array/regress-390598.js +++ b/js/src/tests/ecma_3/Array/regress-390598.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-390598.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 390598; diff --git a/js/src/tests/ecma_3/Array/regress-421325.js b/js/src/tests/ecma_3/Array/regress-421325.js index c869d7bff474..91ac0d4abc73 100644 --- a/js/src/tests/ecma_3/Array/regress-421325.js +++ b/js/src/tests/ecma_3/Array/regress-421325.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-421325.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 421325; var summary = 'Dense Arrays and holes'; diff --git a/js/src/tests/ecma_3/Array/regress-430717.js b/js/src/tests/ecma_3/Array/regress-430717.js index f750ffb4498f..67d3f695e37b 100644 --- a/js/src/tests/ecma_3/Array/regress-430717.js +++ b/js/src/tests/ecma_3/Array/regress-430717.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-430717.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 430717; var summary = 'Dense Arrays should inherit deleted elements from Array.prototype'; diff --git a/js/src/tests/ecma_3/Array/regress-488989.js b/js/src/tests/ecma_3/Array/regress-488989.js index 40d63efa30e4..876a26b74847 100755 --- a/js/src/tests/ecma_3/Array/regress-488989.js +++ b/js/src/tests/ecma_3/Array/regress-488989.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-488989.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 488989; var summary = 'Array.prototype.push for non-arrays near max-array-index limit'; diff --git a/js/src/tests/ecma_3/Array/shell.js b/js/src/tests/ecma_3/Array/shell.js index 9480d9e77dae..e69de29bb2d1 100644 --- a/js/src/tests/ecma_3/Array/shell.js +++ b/js/src/tests/ecma_3/Array/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Array'; diff --git a/js/src/tests/ecma_3/Date/15.9.1.2-01.js b/js/src/tests/ecma_3/Date/15.9.1.2-01.js index 61b1de6ef114..c894578a7606 100644 --- a/js/src/tests/ecma_3/Date/15.9.1.2-01.js +++ b/js/src/tests/ecma_3/Date/15.9.1.2-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '15.9.1.2-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 264727; var summary = '15.9.1.2 - TimeWithinDay(TIME_1900) == 0'; diff --git a/js/src/tests/ecma_3/Date/15.9.3.2-1.js b/js/src/tests/ecma_3/Date/15.9.3.2-1.js index c36679b5d931..687c3e003400 100644 --- a/js/src/tests/ecma_3/Date/15.9.3.2-1.js +++ b/js/src/tests/ecma_3/Date/15.9.3.2-1.js @@ -5,7 +5,6 @@ * Contributor: Bob Clary */ -var gTestfile = '15.9.3.2-1.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 273292; var summary = '15.9.3.2 new Date(value)'; diff --git a/js/src/tests/ecma_3/Date/15.9.4.3.js b/js/src/tests/ecma_3/Date/15.9.4.3.js index dcd6c1ef4098..e4483f8a2f23 100644 --- a/js/src/tests/ecma_3/Date/15.9.4.3.js +++ b/js/src/tests/ecma_3/Date/15.9.4.3.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '15.9.4.3.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 363578; var summary = '15.9.4.3 - Date.UTC edge-case arguments.'; diff --git a/js/src/tests/ecma_3/Date/15.9.5.3.js b/js/src/tests/ecma_3/Date/15.9.5.3.js index 6704f1fcad00..9bdc81408626 100644 --- a/js/src/tests/ecma_3/Date/15.9.5.3.js +++ b/js/src/tests/ecma_3/Date/15.9.5.3.js @@ -54,7 +54,6 @@ Date: 14 november 2000 (adapted from ecma/Date/15.9.5.2.js) */ -var gTestfile = '15.9.5.3.js'; var SECTION = "15.9.5.3"; var VERSION = "ECMA_3"; var TITLE = "Date.prototype.toDateString()"; diff --git a/js/src/tests/ecma_3/Date/15.9.5.4.js b/js/src/tests/ecma_3/Date/15.9.5.4.js index a2643bfe3c4d..c8640a66f5f1 100644 --- a/js/src/tests/ecma_3/Date/15.9.5.4.js +++ b/js/src/tests/ecma_3/Date/15.9.5.4.js @@ -54,7 +54,6 @@ See http://bugzilla.mozilla.org/show_bug.cgi?id=118636 (Rhino) */ //----------------------------------------------------------------------------- -var gTestfile = '15.9.5.4.js'; var SECTION = "15.9.5.4"; var VERSION = "ECMA_3"; var TITLE = "Date.prototype.toTimeString()"; diff --git a/js/src/tests/ecma_3/Date/15.9.5.5-02.js b/js/src/tests/ecma_3/Date/15.9.5.5-02.js index e3b073e7ecde..b8691cd850e3 100644 --- a/js/src/tests/ecma_3/Date/15.9.5.5-02.js +++ b/js/src/tests/ecma_3/Date/15.9.5.5-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '15.9.5.5-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 398485; var summary = 'Date.prototype.toLocaleString should not clamp year'; diff --git a/js/src/tests/ecma_3/Date/15.9.5.5.js b/js/src/tests/ecma_3/Date/15.9.5.5.js index 2b76fdcfc236..a72f1bb85080 100644 --- a/js/src/tests/ecma_3/Date/15.9.5.5.js +++ b/js/src/tests/ecma_3/Date/15.9.5.5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '15.9.5.5.js'; /** File Name: 15.9.5.5.js diff --git a/js/src/tests/ecma_3/Date/15.9.5.6.js b/js/src/tests/ecma_3/Date/15.9.5.6.js index 004fbce2e0d8..d68d76e4dce1 100644 --- a/js/src/tests/ecma_3/Date/15.9.5.6.js +++ b/js/src/tests/ecma_3/Date/15.9.5.6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '15.9.5.6.js'; /** File Name: 15.9.5.6.js @@ -127,7 +126,7 @@ test(); function addTestCase() { new TestCase( - gTestfile, + "unknown-test-name", status, expect, actual); diff --git a/js/src/tests/ecma_3/Date/15.9.5.7.js b/js/src/tests/ecma_3/Date/15.9.5.7.js index 00d254180368..79303cd76b63 100644 --- a/js/src/tests/ecma_3/Date/15.9.5.7.js +++ b/js/src/tests/ecma_3/Date/15.9.5.7.js @@ -58,7 +58,6 @@ See http://bugzilla.mozilla.org/show_bug.cgi?id=118636 (Rhino) */ //----------------------------------------------------------------------------- -var gTestfile = '15.9.5.7.js'; var SECTION = "15.9.5.7"; var VERSION = "ECMA_3"; var TITLE = "Date.prototype.toLocaleTimeString()"; diff --git a/js/src/tests/ecma_3/Date/regress-452786.js b/js/src/tests/ecma_3/Date/regress-452786.js index 7f842a2bfc0a..746e056d546f 100644 --- a/js/src/tests/ecma_3/Date/regress-452786.js +++ b/js/src/tests/ecma_3/Date/regress-452786.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-452786.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 452786; var summary = 'Do not crash with (new Date()).getMonth.call(new Function())'; diff --git a/js/src/tests/ecma_3/Date/shell.js b/js/src/tests/ecma_3/Date/shell.js index 6111c3b9348b..e6c67ca26a84 100644 --- a/js/src/tests/ecma_3/Date/shell.js +++ b/js/src/tests/ecma_3/Date/shell.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestsubsuite = 'Date'; /* * Date functions used by tests in Date suite @@ -84,7 +83,7 @@ function adjustResultArray(ResultArray, msMode) // If the tester's system clock is in PST, no need to continue - if (!PST_DIFF) {return;} - /* The date gTestcases instantiate Date objects in two different ways: + /* The date testcases instantiate Date objects in two different ways: * * millisecond mode: e.g. dt = new Date(10000000); * year-month-day mode: dt = new Date(2000, 5, 1, ...); diff --git a/js/src/tests/ecma_3/Exceptions/15.11.1.1.js b/js/src/tests/ecma_3/Exceptions/15.11.1.1.js index 6910d76f154c..3703bca4c37c 100644 --- a/js/src/tests/ecma_3/Exceptions/15.11.1.1.js +++ b/js/src/tests/ecma_3/Exceptions/15.11.1.1.js @@ -42,7 +42,6 @@ * SUMMARY: Ensuring normal function call of Error (ECMA-262 Ed.3 15.11.1.1). */ //----------------------------------------------------------------------------- -var gTestfile = '15.11.1.1.js'; var UBound = 0; var BUGNUMBER = ''; var summary = 'Ensuring normal function call of Error (ECMA-262 Ed.3 15.11.1.1)'; diff --git a/js/src/tests/ecma_3/Exceptions/15.11.4.4-1.js b/js/src/tests/ecma_3/Exceptions/15.11.4.4-1.js index 00f950304192..c529ed0d6a02 100644 --- a/js/src/tests/ecma_3/Exceptions/15.11.4.4-1.js +++ b/js/src/tests/ecma_3/Exceptions/15.11.4.4-1.js @@ -72,7 +72,6 @@ * See also ECMA 15.11.4.2, 15.11.4.3 */ //----------------------------------------------------------------------------- -var gTestfile = '15.11.4.4-1.js'; var UBound = 0; var BUGNUMBER = '(none)'; var summary = 'Testing Error.prototype.toString()'; diff --git a/js/src/tests/ecma_3/Exceptions/15.11.7.6-001.js b/js/src/tests/ecma_3/Exceptions/15.11.7.6-001.js index c6248cc7c1e6..06f6d761b167 100644 --- a/js/src/tests/ecma_3/Exceptions/15.11.7.6-001.js +++ b/js/src/tests/ecma_3/Exceptions/15.11.7.6-001.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = '15.11.7.6-001.js'; var UBound = 0; var BUGNUMBER = 201989; var summary = 'Prototype of predefined error objects should be DontEnum'; diff --git a/js/src/tests/ecma_3/Exceptions/15.11.7.6-002.js b/js/src/tests/ecma_3/Exceptions/15.11.7.6-002.js index a9da1c4e4e26..b57569da1063 100644 --- a/js/src/tests/ecma_3/Exceptions/15.11.7.6-002.js +++ b/js/src/tests/ecma_3/Exceptions/15.11.7.6-002.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = '15.11.7.6-002.js'; var UBound = 0; var BUGNUMBER = 201989; var summary = 'Prototype of predefined error objects should be DontDelete'; diff --git a/js/src/tests/ecma_3/Exceptions/15.11.7.6-003.js b/js/src/tests/ecma_3/Exceptions/15.11.7.6-003.js index af45b2112d39..88e57353c861 100644 --- a/js/src/tests/ecma_3/Exceptions/15.11.7.6-003.js +++ b/js/src/tests/ecma_3/Exceptions/15.11.7.6-003.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = '15.11.7.6-003.js'; var UBound = 0; var BUGNUMBER = 201989; var summary = 'Prototype of predefined error objects should be ReadOnly'; diff --git a/js/src/tests/ecma_3/Exceptions/binding-001.js b/js/src/tests/ecma_3/Exceptions/binding-001.js index ea2dd6042f65..b583c26dbf9c 100644 --- a/js/src/tests/ecma_3/Exceptions/binding-001.js +++ b/js/src/tests/ecma_3/Exceptions/binding-001.js @@ -52,7 +52,6 @@ */ //----------------------------------------------------------------------------- -var gTestfile = 'binding-001.js'; var UBound = 0; var BUGNUMBER = '(none)'; var summary = 'Testing binding of function names'; diff --git a/js/src/tests/ecma_3/Exceptions/regress-181654.js b/js/src/tests/ecma_3/Exceptions/regress-181654.js index 3fe80f15ac6c..8285fb128e43 100644 --- a/js/src/tests/ecma_3/Exceptions/regress-181654.js +++ b/js/src/tests/ecma_3/Exceptions/regress-181654.js @@ -44,7 +44,6 @@ * See http://bugzilla.mozilla.org/show_bug.cgi?id=181654 */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-181654.js'; var UBound = 0; var BUGNUMBER = '181654'; var summary = 'Calling toString for an object derived from the Error class should be possible.'; diff --git a/js/src/tests/ecma_3/Exceptions/regress-181914.js b/js/src/tests/ecma_3/Exceptions/regress-181914.js index f4d1f224c88f..c882e992a2a1 100644 --- a/js/src/tests/ecma_3/Exceptions/regress-181914.js +++ b/js/src/tests/ecma_3/Exceptions/regress-181914.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-181914.js'; var UBound = 0; var BUGNUMBER = '181914'; var summary = 'Calling a user-defined superconstructor'; diff --git a/js/src/tests/ecma_3/Exceptions/regress-58946.js b/js/src/tests/ecma_3/Exceptions/regress-58946.js index 97212c88a02d..1929eeb02244 100644 --- a/js/src/tests/ecma_3/Exceptions/regress-58946.js +++ b/js/src/tests/ecma_3/Exceptions/regress-58946.js @@ -37,7 +37,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-58946.js'; //------------------------------------------------------------------------------------------------- var BUGNUMBER = '58946'; var stat = 'Testing a return statement inside a catch statement inside a function'; diff --git a/js/src/tests/ecma_3/Exceptions/regress-95101.js b/js/src/tests/ecma_3/Exceptions/regress-95101.js index b7ef074350e1..130edc695bfa 100644 --- a/js/src/tests/ecma_3/Exceptions/regress-95101.js +++ b/js/src/tests/ecma_3/Exceptions/regress-95101.js @@ -43,7 +43,6 @@ * See http://bugzilla.mozilla.org/show_bug.cgi?id=95101 */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-95101.js'; var UBound = 0; var BUGNUMBER = 95101; var summary = 'Invoking an undefined function should produce a ReferenceError'; diff --git a/js/src/tests/ecma_3/Exceptions/shell.js b/js/src/tests/ecma_3/Exceptions/shell.js index 6c671f1eea44..e69de29bb2d1 100644 --- a/js/src/tests/ecma_3/Exceptions/shell.js +++ b/js/src/tests/ecma_3/Exceptions/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Exceptions'; diff --git a/js/src/tests/ecma_3/ExecutionContexts/10.1.3-1.js b/js/src/tests/ecma_3/ExecutionContexts/10.1.3-1.js index 1e7e0254bf64..60fea610b7ea 100644 --- a/js/src/tests/ecma_3/ExecutionContexts/10.1.3-1.js +++ b/js/src/tests/ecma_3/ExecutionContexts/10.1.3-1.js @@ -47,7 +47,6 @@ * Also see http://bugzilla.mozilla.org/show_bug.cgi?id=124900 */ //----------------------------------------------------------------------------- -var gTestfile = '10.1.3-1.js'; var UBound = 0; var BUGNUMBER = 124900; var summary = 'Testing functions having duplicate formal parameter names'; diff --git a/js/src/tests/ecma_3/ExecutionContexts/10.1.3-2.js b/js/src/tests/ecma_3/ExecutionContexts/10.1.3-2.js index b2e22e6c5515..b2e744fdf704 100644 --- a/js/src/tests/ecma_3/ExecutionContexts/10.1.3-2.js +++ b/js/src/tests/ecma_3/ExecutionContexts/10.1.3-2.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '10.1.3-2.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 395907; var summary = 'eval of function declaration should change existing variable'; diff --git a/js/src/tests/ecma_3/ExecutionContexts/10.1.3.js b/js/src/tests/ecma_3/ExecutionContexts/10.1.3.js index 45a81f1f3aca..70b4d228f0b4 100644 --- a/js/src/tests/ecma_3/ExecutionContexts/10.1.3.js +++ b/js/src/tests/ecma_3/ExecutionContexts/10.1.3.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '10.1.3.js'; /** ECMA Section: 10.1.3: Variable Instantiation diff --git a/js/src/tests/ecma_3/ExecutionContexts/10.1.4-1.js b/js/src/tests/ecma_3/ExecutionContexts/10.1.4-1.js index 896841fa29ea..c28f98c37958 100644 --- a/js/src/tests/ecma_3/ExecutionContexts/10.1.4-1.js +++ b/js/src/tests/ecma_3/ExecutionContexts/10.1.4-1.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '10.1.4-1.js'; /** ECMA Section: 10.1.4.1 Entering An Execution Context diff --git a/js/src/tests/ecma_3/ExecutionContexts/10.6.1-01.js b/js/src/tests/ecma_3/ExecutionContexts/10.6.1-01.js index 6fbe85e19f25..754c1f67ab67 100644 --- a/js/src/tests/ecma_3/ExecutionContexts/10.6.1-01.js +++ b/js/src/tests/ecma_3/ExecutionContexts/10.6.1-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '10.6.1-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 290774; var summary = 'activation object never delegates to Object.prototype'; diff --git a/js/src/tests/ecma_3/ExecutionContexts/regress-23346.js b/js/src/tests/ecma_3/ExecutionContexts/regress-23346.js index 6283d886f017..e814cc3a84be 100644 --- a/js/src/tests/ecma_3/ExecutionContexts/regress-23346.js +++ b/js/src/tests/ecma_3/ExecutionContexts/regress-23346.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-23346.js'; var CALL_CALLED = "PASSED"; diff --git a/js/src/tests/ecma_3/ExecutionContexts/regress-448595-01.js b/js/src/tests/ecma_3/ExecutionContexts/regress-448595-01.js index f303199b514d..b01e20b7f1a3 100644 --- a/js/src/tests/ecma_3/ExecutionContexts/regress-448595-01.js +++ b/js/src/tests/ecma_3/ExecutionContexts/regress-448595-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-448595-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 448595; var summary = 'scope chain var declaration with initialiser in |with| clauses'; diff --git a/js/src/tests/ecma_3/ExecutionContexts/shell.js b/js/src/tests/ecma_3/ExecutionContexts/shell.js index 1d353cff7427..e69de29bb2d1 100644 --- a/js/src/tests/ecma_3/ExecutionContexts/shell.js +++ b/js/src/tests/ecma_3/ExecutionContexts/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'ExecutionContexts'; diff --git a/js/src/tests/ecma_3/Expressions/11.10-01.js b/js/src/tests/ecma_3/Expressions/11.10-01.js index fd47d5d86b65..154620eea4af 100644 --- a/js/src/tests/ecma_3/Expressions/11.10-01.js +++ b/js/src/tests/ecma_3/Expressions/11.10-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '11.10-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 396969; var summary = '11.10 - & should evaluate operands in order'; diff --git a/js/src/tests/ecma_3/Expressions/11.10-02.js b/js/src/tests/ecma_3/Expressions/11.10-02.js index 8f387c13497a..78010dcb7008 100644 --- a/js/src/tests/ecma_3/Expressions/11.10-02.js +++ b/js/src/tests/ecma_3/Expressions/11.10-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '11.10-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 396969; var summary = '11.10 - ^ should evaluate operands in order'; diff --git a/js/src/tests/ecma_3/Expressions/11.10-03.js b/js/src/tests/ecma_3/Expressions/11.10-03.js index 99af0f87c583..be713541a4e6 100644 --- a/js/src/tests/ecma_3/Expressions/11.10-03.js +++ b/js/src/tests/ecma_3/Expressions/11.10-03.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '11.10-03.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 396969; var summary = '11.10 - | should evaluate operands in order'; diff --git a/js/src/tests/ecma_3/Expressions/11.6.1-1.js b/js/src/tests/ecma_3/Expressions/11.6.1-1.js index 8854c499f262..07c5faa03a5d 100644 --- a/js/src/tests/ecma_3/Expressions/11.6.1-1.js +++ b/js/src/tests/ecma_3/Expressions/11.6.1-1.js @@ -48,7 +48,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = '11.6.1-1.js'; var UBound = 0; var BUGNUMBER = 196290; var summary = 'Testing left-associativity of the + operator'; diff --git a/js/src/tests/ecma_3/Expressions/11.7.1-01.js b/js/src/tests/ecma_3/Expressions/11.7.1-01.js index 05f9622ce27e..aad370f474c6 100644 --- a/js/src/tests/ecma_3/Expressions/11.7.1-01.js +++ b/js/src/tests/ecma_3/Expressions/11.7.1-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '11.7.1-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 396969; var summary = '11.7.1 - << should evaluate operands in order'; diff --git a/js/src/tests/ecma_3/Expressions/11.7.2-01.js b/js/src/tests/ecma_3/Expressions/11.7.2-01.js index 64e426888ade..1550d681ed8a 100644 --- a/js/src/tests/ecma_3/Expressions/11.7.2-01.js +++ b/js/src/tests/ecma_3/Expressions/11.7.2-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '11.7.2-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 396969; var summary = '11.7.2 - >> should evaluate operands in order'; diff --git a/js/src/tests/ecma_3/Expressions/11.7.3-01.js b/js/src/tests/ecma_3/Expressions/11.7.3-01.js index d5af3b86d4b8..54f39311fc2d 100644 --- a/js/src/tests/ecma_3/Expressions/11.7.3-01.js +++ b/js/src/tests/ecma_3/Expressions/11.7.3-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '11.7.3-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 396969; var summary = '11.7.3 - >>> should evaluate operands in order'; diff --git a/js/src/tests/ecma_3/Expressions/11.9.6-1.js b/js/src/tests/ecma_3/Expressions/11.9.6-1.js index 1e8f59e400c0..617cb7600c96 100644 --- a/js/src/tests/ecma_3/Expressions/11.9.6-1.js +++ b/js/src/tests/ecma_3/Expressions/11.9.6-1.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = '11.9.6-1.js'; var UBound = 0; var BUGNUMBER = 126722; var summary = 'Testing the comparison |undefined === null|'; diff --git a/js/src/tests/ecma_3/Expressions/shell.js b/js/src/tests/ecma_3/Expressions/shell.js index 8f5d1129d56e..e69de29bb2d1 100644 --- a/js/src/tests/ecma_3/Expressions/shell.js +++ b/js/src/tests/ecma_3/Expressions/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Expressions'; diff --git a/js/src/tests/ecma_3/FunExpr/fe-001-n.js b/js/src/tests/ecma_3/FunExpr/fe-001-n.js index 71ed2fbb081e..b078ffef6ad1 100644 --- a/js/src/tests/ecma_3/FunExpr/fe-001-n.js +++ b/js/src/tests/ecma_3/FunExpr/fe-001-n.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'fe-001-n.js'; DESCRIPTION = "Previous statement should have thrown a ReferenceError"; EXPECTED = "error"; diff --git a/js/src/tests/ecma_3/FunExpr/fe-001.js b/js/src/tests/ecma_3/FunExpr/fe-001.js index 366c5fd472f9..2c1641613f36 100644 --- a/js/src/tests/ecma_3/FunExpr/fe-001.js +++ b/js/src/tests/ecma_3/FunExpr/fe-001.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'fe-001.js'; if (1) function f() {return 1;} if (0) function f() {return 0;} diff --git a/js/src/tests/ecma_3/FunExpr/fe-002.js b/js/src/tests/ecma_3/FunExpr/fe-002.js index d602b01b09f6..adab92a3181d 100644 --- a/js/src/tests/ecma_3/FunExpr/fe-002.js +++ b/js/src/tests/ecma_3/FunExpr/fe-002.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'fe-002.js'; function f() { diff --git a/js/src/tests/ecma_3/FunExpr/regress-518103.js b/js/src/tests/ecma_3/FunExpr/regress-518103.js index d80fdf3bb72a..70bab0d5725d 100644 --- a/js/src/tests/ecma_3/FunExpr/regress-518103.js +++ b/js/src/tests/ecma_3/FunExpr/regress-518103.js @@ -3,7 +3,6 @@ * http://creativecommons.org/licenses/publicdomain/ */ -var gTestfile = 'regress-518103.js'; var BUGNUMBER = 518103; var summary = 'lambda constructor "method" vs. instanceof'; var actual; diff --git a/js/src/tests/ecma_3/FunExpr/regress-524826.js b/js/src/tests/ecma_3/FunExpr/regress-524826.js index edb42d020525..da1dfbba08a8 100644 --- a/js/src/tests/ecma_3/FunExpr/regress-524826.js +++ b/js/src/tests/ecma_3/FunExpr/regress-524826.js @@ -3,7 +3,6 @@ * http://creativecommons.org/licenses/publicdomain/ */ -var gTestfile = 'regress-524826.js'; var BUGNUMBER = 524826; var summary = 'null-closure property initialiser mis-brands object literal scope'; var actual; diff --git a/js/src/tests/ecma_3/FunExpr/regress-528082.js b/js/src/tests/ecma_3/FunExpr/regress-528082.js index 906c63d6f990..1ca7b77cbbb4 100644 --- a/js/src/tests/ecma_3/FunExpr/regress-528082.js +++ b/js/src/tests/ecma_3/FunExpr/regress-528082.js @@ -3,7 +3,6 @@ * http://creativecommons.org/licenses/publicdomain/ */ -var gTestfile = 'regress-528082.js'; var BUGNUMBER = 528082; var summary = 'named function expression function-name-as-upvar slot botch'; diff --git a/js/src/tests/ecma_3/FunExpr/regress-533254.js b/js/src/tests/ecma_3/FunExpr/regress-533254.js index 801c6841f576..b0e319818ba6 100644 --- a/js/src/tests/ecma_3/FunExpr/regress-533254.js +++ b/js/src/tests/ecma_3/FunExpr/regress-533254.js @@ -3,7 +3,6 @@ * http://creativecommons.org/licenses/publicdomain/ */ -var gTestfile = 'regress-533254.js'; var BUGNUMBER = 533254; var summary = 'init-method late in table-big initialiser screwup'; diff --git a/js/src/tests/ecma_3/FunExpr/regress-545980.js b/js/src/tests/ecma_3/FunExpr/regress-545980.js index 1e2794a9dffb..1ecf1c9b6c6d 100644 --- a/js/src/tests/ecma_3/FunExpr/regress-545980.js +++ b/js/src/tests/ecma_3/FunExpr/regress-545980.js @@ -3,7 +3,6 @@ * http://creativecommons.org/licenses/publicdomain/ */ -var gTestfile = 'regress-545980.js'; var BUGNUMBER = 518103; var summary = 'partial flat closures must not reach across funargs'; var actual = "no crash"; diff --git a/js/src/tests/ecma_3/FunExpr/shell.js b/js/src/tests/ecma_3/FunExpr/shell.js index ecf5f4798fae..e69de29bb2d1 100644 --- a/js/src/tests/ecma_3/FunExpr/shell.js +++ b/js/src/tests/ecma_3/FunExpr/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'FunExpr'; diff --git a/js/src/tests/ecma_3/Function/15.3.4.3-1.js b/js/src/tests/ecma_3/Function/15.3.4.3-1.js index ef51379e4f18..ef82bdb9e45c 100644 --- a/js/src/tests/ecma_3/Function/15.3.4.3-1.js +++ b/js/src/tests/ecma_3/Function/15.3.4.3-1.js @@ -46,7 +46,6 @@ * See ECMA-262 Edition 3 Final, Section 15.3.4.3 */ //----------------------------------------------------------------------------- -var gTestfile = '15.3.4.3-1.js'; var UBound = 0; var BUGNUMBER = 145791; var summary = 'Testing ECMA conformance of Function.prototype.apply'; diff --git a/js/src/tests/ecma_3/Function/15.3.4.4-1.js b/js/src/tests/ecma_3/Function/15.3.4.4-1.js index d27b8487b74b..91366f661222 100644 --- a/js/src/tests/ecma_3/Function/15.3.4.4-1.js +++ b/js/src/tests/ecma_3/Function/15.3.4.4-1.js @@ -46,7 +46,6 @@ * See ECMA-262 Edition 3 Final, Section 15.3.4.4 */ //----------------------------------------------------------------------------- -var gTestfile = '15.3.4.4-1.js'; var UBound = 0; var BUGNUMBER = 145791; var summary = 'Testing ECMA conformance of Function.prototype.call'; diff --git a/js/src/tests/ecma_3/Function/arguments-001.js b/js/src/tests/ecma_3/Function/arguments-001.js index 2dbd603e02d4..5c9aec1bd240 100644 --- a/js/src/tests/ecma_3/Function/arguments-001.js +++ b/js/src/tests/ecma_3/Function/arguments-001.js @@ -44,7 +44,6 @@ * See http://bugzilla.mozilla.org/show_bug.cgi?id=72884 */ //----------------------------------------------------------------------------- -var gTestfile = 'arguments-001.js'; var UBound = 0; var BUGNUMBER = 72884; var summary = 'Testing the arguments object'; diff --git a/js/src/tests/ecma_3/Function/arguments-002.js b/js/src/tests/ecma_3/Function/arguments-002.js index 78005560a723..68cc674686a6 100644 --- a/js/src/tests/ecma_3/Function/arguments-002.js +++ b/js/src/tests/ecma_3/Function/arguments-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'arguments-002.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 383269; var summary = 'Allow override of arguments'; diff --git a/js/src/tests/ecma_3/Function/call-001.js b/js/src/tests/ecma_3/Function/call-001.js index 61ab3b930bef..7ebadd9af9c8 100644 --- a/js/src/tests/ecma_3/Function/call-001.js +++ b/js/src/tests/ecma_3/Function/call-001.js @@ -61,7 +61,6 @@ */ //----------------------------------------------------------------------------- -var gTestfile = 'call-001.js'; var UBound = 0; var BUGNUMBER = '(none)'; var summary = 'Applying Function.prototype.call to the Function object itself'; diff --git a/js/src/tests/ecma_3/Function/regress-131964.js b/js/src/tests/ecma_3/Function/regress-131964.js index f3998db91c11..1bf05bd3dfc6 100644 --- a/js/src/tests/ecma_3/Function/regress-131964.js +++ b/js/src/tests/ecma_3/Function/regress-131964.js @@ -46,7 +46,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-131964.js'; var UBound = 0; var BUGNUMBER = 131964; var summary = 'Functions defined in global or function scope are {DontDelete}'; diff --git a/js/src/tests/ecma_3/Function/regress-137181.js b/js/src/tests/ecma_3/Function/regress-137181.js index 1bf7c35f93c9..8a62e71dea3e 100644 --- a/js/src/tests/ecma_3/Function/regress-137181.js +++ b/js/src/tests/ecma_3/Function/regress-137181.js @@ -45,7 +45,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-137181.js'; var UBound = 0; var BUGNUMBER = 137181; var summary = 'delete arguments[i] should break connection to local reference'; diff --git a/js/src/tests/ecma_3/Function/regress-193555.js b/js/src/tests/ecma_3/Function/regress-193555.js index ed37b46c90de..de0ce167fb16 100644 --- a/js/src/tests/ecma_3/Function/regress-193555.js +++ b/js/src/tests/ecma_3/Function/regress-193555.js @@ -45,7 +45,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-193555.js'; var UBound = 0; var BUGNUMBER = 193555; var summary = 'Testing access to function name from inside function'; diff --git a/js/src/tests/ecma_3/Function/regress-313570.js b/js/src/tests/ecma_3/Function/regress-313570.js index e159c4c87f0d..ca34c98d9ef4 100644 --- a/js/src/tests/ecma_3/Function/regress-313570.js +++ b/js/src/tests/ecma_3/Function/regress-313570.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-313570.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 313570; var summary = 'length of objects whose prototype chain includes a function'; diff --git a/js/src/tests/ecma_3/Function/regress-49286.js b/js/src/tests/ecma_3/Function/regress-49286.js index 50e203bed8b2..ed0c8542a986 100644 --- a/js/src/tests/ecma_3/Function/regress-49286.js +++ b/js/src/tests/ecma_3/Function/regress-49286.js @@ -48,7 +48,6 @@ * 4) We should catch the error! */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-49286.js'; var UBound = 0; var BUGNUMBER = 49286; var summary = 'Invoking try...catch through Function.call'; diff --git a/js/src/tests/ecma_3/Function/regress-58274.js b/js/src/tests/ecma_3/Function/regress-58274.js index da5bde597f43..27b0b2f692de 100644 --- a/js/src/tests/ecma_3/Function/regress-58274.js +++ b/js/src/tests/ecma_3/Function/regress-58274.js @@ -66,7 +66,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-58274.js'; var UBound = 0; var BUGNUMBER = 58274; var summary = 'Testing functions with double-byte names'; diff --git a/js/src/tests/ecma_3/Function/regress-85880.js b/js/src/tests/ecma_3/Function/regress-85880.js index 8ea4fb6c4110..79d2f628f850 100644 --- a/js/src/tests/ecma_3/Function/regress-85880.js +++ b/js/src/tests/ecma_3/Function/regress-85880.js @@ -48,7 +48,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-85880.js'; var UBound = 0; var BUGNUMBER = 85880; var summary = 'Arguments object of g(){f()} should not be null'; diff --git a/js/src/tests/ecma_3/Function/regress-94506.js b/js/src/tests/ecma_3/Function/regress-94506.js index b6ab5cc24c81..a5dccb7ab7ee 100644 --- a/js/src/tests/ecma_3/Function/regress-94506.js +++ b/js/src/tests/ecma_3/Function/regress-94506.js @@ -45,7 +45,6 @@ * See http://bugzilla.mozilla.org/show_bug.cgi?id=94506 */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-94506.js'; var UBound = 0; var BUGNUMBER = 94506; var summary = 'Testing functions employing identifiers named "arguments"'; diff --git a/js/src/tests/ecma_3/Function/regress-97921.js b/js/src/tests/ecma_3/Function/regress-97921.js index 855f966dc4df..9750ffd2bfb3 100644 --- a/js/src/tests/ecma_3/Function/regress-97921.js +++ b/js/src/tests/ecma_3/Function/regress-97921.js @@ -47,7 +47,6 @@ * of formal parameters." */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-97921.js'; var UBound = 0; var BUGNUMBER = 97921; var summary = 'Testing with() statement with nested functions'; diff --git a/js/src/tests/ecma_3/Function/scope-001.js b/js/src/tests/ecma_3/Function/scope-001.js index 3aa1d3bc0357..995d8dfa4d3b 100644 --- a/js/src/tests/ecma_3/Function/scope-001.js +++ b/js/src/tests/ecma_3/Function/scope-001.js @@ -51,7 +51,6 @@ * of the running execution context when the function was declared) */ //----------------------------------------------------------------------------- -var gTestfile = 'scope-001.js'; var UBound = 0; var BUGNUMBER = '(none)'; var summary = 'Testing that functions are scoped statically, not dynamically'; diff --git a/js/src/tests/ecma_3/Function/scope-002.js b/js/src/tests/ecma_3/Function/scope-002.js index 7a9b6f204b75..dcfd5bef17f7 100644 --- a/js/src/tests/ecma_3/Function/scope-002.js +++ b/js/src/tests/ecma_3/Function/scope-002.js @@ -54,7 +54,6 @@ * instead of a function declaration: function f() {} etc. */ //----------------------------------------------------------------------------- -var gTestfile = 'scope-002.js'; var UBound = 0; var BUGNUMBER = '(none)'; var summary = 'Testing that functions are scoped statically, not dynamically'; diff --git a/js/src/tests/ecma_3/Function/shell.js b/js/src/tests/ecma_3/Function/shell.js index eebf3d51f88e..e69de29bb2d1 100644 --- a/js/src/tests/ecma_3/Function/shell.js +++ b/js/src/tests/ecma_3/Function/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Function'; diff --git a/js/src/tests/ecma_3/LexicalConventions/7.4-01.js b/js/src/tests/ecma_3/LexicalConventions/7.4-01.js index 139394a07967..9960d0f62efe 100644 --- a/js/src/tests/ecma_3/LexicalConventions/7.4-01.js +++ b/js/src/tests/ecma_3/LexicalConventions/7.4-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '7.4-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 475834; var summary = ' /**/ comments with newlines in them must act as line breaks'; diff --git a/js/src/tests/ecma_3/LexicalConventions/7.8.3-01.js b/js/src/tests/ecma_3/LexicalConventions/7.8.3-01.js index 642ed1847f3e..e323738f0443 100644 --- a/js/src/tests/ecma_3/LexicalConventions/7.8.3-01.js +++ b/js/src/tests/ecma_3/LexicalConventions/7.8.3-01.js @@ -3,7 +3,6 @@ * http://creativecommons.org/licenses/publicdomain/ */ -var gTestfile = '7.8.3-01.js'; var BUGNUMBER = 523401; var summary = 'identifier starts immediately after numeric literal'; var expect = "SyntaxError: identifier starts immediately after numeric literal"; diff --git a/js/src/tests/ecma_3/LexicalConventions/7.9.1.js b/js/src/tests/ecma_3/LexicalConventions/7.9.1.js index 10ee26f92972..a30c75f34e86 100644 --- a/js/src/tests/ecma_3/LexicalConventions/7.9.1.js +++ b/js/src/tests/ecma_3/LexicalConventions/7.9.1.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '7.9.1.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 402386; var summary = 'Automatic Semicolon insertion in postfix expressions'; diff --git a/js/src/tests/ecma_3/LexicalConventions/shell.js b/js/src/tests/ecma_3/LexicalConventions/shell.js index 4e1d61d68af6..e69de29bb2d1 100644 --- a/js/src/tests/ecma_3/LexicalConventions/shell.js +++ b/js/src/tests/ecma_3/LexicalConventions/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'LexicalConventions'; diff --git a/js/src/tests/ecma_3/Number/15.7.4.2-01.js b/js/src/tests/ecma_3/Number/15.7.4.2-01.js index 36d63ed7e4d4..4c948e40a765 100644 --- a/js/src/tests/ecma_3/Number/15.7.4.2-01.js +++ b/js/src/tests/ecma_3/Number/15.7.4.2-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '15.7.4.2-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = "411889"; var summary = "num.toString(), num.toString(10), and num.toString(undefined)" + diff --git a/js/src/tests/ecma_3/Number/15.7.4.3-01.js b/js/src/tests/ecma_3/Number/15.7.4.3-01.js index 7c4cba753d9d..136bdc2a4344 100644 --- a/js/src/tests/ecma_3/Number/15.7.4.3-01.js +++ b/js/src/tests/ecma_3/Number/15.7.4.3-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '15.7.4.3-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = "412068"; var summary = "num.toLocaleString incorrectly accesses its first argument " + diff --git a/js/src/tests/ecma_3/Number/15.7.4.3-02.js b/js/src/tests/ecma_3/Number/15.7.4.3-02.js index 72e7c56141ef..911147bb1758 100644 --- a/js/src/tests/ecma_3/Number/15.7.4.3-02.js +++ b/js/src/tests/ecma_3/Number/15.7.4.3-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '15.7.4.3-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = "446494"; var summary = "num.toLocaleString should handle exponents"; diff --git a/js/src/tests/ecma_3/Number/15.7.4.5-1.js b/js/src/tests/ecma_3/Number/15.7.4.5-1.js index c21efa0b664d..7568c9e0d833 100644 --- a/js/src/tests/ecma_3/Number/15.7.4.5-1.js +++ b/js/src/tests/ecma_3/Number/15.7.4.5-1.js @@ -46,7 +46,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = '15.7.4.5-1.js'; var UBound = 0; var BUGNUMBER = '(none)'; var summary = 'Testing Number.prototype.toFixed(fractionDigits)'; diff --git a/js/src/tests/ecma_3/Number/15.7.4.5-2.js b/js/src/tests/ecma_3/Number/15.7.4.5-2.js index ca7f892bdbca..d2357d20f1f9 100644 --- a/js/src/tests/ecma_3/Number/15.7.4.5-2.js +++ b/js/src/tests/ecma_3/Number/15.7.4.5-2.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '15.7.4.5-2.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 469397; var summary = '(0.5).toFixed(0) == 1'; diff --git a/js/src/tests/ecma_3/Number/15.7.4.6-1.js b/js/src/tests/ecma_3/Number/15.7.4.6-1.js index 6b08cf6d7676..f5721cf04d16 100644 --- a/js/src/tests/ecma_3/Number/15.7.4.6-1.js +++ b/js/src/tests/ecma_3/Number/15.7.4.6-1.js @@ -46,7 +46,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = '15.7.4.6-1.js'; var UBound = 0; var BUGNUMBER = '(none)'; var summary = 'Testing Number.prototype.toExponential(fractionDigits)'; diff --git a/js/src/tests/ecma_3/Number/15.7.4.7-1.js b/js/src/tests/ecma_3/Number/15.7.4.7-1.js index bfb75c46f6c3..8dcad15c515b 100644 --- a/js/src/tests/ecma_3/Number/15.7.4.7-1.js +++ b/js/src/tests/ecma_3/Number/15.7.4.7-1.js @@ -46,7 +46,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = '15.7.4.7-1.js'; var UBound = 0; var BUGNUMBER = '(none)'; var summary = 'Testing Number.prototype.toPrecision(precision)'; diff --git a/js/src/tests/ecma_3/Number/15.7.4.7-2.js b/js/src/tests/ecma_3/Number/15.7.4.7-2.js index 5c8ff396e4d2..4f1e8f7e2574 100644 --- a/js/src/tests/ecma_3/Number/15.7.4.7-2.js +++ b/js/src/tests/ecma_3/Number/15.7.4.7-2.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '15.7.4.7-2.js'; //----------------------------------------------------------------------------- var BUGNUMBER = "411893"; var summary = "num.toPrecision(undefined) should equal num.toString()"; diff --git a/js/src/tests/ecma_3/Number/regress-442242-01.js b/js/src/tests/ecma_3/Number/regress-442242-01.js index e3fa070e5a2b..6e5ffaf29910 100644 --- a/js/src/tests/ecma_3/Number/regress-442242-01.js +++ b/js/src/tests/ecma_3/Number/regress-442242-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-442242-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 442242; var summary = 'Do not assert: INT_FITS_IN_JSVAL(i)'; diff --git a/js/src/tests/ecma_3/Number/shell.js b/js/src/tests/ecma_3/Number/shell.js index 03cca1d55122..e69de29bb2d1 100644 --- a/js/src/tests/ecma_3/Number/shell.js +++ b/js/src/tests/ecma_3/Number/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Number'; diff --git a/js/src/tests/ecma_3/NumberFormatting/shell.js b/js/src/tests/ecma_3/NumberFormatting/shell.js index 1847703bf3bc..e69de29bb2d1 100644 --- a/js/src/tests/ecma_3/NumberFormatting/shell.js +++ b/js/src/tests/ecma_3/NumberFormatting/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'NumberFormatting'; diff --git a/js/src/tests/ecma_3/NumberFormatting/tostring-001.js b/js/src/tests/ecma_3/NumberFormatting/tostring-001.js index 34152aa5c0c1..9d02fb5d25e6 100644 --- a/js/src/tests/ecma_3/NumberFormatting/tostring-001.js +++ b/js/src/tests/ecma_3/NumberFormatting/tostring-001.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'tostring-001.js'; test(); diff --git a/js/src/tests/ecma_3/Object/8.6.1-01.js b/js/src/tests/ecma_3/Object/8.6.1-01.js index 2897ece55561..9dec10fe9180 100644 --- a/js/src/tests/ecma_3/Object/8.6.1-01.js +++ b/js/src/tests/ecma_3/Object/8.6.1-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '8.6.1-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 315436; diff --git a/js/src/tests/ecma_3/Object/8.6.2.6-001.js b/js/src/tests/ecma_3/Object/8.6.2.6-001.js index 8fe2b23f4a8e..29b1408e5342 100644 --- a/js/src/tests/ecma_3/Object/8.6.2.6-001.js +++ b/js/src/tests/ecma_3/Object/8.6.2.6-001.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = '8.6.2.6-001.js'; var UBound = 0; var BUGNUMBER = 167325; var summary = "Test for TypeError on invalid default string value of object"; diff --git a/js/src/tests/ecma_3/Object/8.6.2.6-002.js b/js/src/tests/ecma_3/Object/8.6.2.6-002.js index fe6f44dadcbc..ce9d10eba074 100644 --- a/js/src/tests/ecma_3/Object/8.6.2.6-002.js +++ b/js/src/tests/ecma_3/Object/8.6.2.6-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '8.6.2.6-002.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 470364; var summary = '[[DefaultValue]] should not call valueOf, toString with an argument'; diff --git a/js/src/tests/ecma_3/Object/class-001.js b/js/src/tests/ecma_3/Object/class-001.js index faa2f4fceb33..718dec270e73 100644 --- a/js/src/tests/ecma_3/Object/class-001.js +++ b/js/src/tests/ecma_3/Object/class-001.js @@ -45,7 +45,6 @@ * The getJSClass() function we use is in a utility file, e.g. "shell.js". */ //----------------------------------------------------------------------------- -var gTestfile = 'class-001.js'; var i = 0; var UBound = 0; var BUGNUMBER = '(none)'; diff --git a/js/src/tests/ecma_3/Object/class-002.js b/js/src/tests/ecma_3/Object/class-002.js index 0b49ffd9dbec..6b9db08e4157 100644 --- a/js/src/tests/ecma_3/Object/class-002.js +++ b/js/src/tests/ecma_3/Object/class-002.js @@ -49,7 +49,6 @@ * The getJSClass() function we use is in a utility file, e.g. "shell.js" */ //----------------------------------------------------------------------------- -var gTestfile = 'class-002.js'; var i = 0; var UBound = 0; var BUGNUMBER = '(none)'; diff --git a/js/src/tests/ecma_3/Object/class-003.js b/js/src/tests/ecma_3/Object/class-003.js index 7afedb298575..1040daa1c99f 100644 --- a/js/src/tests/ecma_3/Object/class-003.js +++ b/js/src/tests/ecma_3/Object/class-003.js @@ -52,7 +52,6 @@ * The getJSClass() function we use is in a utility file, e.g. "shell.js" */ //----------------------------------------------------------------------------- -var gTestfile = 'class-003.js'; var i = 0; var UBound = 0; var BUGNUMBER = 56868; diff --git a/js/src/tests/ecma_3/Object/class-004.js b/js/src/tests/ecma_3/Object/class-004.js index 729b04108654..bc5e4733b1d2 100644 --- a/js/src/tests/ecma_3/Object/class-004.js +++ b/js/src/tests/ecma_3/Object/class-004.js @@ -52,7 +52,6 @@ * The getJSClass() function we use is in a utility file, e.g. "shell.js" */ //----------------------------------------------------------------------------- -var gTestfile = 'class-004.js'; var i = 0; var UBound = 0; var BUGNUMBER = 56868; diff --git a/js/src/tests/ecma_3/Object/class-005.js b/js/src/tests/ecma_3/Object/class-005.js index f57d0681cf75..6700ecbd38e3 100644 --- a/js/src/tests/ecma_3/Object/class-005.js +++ b/js/src/tests/ecma_3/Object/class-005.js @@ -49,7 +49,6 @@ * The getJSClass() function we use is in a utility file, e.g. "shell.js" */ //----------------------------------------------------------------------------- -var gTestfile = 'class-005.js'; var i = 0; var UBound = 0; var BUGNUMBER = '(none)'; diff --git a/js/src/tests/ecma_3/Object/regress-361274.js b/js/src/tests/ecma_3/Object/regress-361274.js index d3962004e386..9b6743959587 100644 --- a/js/src/tests/ecma_3/Object/regress-361274.js +++ b/js/src/tests/ecma_3/Object/regress-361274.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-361274.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 361274; var summary = 'Embedded nulls in property names'; diff --git a/js/src/tests/ecma_3/Object/regress-385393-07.js b/js/src/tests/ecma_3/Object/regress-385393-07.js index 0473fe495606..8a88a580b423 100644 --- a/js/src/tests/ecma_3/Object/regress-385393-07.js +++ b/js/src/tests/ecma_3/Object/regress-385393-07.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-385393-07.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 385393; diff --git a/js/src/tests/ecma_3/Object/regress-459405.js b/js/src/tests/ecma_3/Object/regress-459405.js index a4c9b82e50bb..7c1083f3fbcc 100644 --- a/js/src/tests/ecma_3/Object/regress-459405.js +++ b/js/src/tests/ecma_3/Object/regress-459405.js @@ -5,7 +5,6 @@ * Contributor: Robert Sayre */ -var gTestfile = 'regress-459405.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 459405; var summary = 'Math is not ReadOnly'; diff --git a/js/src/tests/ecma_3/Object/regress-72773.js b/js/src/tests/ecma_3/Object/regress-72773.js index 5b0dee62bfef..5adbd04ea4aa 100644 --- a/js/src/tests/ecma_3/Object/regress-72773.js +++ b/js/src/tests/ecma_3/Object/regress-72773.js @@ -51,7 +51,6 @@ * The getJSClass() function we use is in a utility file, e.g. "shell.js" */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-72773.js'; var BUGNUMBER = 72773; var summary = "Regression test: we shouldn't crash on this code"; var status = ''; diff --git a/js/src/tests/ecma_3/Object/regress-79129-001.js b/js/src/tests/ecma_3/Object/regress-79129-001.js index efafed804716..54d386c84052 100644 --- a/js/src/tests/ecma_3/Object/regress-79129-001.js +++ b/js/src/tests/ecma_3/Object/regress-79129-001.js @@ -44,7 +44,6 @@ * See http://bugzilla.mozilla.org/show_bug.cgi?id=79129 */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-79129-001.js'; var BUGNUMBER = 79129; var summary = "Regression test: we shouldn't crash on this code"; diff --git a/js/src/tests/ecma_3/Object/shell.js b/js/src/tests/ecma_3/Object/shell.js index d0ee0544850b..4169be1a4e31 100644 --- a/js/src/tests/ecma_3/Object/shell.js +++ b/js/src/tests/ecma_3/Object/shell.js @@ -55,7 +55,6 @@ */ //----------------------------------------------------------------------------- -gTestsubsuite = 'Object'; var cnNoObject = 'Unexpected Error!!! Parameter to this function must be an object'; var cnNoClass = 'Unexpected Error!!! Cannot find Class property'; diff --git a/js/src/tests/ecma_3/Operators/11.13.1-001.js b/js/src/tests/ecma_3/Operators/11.13.1-001.js index 935eed2de1cc..1b72e5a95cd5 100644 --- a/js/src/tests/ecma_3/Operators/11.13.1-001.js +++ b/js/src/tests/ecma_3/Operators/11.13.1-001.js @@ -45,7 +45,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = '11.13.1-001.js'; var UBound = 0; var BUGNUMBER = 204919; var summary = 'JS should evaluate RHS before binding LHS implicit variable'; diff --git a/js/src/tests/ecma_3/Operators/11.13.1-002.js b/js/src/tests/ecma_3/Operators/11.13.1-002.js index 5d3307e4a76c..8df51a1a217a 100644 --- a/js/src/tests/ecma_3/Operators/11.13.1-002.js +++ b/js/src/tests/ecma_3/Operators/11.13.1-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '11.13.1-002.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 312354; var summary = '11.13.1 Simple Assignment should return type of RHS'; diff --git a/js/src/tests/ecma_3/Operators/11.4.1-001.js b/js/src/tests/ecma_3/Operators/11.4.1-001.js index 7a5ed8f915b4..d4ef7eed1500 100644 --- a/js/src/tests/ecma_3/Operators/11.4.1-001.js +++ b/js/src/tests/ecma_3/Operators/11.4.1-001.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = '11.4.1-001.js'; var UBound = 0; var BUGNUMBER = 201987; var summary = '|delete x.y| should return |true| if |x| has no property |y|'; diff --git a/js/src/tests/ecma_3/Operators/11.4.1-002.js b/js/src/tests/ecma_3/Operators/11.4.1-002.js index c48565ba5f8e..079c0c96af02 100644 --- a/js/src/tests/ecma_3/Operators/11.4.1-002.js +++ b/js/src/tests/ecma_3/Operators/11.4.1-002.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '11.4.1-002.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 423300; var summary = '11.4.1 - The delete Operator - delete f()'; diff --git a/js/src/tests/ecma_3/Operators/order-01.js b/js/src/tests/ecma_3/Operators/order-01.js index 671faceb818f..ce61c8754d2a 100644 --- a/js/src/tests/ecma_3/Operators/order-01.js +++ b/js/src/tests/ecma_3/Operators/order-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'order-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 433672; var summary = 'operator evaluation order'; diff --git a/js/src/tests/ecma_3/Operators/shell.js b/js/src/tests/ecma_3/Operators/shell.js index 910515cfe45f..e69de29bb2d1 100644 --- a/js/src/tests/ecma_3/Operators/shell.js +++ b/js/src/tests/ecma_3/Operators/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Operators'; diff --git a/js/src/tests/ecma_3/RegExp/15.10.2-1.js b/js/src/tests/ecma_3/RegExp/15.10.2-1.js index 9439a2ccd64e..6825f036f077 100644 --- a/js/src/tests/ecma_3/RegExp/15.10.2-1.js +++ b/js/src/tests/ecma_3/RegExp/15.10.2-1.js @@ -41,12 +41,11 @@ * Date: 09 July 2002 * SUMMARY: RegExp conformance test * - * These gTestcases are derived from the examples in the ECMA-262 Ed.3 spec + * These testcases are derived from the examples in the ECMA-262 Ed.3 spec * scattered through section 15.10.2. * */ //----------------------------------------------------------------------------- -var gTestfile = '15.10.2-1.js'; var i = 0; var BUGNUMBER = '(none)'; var summary = 'RegExp conformance test'; diff --git a/js/src/tests/ecma_3/RegExp/15.10.2.12.js b/js/src/tests/ecma_3/RegExp/15.10.2.12.js index d68b86c2edb3..cae242e6534e 100644 --- a/js/src/tests/ecma_3/RegExp/15.10.2.12.js +++ b/js/src/tests/ecma_3/RegExp/15.10.2.12.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '15.10.2.12.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 378738; var summary = '15.10.2.12 - CharacterClassEscape \d'; diff --git a/js/src/tests/ecma_3/RegExp/15.10.3.1-1.js b/js/src/tests/ecma_3/RegExp/15.10.3.1-1.js index 7286cea29705..3eee5b5a01be 100644 --- a/js/src/tests/ecma_3/RegExp/15.10.3.1-1.js +++ b/js/src/tests/ecma_3/RegExp/15.10.3.1-1.js @@ -63,7 +63,6 @@ * provided. We check that RegExp(R) returns R - */ //----------------------------------------------------------------------------- -var gTestfile = '15.10.3.1-1.js'; var BUGNUMBER = '61266'; var summary = 'Passing (RegExp object,flag) to RegExp() function'; var statprefix = 'RegExp(new RegExp('; diff --git a/js/src/tests/ecma_3/RegExp/15.10.3.1-2.js b/js/src/tests/ecma_3/RegExp/15.10.3.1-2.js index d78be13c259e..0be0e19fc4aa 100644 --- a/js/src/tests/ecma_3/RegExp/15.10.3.1-2.js +++ b/js/src/tests/ecma_3/RegExp/15.10.3.1-2.js @@ -71,7 +71,6 @@ * We check that RegExp(R, undefined) returns R - */ //----------------------------------------------------------------------------- -var gTestfile = '15.10.3.1-2.js'; var BUGNUMBER = '61266'; var summary = 'Passing (RegExp object,flag) to RegExp() function'; var statprefix = 'RegExp(new RegExp('; diff --git a/js/src/tests/ecma_3/RegExp/15.10.4.1-1.js b/js/src/tests/ecma_3/RegExp/15.10.4.1-1.js index 47faf0051b00..9eafbbd05434 100644 --- a/js/src/tests/ecma_3/RegExp/15.10.4.1-1.js +++ b/js/src/tests/ecma_3/RegExp/15.10.4.1-1.js @@ -68,7 +68,6 @@ * of not being provided. */ //----------------------------------------------------------------------------- -var gTestfile = '15.10.4.1-1.js'; var BUGNUMBER = '61266'; var summary = 'Passing a RegExp object to a RegExp() constructor'; var statprefix = 'Applying RegExp() twice to pattern '; diff --git a/js/src/tests/ecma_3/RegExp/15.10.4.1-2.js b/js/src/tests/ecma_3/RegExp/15.10.4.1-2.js index 1d67b8afe62c..8e62d1fe5080 100644 --- a/js/src/tests/ecma_3/RegExp/15.10.4.1-2.js +++ b/js/src/tests/ecma_3/RegExp/15.10.4.1-2.js @@ -74,7 +74,6 @@ * obj2 = new RegExp(obj1); */ //----------------------------------------------------------------------------- -var gTestfile = '15.10.4.1-2.js'; var BUGNUMBER = '61266'; var summary = 'Passing a RegExp object to a RegExp() constructor'; var statprefix = 'Applying RegExp() twice to pattern '; diff --git a/js/src/tests/ecma_3/RegExp/15.10.4.1-3.js b/js/src/tests/ecma_3/RegExp/15.10.4.1-3.js index 12ef46bde873..95faef5569f6 100644 --- a/js/src/tests/ecma_3/RegExp/15.10.4.1-3.js +++ b/js/src/tests/ecma_3/RegExp/15.10.4.1-3.js @@ -67,7 +67,6 @@ * parameter for obj2 will be undefined in the sense of not being provided. */ //----------------------------------------------------------------------------- -var gTestfile = '15.10.4.1-3.js'; var BUGNUMBER = '61266'; var summary = 'Passing a RegExp object to a RegExp() constructor'; var statprefix = 'Applying RegExp() twice to pattern '; diff --git a/js/src/tests/ecma_3/RegExp/15.10.4.1-4.js b/js/src/tests/ecma_3/RegExp/15.10.4.1-4.js index 3b4245851eaf..d6c4256c7ed9 100644 --- a/js/src/tests/ecma_3/RegExp/15.10.4.1-4.js +++ b/js/src/tests/ecma_3/RegExp/15.10.4.1-4.js @@ -74,7 +74,6 @@ * obj2 = new RegExp(obj1); */ //----------------------------------------------------------------------------- -var gTestfile = '15.10.4.1-4.js'; var BUGNUMBER = '61266'; var summary = 'Passing a RegExp object to a RegExp() constructor'; var statprefix = 'Applying RegExp() twice to pattern '; diff --git a/js/src/tests/ecma_3/RegExp/15.10.4.1-5-n.js b/js/src/tests/ecma_3/RegExp/15.10.4.1-5-n.js index 592fb03ac70e..692610fd33aa 100644 --- a/js/src/tests/ecma_3/RegExp/15.10.4.1-5-n.js +++ b/js/src/tests/ecma_3/RegExp/15.10.4.1-5-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '15.10.4.1-5-n.js'; /* * * Date: 26 November 2000 diff --git a/js/src/tests/ecma_3/RegExp/15.10.4.1-6.js b/js/src/tests/ecma_3/RegExp/15.10.4.1-6.js index 7827d781a617..7aece95c8c04 100644 --- a/js/src/tests/ecma_3/RegExp/15.10.4.1-6.js +++ b/js/src/tests/ecma_3/RegExp/15.10.4.1-6.js @@ -43,7 +43,6 @@ exception. */ -var gTestfile = '15.10.4.1-6.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 476940; var summary = 'Section 15.10.4.1 - RegExp with invalid flags'; diff --git a/js/src/tests/ecma_3/RegExp/15.10.6.2-1.js b/js/src/tests/ecma_3/RegExp/15.10.6.2-1.js index 8203da4967d8..562e9af3ee69 100644 --- a/js/src/tests/ecma_3/RegExp/15.10.6.2-1.js +++ b/js/src/tests/ecma_3/RegExp/15.10.6.2-1.js @@ -80,7 +80,6 @@ * will NOT be 'b c', but rather 'c d'. Similarly, 'd e' won't be matched. */ //----------------------------------------------------------------------------- -var gTestfile = '15.10.6.2-1.js'; var i = 0; var BUGNUMBER = '(none)'; var summary = 'Testing regexps with the global flag set'; diff --git a/js/src/tests/ecma_3/RegExp/15.10.6.2-2.js b/js/src/tests/ecma_3/RegExp/15.10.6.2-2.js index e6fd6c63114b..6f22bdd7500e 100644 --- a/js/src/tests/ecma_3/RegExp/15.10.6.2-2.js +++ b/js/src/tests/ecma_3/RegExp/15.10.6.2-2.js @@ -96,7 +96,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = '15.10.6.2-2.js'; var i = 0; var BUGNUMBER = 76717; var summary = 'Testing re.exec(str) when re.lastIndex is < 0 or > str.length'; diff --git a/js/src/tests/ecma_3/RegExp/octal-001.js b/js/src/tests/ecma_3/RegExp/octal-001.js index f35724e47b84..1980ead59f9c 100644 --- a/js/src/tests/ecma_3/RegExp/octal-001.js +++ b/js/src/tests/ecma_3/RegExp/octal-001.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'octal-001.js'; var i = 0; var BUGNUMBER = 141078; var summary = 'Testing octal sequences in regexps'; diff --git a/js/src/tests/ecma_3/RegExp/octal-002.js b/js/src/tests/ecma_3/RegExp/octal-002.js index 401ad43c11d7..c6a0659814fe 100644 --- a/js/src/tests/ecma_3/RegExp/octal-002.js +++ b/js/src/tests/ecma_3/RegExp/octal-002.js @@ -62,7 +62,6 @@ * defined in the ECMA spec as having Unicode value \u0009. */ //----------------------------------------------------------------------------- -var gTestfile = 'octal-002.js'; var i = 0; var BUGNUMBER = 141078; var summary = 'Testing regexps containing octal escape sequences'; diff --git a/js/src/tests/ecma_3/RegExp/perlstress-001.js b/js/src/tests/ecma_3/RegExp/perlstress-001.js index 0b27529a3246..698a4d4f2f19 100644 --- a/js/src/tests/ecma_3/RegExp/perlstress-001.js +++ b/js/src/tests/ecma_3/RegExp/perlstress-001.js @@ -87,7 +87,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'perlstress-001.js'; var i = 0; var BUGNUMBER = 85721; var summary = 'Testing regular expression edge cases'; diff --git a/js/src/tests/ecma_3/RegExp/perlstress-002.js b/js/src/tests/ecma_3/RegExp/perlstress-002.js index a9b147b97766..ac28c2346076 100644 --- a/js/src/tests/ecma_3/RegExp/perlstress-002.js +++ b/js/src/tests/ecma_3/RegExp/perlstress-002.js @@ -59,7 +59,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'perlstress-002.js'; var i = 0; var BUGNUMBER = 85721; var summary = 'Testing regular expression edge cases'; diff --git a/js/src/tests/ecma_3/RegExp/regress-100199.js b/js/src/tests/ecma_3/RegExp/regress-100199.js index 8c88aa7f52d5..b5093f2e975c 100644 --- a/js/src/tests/ecma_3/RegExp/regress-100199.js +++ b/js/src/tests/ecma_3/RegExp/regress-100199.js @@ -50,7 +50,6 @@ * Neither one of these conditions should cause syntax errors in a RegExp. */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-100199.js'; var i = 0; var BUGNUMBER = 100199; var summary = '[], [^] are valid RegExp conditions. Should not cause errors -'; diff --git a/js/src/tests/ecma_3/RegExp/regress-105972.js b/js/src/tests/ecma_3/RegExp/regress-105972.js index e691c518b421..5022cfc8d427 100644 --- a/js/src/tests/ecma_3/RegExp/regress-105972.js +++ b/js/src/tests/ecma_3/RegExp/regress-105972.js @@ -45,7 +45,6 @@ * See http://bugzilla.mozilla.org/show_bug.cgi?id=105972 */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-105972.js'; var i = 0; var BUGNUMBER = 105972; var summary = 'Regression test for Bugzilla bug 105972'; diff --git a/js/src/tests/ecma_3/RegExp/regress-119909.js b/js/src/tests/ecma_3/RegExp/regress-119909.js index 97f6414bc7cf..594889be1279 100644 --- a/js/src/tests/ecma_3/RegExp/regress-119909.js +++ b/js/src/tests/ecma_3/RegExp/regress-119909.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-119909.js'; var BUGNUMBER = 119909; var summary = "Shouldn't crash on regexps with many nested parentheses"; var NO_BACKREFS = false; diff --git a/js/src/tests/ecma_3/RegExp/regress-122076.js b/js/src/tests/ecma_3/RegExp/regress-122076.js index e77f433fc482..159b35622281 100644 --- a/js/src/tests/ecma_3/RegExp/regress-122076.js +++ b/js/src/tests/ecma_3/RegExp/regress-122076.js @@ -52,7 +52,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-122076.js'; var BUGNUMBER = 122076; var summary = "Don't crash on invalid regexp literals / \\/ /"; var STRESS = 10; diff --git a/js/src/tests/ecma_3/RegExp/regress-123437.js b/js/src/tests/ecma_3/RegExp/regress-123437.js index 745a3a707aef..632620f61384 100644 --- a/js/src/tests/ecma_3/RegExp/regress-123437.js +++ b/js/src/tests/ecma_3/RegExp/regress-123437.js @@ -46,7 +46,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-123437.js'; var i = 0; var BUGNUMBER = 123437; var summary = 'regexp backreferences must hold |undefined| if not used'; diff --git a/js/src/tests/ecma_3/RegExp/regress-165353.js b/js/src/tests/ecma_3/RegExp/regress-165353.js index f7c736ce4d9b..a1d1475bdc80 100644 --- a/js/src/tests/ecma_3/RegExp/regress-165353.js +++ b/js/src/tests/ecma_3/RegExp/regress-165353.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-165353.js'; var i = 0; var BUGNUMBER = 165353; var summary = 'RegExp conformance test'; diff --git a/js/src/tests/ecma_3/RegExp/regress-169497.js b/js/src/tests/ecma_3/RegExp/regress-169497.js index 5613a938727c..b24b1623e2ff 100644 --- a/js/src/tests/ecma_3/RegExp/regress-169497.js +++ b/js/src/tests/ecma_3/RegExp/regress-169497.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-169497.js'; var i = 0; var BUGNUMBER = 169497; var summary = 'RegExp conformance test'; diff --git a/js/src/tests/ecma_3/RegExp/regress-169534.js b/js/src/tests/ecma_3/RegExp/regress-169534.js index c736631bd761..4cd58d315456 100644 --- a/js/src/tests/ecma_3/RegExp/regress-169534.js +++ b/js/src/tests/ecma_3/RegExp/regress-169534.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-169534.js'; var UBound = 0; var BUGNUMBER = 169534; var summary = 'RegExp conformance test'; diff --git a/js/src/tests/ecma_3/RegExp/regress-187133.js b/js/src/tests/ecma_3/RegExp/regress-187133.js index 98ec4753bf91..06f5768c72b5 100644 --- a/js/src/tests/ecma_3/RegExp/regress-187133.js +++ b/js/src/tests/ecma_3/RegExp/regress-187133.js @@ -58,7 +58,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-187133.js'; var i = 0; var BUGNUMBER = 187133; var summary = 'RegExp conformance test'; diff --git a/js/src/tests/ecma_3/RegExp/regress-188206.js b/js/src/tests/ecma_3/RegExp/regress-188206.js index 308c0ff60531..921791031fd1 100644 --- a/js/src/tests/ecma_3/RegExp/regress-188206.js +++ b/js/src/tests/ecma_3/RegExp/regress-188206.js @@ -47,7 +47,6 @@ * and http://bugzilla.mozilla.org/show_bug.cgi?id=197451 */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-188206.js'; var UBound = 0; var BUGNUMBER = 188206; var summary = 'Invalid use of regexp quantifiers should generate SyntaxErrors'; diff --git a/js/src/tests/ecma_3/RegExp/regress-191479.js b/js/src/tests/ecma_3/RegExp/regress-191479.js index 51d5f14c42bc..b109792c56b1 100644 --- a/js/src/tests/ecma_3/RegExp/regress-191479.js +++ b/js/src/tests/ecma_3/RegExp/regress-191479.js @@ -45,7 +45,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-191479.js'; var i = 0; var BUGNUMBER = 191479; var summary = 'Testing regular expressions of form /(x|y){n,}/'; diff --git a/js/src/tests/ecma_3/RegExp/regress-202564.js b/js/src/tests/ecma_3/RegExp/regress-202564.js index e0ae0f994891..7d571dd0b1f0 100644 --- a/js/src/tests/ecma_3/RegExp/regress-202564.js +++ b/js/src/tests/ecma_3/RegExp/regress-202564.js @@ -49,7 +49,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-202564.js'; var i = 0; var BUGNUMBER = 202564; var summary = 'Testing regexp with many backreferences'; diff --git a/js/src/tests/ecma_3/RegExp/regress-209067.js b/js/src/tests/ecma_3/RegExp/regress-209067.js index 98b4029ce403..d5616ac660ba 100644 --- a/js/src/tests/ecma_3/RegExp/regress-209067.js +++ b/js/src/tests/ecma_3/RegExp/regress-209067.js @@ -45,7 +45,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-209067.js'; var UBound = 0; var BUGNUMBER = 209067; var summary = 'Testing complicated str.replace()'; diff --git a/js/src/tests/ecma_3/RegExp/regress-209919.js b/js/src/tests/ecma_3/RegExp/regress-209919.js index 62c3cd86f011..9f944dae8956 100644 --- a/js/src/tests/ecma_3/RegExp/regress-209919.js +++ b/js/src/tests/ecma_3/RegExp/regress-209919.js @@ -45,7 +45,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-209919.js'; var i = 0; var BUGNUMBER = 209919; var summary = 'Testing regexp submatches with quantifiers'; diff --git a/js/src/tests/ecma_3/RegExp/regress-216591.js b/js/src/tests/ecma_3/RegExp/regress-216591.js index 455565ae3621..068bcc9cab77 100644 --- a/js/src/tests/ecma_3/RegExp/regress-216591.js +++ b/js/src/tests/ecma_3/RegExp/regress-216591.js @@ -45,7 +45,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-216591.js'; var i = 0; var BUGNUMBER = 216591; var summary = 'Regexp conformance test'; diff --git a/js/src/tests/ecma_3/RegExp/regress-220367-001.js b/js/src/tests/ecma_3/RegExp/regress-220367-001.js index 59abc0c4b0eb..f0450f896cc8 100644 --- a/js/src/tests/ecma_3/RegExp/regress-220367-001.js +++ b/js/src/tests/ecma_3/RegExp/regress-220367-001.js @@ -45,7 +45,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-220367-001.js'; var i = 0; var BUGNUMBER = 220367; var summary = 'Regexp conformance test'; diff --git a/js/src/tests/ecma_3/RegExp/regress-223273.js b/js/src/tests/ecma_3/RegExp/regress-223273.js index 2858e854877d..ca82b8bb8041 100644 --- a/js/src/tests/ecma_3/RegExp/regress-223273.js +++ b/js/src/tests/ecma_3/RegExp/regress-223273.js @@ -58,7 +58,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-223273.js'; var UBound = 0; var BUGNUMBER = 223273; var summary = 'Unescaped, unbalanced parens in regexp should be a SyntaxError'; diff --git a/js/src/tests/ecma_3/RegExp/regress-223535.js b/js/src/tests/ecma_3/RegExp/regress-223535.js index 82305502fd51..6aec509f9910 100644 --- a/js/src/tests/ecma_3/RegExp/regress-223535.js +++ b/js/src/tests/ecma_3/RegExp/regress-223535.js @@ -45,7 +45,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-223535.js'; var i = 0; var BUGNUMBER = 223535; var summary = 'Testing regexps with empty alternatives'; diff --git a/js/src/tests/ecma_3/RegExp/regress-224676.js b/js/src/tests/ecma_3/RegExp/regress-224676.js index 7f1c2829bb56..5d7136726d14 100644 --- a/js/src/tests/ecma_3/RegExp/regress-224676.js +++ b/js/src/tests/ecma_3/RegExp/regress-224676.js @@ -45,7 +45,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-224676.js'; var i = 0; var BUGNUMBER = 224676; var summary = 'Regexps with various disjunction + character class patterns'; diff --git a/js/src/tests/ecma_3/RegExp/regress-225289.js b/js/src/tests/ecma_3/RegExp/regress-225289.js index 6e05d12ead35..341886bcc04a 100644 --- a/js/src/tests/ecma_3/RegExp/regress-225289.js +++ b/js/src/tests/ecma_3/RegExp/regress-225289.js @@ -45,7 +45,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-225289.js'; var i = 0; var BUGNUMBER = 225289; var summary = 'Testing regexps with complementary alternatives'; diff --git a/js/src/tests/ecma_3/RegExp/regress-225343.js b/js/src/tests/ecma_3/RegExp/regress-225343.js index 25e248adaa11..9474811c2680 100644 --- a/js/src/tests/ecma_3/RegExp/regress-225343.js +++ b/js/src/tests/ecma_3/RegExp/regress-225343.js @@ -45,7 +45,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-225343.js'; var i = 0; var BUGNUMBER = 225343; var summary = 'Testing regexp character classes and the case-insensitive flag'; diff --git a/js/src/tests/ecma_3/RegExp/regress-24712.js b/js/src/tests/ecma_3/RegExp/regress-24712.js index c94472195fac..196d0acb61d6 100644 --- a/js/src/tests/ecma_3/RegExp/regress-24712.js +++ b/js/src/tests/ecma_3/RegExp/regress-24712.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-24712.js'; test(); diff --git a/js/src/tests/ecma_3/RegExp/regress-285219.js b/js/src/tests/ecma_3/RegExp/regress-285219.js index 9d462359fabc..4fcd5b032945 100644 --- a/js/src/tests/ecma_3/RegExp/regress-285219.js +++ b/js/src/tests/ecma_3/RegExp/regress-285219.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-285219.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 285219; var summary = 'Do not crash on RangeError: reserved slot out of range'; diff --git a/js/src/tests/ecma_3/RegExp/regress-28686.js b/js/src/tests/ecma_3/RegExp/regress-28686.js index b3e355fa1cdd..47a3b18628da 100644 --- a/js/src/tests/ecma_3/RegExp/regress-28686.js +++ b/js/src/tests/ecma_3/RegExp/regress-28686.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-28686.js'; test(); diff --git a/js/src/tests/ecma_3/RegExp/regress-289669.js b/js/src/tests/ecma_3/RegExp/regress-289669.js index 2e3d044b7456..068bef6a8dd9 100644 --- a/js/src/tests/ecma_3/RegExp/regress-289669.js +++ b/js/src/tests/ecma_3/RegExp/regress-289669.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-289669.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 289669; var summary = 'O(N^2) behavior on String.replace(/RegExp/, ...)'; diff --git a/js/src/tests/ecma_3/RegExp/regress-307456.js b/js/src/tests/ecma_3/RegExp/regress-307456.js index dd2f540f6c28..228d2a2f67d5 100644 --- a/js/src/tests/ecma_3/RegExp/regress-307456.js +++ b/js/src/tests/ecma_3/RegExp/regress-307456.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-307456.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 307456; var summary = 'Do not Freeze with RegExp'; diff --git a/js/src/tests/ecma_3/RegExp/regress-309840.js b/js/src/tests/ecma_3/RegExp/regress-309840.js index 8680b7bcfd18..a64754dd83ef 100644 --- a/js/src/tests/ecma_3/RegExp/regress-309840.js +++ b/js/src/tests/ecma_3/RegExp/regress-309840.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-309840.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 309840; var summary = 'Treat / in a literal regexp class as valid'; diff --git a/js/src/tests/ecma_3/RegExp/regress-311414.js b/js/src/tests/ecma_3/RegExp/regress-311414.js index a24a07bb2bc8..e65de151ecca 100644 --- a/js/src/tests/ecma_3/RegExp/regress-311414.js +++ b/js/src/tests/ecma_3/RegExp/regress-311414.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-311414.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 311414; var summary = 'RegExp captured tail match should be O(N)'; diff --git a/js/src/tests/ecma_3/RegExp/regress-312351.js b/js/src/tests/ecma_3/RegExp/regress-312351.js index a9b00d317c2c..e0cc2db0a638 100644 --- a/js/src/tests/ecma_3/RegExp/regress-312351.js +++ b/js/src/tests/ecma_3/RegExp/regress-312351.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-312351.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 312351; var summary = 'Do not crash on RegExp(null)'; diff --git a/js/src/tests/ecma_3/RegExp/regress-31316.js b/js/src/tests/ecma_3/RegExp/regress-31316.js index 594913f07c41..923374a57bad 100644 --- a/js/src/tests/ecma_3/RegExp/regress-31316.js +++ b/js/src/tests/ecma_3/RegExp/regress-31316.js @@ -45,7 +45,6 @@ * See http://bugzilla.mozilla.org/show_bug.cgi?id=31316 */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-31316.js'; var i = 0; var BUGNUMBER = 31316; var summary = 'Regression test for Bugzilla bug 31316'; diff --git a/js/src/tests/ecma_3/RegExp/regress-330684.js b/js/src/tests/ecma_3/RegExp/regress-330684.js index b097fbc3d71a..e6004e563676 100644 --- a/js/src/tests/ecma_3/RegExp/regress-330684.js +++ b/js/src/tests/ecma_3/RegExp/regress-330684.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-330684.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 330684; var summary = 'Do not hang on RegExp'; diff --git a/js/src/tests/ecma_3/RegExp/regress-334158.js b/js/src/tests/ecma_3/RegExp/regress-334158.js index 41ebf0a731bc..4ea5c2acb26c 100644 --- a/js/src/tests/ecma_3/RegExp/regress-334158.js +++ b/js/src/tests/ecma_3/RegExp/regress-334158.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-334158.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 334158; var summary = 'Parse error in control letter escapes (RegExp)'; diff --git a/js/src/tests/ecma_3/RegExp/regress-346090.js b/js/src/tests/ecma_3/RegExp/regress-346090.js index dfd53a9922f5..d90794e4a62a 100644 --- a/js/src/tests/ecma_3/RegExp/regress-346090.js +++ b/js/src/tests/ecma_3/RegExp/regress-346090.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-346090.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 346090; var summary = 'Do not crash with this regexp'; diff --git a/js/src/tests/ecma_3/RegExp/regress-367888.js b/js/src/tests/ecma_3/RegExp/regress-367888.js index 923c1e5ab32a..ca29a71308a0 100644 --- a/js/src/tests/ecma_3/RegExp/regress-367888.js +++ b/js/src/tests/ecma_3/RegExp/regress-367888.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-367888.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 367888; var summary = 'RegExp /(|)??x/g.exec("y") barfs'; diff --git a/js/src/tests/ecma_3/RegExp/regress-375642.js b/js/src/tests/ecma_3/RegExp/regress-375642.js index 236eb00d282c..6e8124330e7d 100644 --- a/js/src/tests/ecma_3/RegExp/regress-375642.js +++ b/js/src/tests/ecma_3/RegExp/regress-375642.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-375642.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 375642; var summary = 'RegExp /(?:a??)+?/.exec("")'; diff --git a/js/src/tests/ecma_3/RegExp/regress-375651.js b/js/src/tests/ecma_3/RegExp/regress-375651.js index dc191ca312a9..048687a8bbe9 100755 --- a/js/src/tests/ecma_3/RegExp/regress-375651.js +++ b/js/src/tests/ecma_3/RegExp/regress-375651.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-375651.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 375651; diff --git a/js/src/tests/ecma_3/RegExp/regress-375711.js b/js/src/tests/ecma_3/RegExp/regress-375711.js index 6e7339f9e95b..b014024951b5 100644 --- a/js/src/tests/ecma_3/RegExp/regress-375711.js +++ b/js/src/tests/ecma_3/RegExp/regress-375711.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-375711.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 375711; var summary = 'Do not assert with /[Q-b]/i.exec("")'; diff --git a/js/src/tests/ecma_3/RegExp/regress-375715-01-n.js b/js/src/tests/ecma_3/RegExp/regress-375715-01-n.js index 437dcbd5c5ea..3a857e3dbec5 100644 --- a/js/src/tests/ecma_3/RegExp/regress-375715-01-n.js +++ b/js/src/tests/ecma_3/RegExp/regress-375715-01-n.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-375715-01-n.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 375715; var summary = 'Do not assert: (c2 <= cs->length) && (c1 <= c2)'; diff --git a/js/src/tests/ecma_3/RegExp/regress-375715-02.js b/js/src/tests/ecma_3/RegExp/regress-375715-02.js index 3cd858e8454a..f696d4785ceb 100644 --- a/js/src/tests/ecma_3/RegExp/regress-375715-02.js +++ b/js/src/tests/ecma_3/RegExp/regress-375715-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-375715-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 375715; var summary = 'Do not assert: (c2 <= cs->length) && (c1 <= c2)'; diff --git a/js/src/tests/ecma_3/RegExp/regress-375715-03.js b/js/src/tests/ecma_3/RegExp/regress-375715-03.js index ffc5c5a4cc05..936012e6c631 100644 --- a/js/src/tests/ecma_3/RegExp/regress-375715-03.js +++ b/js/src/tests/ecma_3/RegExp/regress-375715-03.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-375715-03.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 375715; var summary = 'Do not assert: (c2 <= cs->length) && (c1 <= c2)'; diff --git a/js/src/tests/ecma_3/RegExp/regress-375715-04.js b/js/src/tests/ecma_3/RegExp/regress-375715-04.js index 0c78a372ee66..777fcbfabe43 100644 --- a/js/src/tests/ecma_3/RegExp/regress-375715-04.js +++ b/js/src/tests/ecma_3/RegExp/regress-375715-04.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-375715-04.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 375715; var summary = 'Do not assert: (c2 <= cs->length) && (c1 <= c2)'; diff --git a/js/src/tests/ecma_3/RegExp/regress-436700.js b/js/src/tests/ecma_3/RegExp/regress-436700.js index 5a19240d400a..d0b9cbf25ada 100644 --- a/js/src/tests/ecma_3/RegExp/regress-436700.js +++ b/js/src/tests/ecma_3/RegExp/regress-436700.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-436700.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 436700; var summary = 'Do not assert: 1 <= num && num <= 0x10000'; diff --git a/js/src/tests/ecma_3/RegExp/regress-465862.js b/js/src/tests/ecma_3/RegExp/regress-465862.js index 401790e633e8..b83dc966482e 100644 --- a/js/src/tests/ecma_3/RegExp/regress-465862.js +++ b/js/src/tests/ecma_3/RegExp/regress-465862.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-465862.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 465862; var summary = 'Do case-insensitive matching correctly in JIT for non-ASCII-letters'; diff --git a/js/src/tests/ecma_3/RegExp/regress-57572.js b/js/src/tests/ecma_3/RegExp/regress-57572.js index c7abd410bf51..f40b70394095 100644 --- a/js/src/tests/ecma_3/RegExp/regress-57572.js +++ b/js/src/tests/ecma_3/RegExp/regress-57572.js @@ -46,7 +46,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-57572.js'; var i = 0; var BUGNUMBER = 57572; var summary = 'Testing regular expressions containing "?"'; diff --git a/js/src/tests/ecma_3/RegExp/regress-57631.js b/js/src/tests/ecma_3/RegExp/regress-57631.js index dc222bfc0f19..a29178c8c045 100644 --- a/js/src/tests/ecma_3/RegExp/regress-57631.js +++ b/js/src/tests/ecma_3/RegExp/regress-57631.js @@ -47,7 +47,6 @@ * and we check to see that it does... */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-57631.js'; var BUGNUMBER = '57631'; var summary = 'Testing new RegExp(pattern,flag) with illegal pattern or flag'; var statprefix = 'Testing for error creating illegal RegExp object on pattern '; diff --git a/js/src/tests/ecma_3/RegExp/regress-67773.js b/js/src/tests/ecma_3/RegExp/regress-67773.js index 4ee0d5285495..b2cf8198b77d 100644 --- a/js/src/tests/ecma_3/RegExp/regress-67773.js +++ b/js/src/tests/ecma_3/RegExp/regress-67773.js @@ -46,7 +46,6 @@ * See http://bugzilla.mozilla.org/show_bug.cgi?id=69989 */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-67773.js'; var i = 0; var BUGNUMBER = 67773; var summary = 'Testing regular subexpressions followed by ? or +\n'; diff --git a/js/src/tests/ecma_3/RegExp/regress-72964.js b/js/src/tests/ecma_3/RegExp/regress-72964.js index 67a41e505c3b..cee44a0a2c57 100644 --- a/js/src/tests/ecma_3/RegExp/regress-72964.js +++ b/js/src/tests/ecma_3/RegExp/regress-72964.js @@ -45,7 +45,6 @@ * See http://bugzilla.mozilla.org/show_bug.cgi?id=72964 */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-72964.js'; var i = 0; var BUGNUMBER = 72964; var summary = 'Testing regular expressions containing non-Latin1 characters'; diff --git a/js/src/tests/ecma_3/RegExp/regress-76683.js b/js/src/tests/ecma_3/RegExp/regress-76683.js index 8792e379cae3..b6bb2fbb2b0c 100644 --- a/js/src/tests/ecma_3/RegExp/regress-76683.js +++ b/js/src/tests/ecma_3/RegExp/regress-76683.js @@ -45,7 +45,6 @@ * See http://bugzilla.mozilla.org/show_bug.cgi?id=76683 */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-76683.js'; var i = 0; var BUGNUMBER = 76683; var summary = 'Regression test for Bugzilla bug 76683'; diff --git a/js/src/tests/ecma_3/RegExp/regress-78156.js b/js/src/tests/ecma_3/RegExp/regress-78156.js index dd42ce060b69..0630774b7d1b 100644 --- a/js/src/tests/ecma_3/RegExp/regress-78156.js +++ b/js/src/tests/ecma_3/RegExp/regress-78156.js @@ -48,7 +48,6 @@ * across multiple lines, i.e. across '\n', '\r'. */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-78156.js'; var i = 0; var BUGNUMBER = 78156; var summary = 'Testing regular expressions with ^, $, and the m flag -'; diff --git a/js/src/tests/ecma_3/RegExp/regress-85721.js b/js/src/tests/ecma_3/RegExp/regress-85721.js index bca1a15e1931..13811d8267d8 100644 --- a/js/src/tests/ecma_3/RegExp/regress-85721.js +++ b/js/src/tests/ecma_3/RegExp/regress-85721.js @@ -47,7 +47,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-85721.js'; var BUGNUMBER = 85721; var summary = 'Performance: execution of regular expression'; var FAST = 100; // execution should be 100 ms or less to pass the test diff --git a/js/src/tests/ecma_3/RegExp/regress-87231.js b/js/src/tests/ecma_3/RegExp/regress-87231.js index b5467322eb3b..61be39ea7cbe 100644 --- a/js/src/tests/ecma_3/RegExp/regress-87231.js +++ b/js/src/tests/ecma_3/RegExp/regress-87231.js @@ -57,7 +57,6 @@ * Such "altruism" is the only way there can be a successful global match... */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-87231.js'; var i = 0; var BUGNUMBER = 87231; var cnEmptyString = ''; diff --git a/js/src/tests/ecma_3/RegExp/regress-98306.js b/js/src/tests/ecma_3/RegExp/regress-98306.js index a2bfc2bf9326..1d30df4fb4ea 100644 --- a/js/src/tests/ecma_3/RegExp/regress-98306.js +++ b/js/src/tests/ecma_3/RegExp/regress-98306.js @@ -45,7 +45,6 @@ * See http://bugzilla.mozilla.org/show_bug.cgi?id=98306 */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-98306.js'; var BUGNUMBER = 98306; var summary = "Testing that we don't crash on this code -"; var cnUBOUND = 10; diff --git a/js/src/tests/ecma_3/RegExp/shell.js b/js/src/tests/ecma_3/RegExp/shell.js index dbc733c37617..70b34db886da 100644 --- a/js/src/tests/ecma_3/RegExp/shell.js +++ b/js/src/tests/ecma_3/RegExp/shell.js @@ -43,7 +43,6 @@ */ //----------------------------------------------------------------------------- -gTestsubsuite = 'RegExp'; var MSG_PATTERN = '\nregexp = '; var MSG_STRING = '\nstring = '; diff --git a/js/src/tests/ecma_3/Regress/regress-385393-04.js b/js/src/tests/ecma_3/Regress/regress-385393-04.js index 6e735fd1d200..5e84ea433ec3 100644 --- a/js/src/tests/ecma_3/Regress/regress-385393-04.js +++ b/js/src/tests/ecma_3/Regress/regress-385393-04.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-385393-04.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 385393; var summary = 'Regression test for bug 385393'; diff --git a/js/src/tests/ecma_3/Regress/regress-419152.js b/js/src/tests/ecma_3/Regress/regress-419152.js index f57f3a4f98c8..e5c81c7ba274 100644 --- a/js/src/tests/ecma_3/Regress/regress-419152.js +++ b/js/src/tests/ecma_3/Regress/regress-419152.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-419152.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 419152; var summary = 'Shaver can not contain himself'; diff --git a/js/src/tests/ecma_3/Regress/regress-420087.js b/js/src/tests/ecma_3/Regress/regress-420087.js index 1f21d1973997..b63be554f725 100644 --- a/js/src/tests/ecma_3/Regress/regress-420087.js +++ b/js/src/tests/ecma_3/Regress/regress-420087.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-420087.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 420087; var summary = 'Do not assert: PCVCAP_MAKE(sprop->shape, 0, 0) == entry->vcap'; diff --git a/js/src/tests/ecma_3/Regress/regress-420610.js b/js/src/tests/ecma_3/Regress/regress-420610.js index ecd5a2dd4207..030f6ff7677a 100644 --- a/js/src/tests/ecma_3/Regress/regress-420610.js +++ b/js/src/tests/ecma_3/Regress/regress-420610.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-420610.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 420610; var summary = 'Do not crash with eval("this.x")'; diff --git a/js/src/tests/ecma_3/Regress/regress-441477-01.js b/js/src/tests/ecma_3/Regress/regress-441477-01.js index e8205eb768e3..80823369299e 100644 --- a/js/src/tests/ecma_3/Regress/regress-441477-01.js +++ b/js/src/tests/ecma_3/Regress/regress-441477-01.js @@ -5,7 +5,6 @@ * Contributor: Jason Orendorff */ -var gTestfile = 'regress-441477-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 441477-01; var summary = ''; diff --git a/js/src/tests/ecma_3/Regress/regress-469937.js b/js/src/tests/ecma_3/Regress/regress-469937.js index 59ef61f892d9..06f0f30efb8d 100755 --- a/js/src/tests/ecma_3/Regress/regress-469937.js +++ b/js/src/tests/ecma_3/Regress/regress-469937.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-469937.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 469937; var summary = 'Properties without DontEnum are sometimes not enumerated'; @@ -57,4 +56,4 @@ printStatus (summary); actual = found; })(); -reportCompare(expect, actual, summary); \ No newline at end of file +reportCompare(expect, actual, summary); diff --git a/js/src/tests/ecma_3/Regress/shell.js b/js/src/tests/ecma_3/Regress/shell.js index 8c8336902000..e69de29bb2d1 100644 --- a/js/src/tests/ecma_3/Regress/shell.js +++ b/js/src/tests/ecma_3/Regress/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Regress'; diff --git a/js/src/tests/ecma_3/Statements/12.10-01.js b/js/src/tests/ecma_3/Statements/12.10-01.js index af5f0842559d..cfbb4ca32497 100644 --- a/js/src/tests/ecma_3/Statements/12.10-01.js +++ b/js/src/tests/ecma_3/Statements/12.10-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '12.10-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 462734; var summary = 'evaluating lhs "Reference" *before* evaluating rhs'; diff --git a/js/src/tests/ecma_3/Statements/12.6.3.js b/js/src/tests/ecma_3/Statements/12.6.3.js index 97c3ca313660..d3aba4738c7f 100644 --- a/js/src/tests/ecma_3/Statements/12.6.3.js +++ b/js/src/tests/ecma_3/Statements/12.6.3.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '12.6.3.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 292731; var summary = 'for-in should not call valueOf method'; diff --git a/js/src/tests/ecma_3/Statements/regress-121744.js b/js/src/tests/ecma_3/Statements/regress-121744.js index 828cc5d8d55f..94f936b01e7c 100644 --- a/js/src/tests/ecma_3/Statements/regress-121744.js +++ b/js/src/tests/ecma_3/Statements/regress-121744.js @@ -67,7 +67,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-121744.js'; var UBound = 0; var BUGNUMBER = 121744; var summary = 'JS should error on |for(i in undefined)|, |for(i in null)|'; diff --git a/js/src/tests/ecma_3/Statements/regress-131348.js b/js/src/tests/ecma_3/Statements/regress-131348.js index 013e11417820..cd956b23e5e9 100644 --- a/js/src/tests/ecma_3/Statements/regress-131348.js +++ b/js/src/tests/ecma_3/Statements/regress-131348.js @@ -56,7 +56,6 @@ * See http://bugzilla.mozilla.org/show_bug.cgi?id=136893 */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-131348.js'; var UBound = 0; var BUGNUMBER = 131348; var summary = 'JS should not error on |for(i in undefined)|, |for(i in null)|'; diff --git a/js/src/tests/ecma_3/Statements/regress-157509.js b/js/src/tests/ecma_3/Statements/regress-157509.js index 0b1319ebbac9..b35955dd74e7 100644 --- a/js/src/tests/ecma_3/Statements/regress-157509.js +++ b/js/src/tests/ecma_3/Statements/regress-157509.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-157509.js'; var UBound = 0; var BUGNUMBER = 157509; var summary = "Testing for SyntaxError on usage of '\\' in identifiers"; diff --git a/js/src/tests/ecma_3/Statements/regress-194364.js b/js/src/tests/ecma_3/Statements/regress-194364.js index a139f2b9851f..709480b7a631 100644 --- a/js/src/tests/ecma_3/Statements/regress-194364.js +++ b/js/src/tests/ecma_3/Statements/regress-194364.js @@ -45,7 +45,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-194364.js'; var UBound = 0; var BUGNUMBER = 194364; var summary = 'Testing eval statements with conditional function expressions'; diff --git a/js/src/tests/ecma_3/Statements/regress-226517.js b/js/src/tests/ecma_3/Statements/regress-226517.js index d99bfb503e76..c3e9d909ea4f 100644 --- a/js/src/tests/ecma_3/Statements/regress-226517.js +++ b/js/src/tests/ecma_3/Statements/regress-226517.js @@ -45,7 +45,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-226517.js'; var UBound = 0; var BUGNUMBER = 226517; var summary = '|finally| statement should execute even after a |return|'; diff --git a/js/src/tests/ecma_3/Statements/regress-302439.js b/js/src/tests/ecma_3/Statements/regress-302439.js index e1ebdb6e3049..64ed645a1be5 100644 --- a/js/src/tests/ecma_3/Statements/regress-302439.js +++ b/js/src/tests/ecma_3/Statements/regress-302439.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-302439.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 302439; var summary = 'spandep fu should skip unused JSOP_TABLESWITCH jump table entries'; diff --git a/js/src/tests/ecma_3/Statements/regress-324650.js b/js/src/tests/ecma_3/Statements/regress-324650.js index 003cd0fa4285..2ec77ac49d17 100644 --- a/js/src/tests/ecma_3/Statements/regress-324650.js +++ b/js/src/tests/ecma_3/Statements/regress-324650.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-324650.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 324650; var summary = 'Switch Statement with many cases'; diff --git a/js/src/tests/ecma_3/Statements/regress-444979.js b/js/src/tests/ecma_3/Statements/regress-444979.js index 1a7aaf816d28..38edd3aa2356 100644 --- a/js/src/tests/ecma_3/Statements/regress-444979.js +++ b/js/src/tests/ecma_3/Statements/regress-444979.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-444979.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 444979; var summary = 'switch -0 is same as switch 0'; diff --git a/js/src/tests/ecma_3/Statements/regress-74474-001.js b/js/src/tests/ecma_3/Statements/regress-74474-001.js index 93dc425f7247..17b38d71d5ff 100644 --- a/js/src/tests/ecma_3/Statements/regress-74474-001.js +++ b/js/src/tests/ecma_3/Statements/regress-74474-001.js @@ -46,7 +46,6 @@ * See http://bugzilla.mozilla.org/show_bug.cgi?id=74474 */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-74474-001.js'; var UBound = 0; var BUGNUMBER = 74474; var summary = 'Testing switch statements with duplicate labels'; diff --git a/js/src/tests/ecma_3/Statements/regress-74474-002.js b/js/src/tests/ecma_3/Statements/regress-74474-002.js index 1c54849c4826..2d50af24d09d 100644 --- a/js/src/tests/ecma_3/Statements/regress-74474-002.js +++ b/js/src/tests/ecma_3/Statements/regress-74474-002.js @@ -46,7 +46,6 @@ * See ECMA3 Section 12.11, "The switch Statement" */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-74474-002.js'; var UBound = 0; var BUGNUMBER = 74474; var summary = 'Test of switch statement that overflows the stack-allocated bitmap'; diff --git a/js/src/tests/ecma_3/Statements/regress-74474-003.js b/js/src/tests/ecma_3/Statements/regress-74474-003.js index 0bbe062ca93d..5dd22d04eb71 100644 --- a/js/src/tests/ecma_3/Statements/regress-74474-003.js +++ b/js/src/tests/ecma_3/Statements/regress-74474-003.js @@ -46,7 +46,6 @@ * See ECMA3 Section 12.11, "The switch Statement" */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-74474-003.js'; var UBound = 0; var BUGNUMBER = 74474; var summary = 'Test of switch statement that overflows the stack-allocated bitmap'; diff --git a/js/src/tests/ecma_3/Statements/regress-83532-001.js b/js/src/tests/ecma_3/Statements/regress-83532-001.js index 8e2bb6b0107e..b57da512709e 100644 --- a/js/src/tests/ecma_3/Statements/regress-83532-001.js +++ b/js/src/tests/ecma_3/Statements/regress-83532-001.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-83532-001.js'; var BUGNUMBER = 83532; var summary = "Testing that we don't crash on switch case -1"; diff --git a/js/src/tests/ecma_3/Statements/regress-83532-002.js b/js/src/tests/ecma_3/Statements/regress-83532-002.js index 3bd5ce870377..39761bbfc38b 100644 --- a/js/src/tests/ecma_3/Statements/regress-83532-002.js +++ b/js/src/tests/ecma_3/Statements/regress-83532-002.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-83532-002.js'; var BUGNUMBER = 83532; var summary = "Testing that we don't crash on switch case -1"; var sToEval = ''; diff --git a/js/src/tests/ecma_3/Statements/shell.js b/js/src/tests/ecma_3/Statements/shell.js index 7346f697a5ba..e69de29bb2d1 100644 --- a/js/src/tests/ecma_3/Statements/shell.js +++ b/js/src/tests/ecma_3/Statements/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Statements'; diff --git a/js/src/tests/ecma_3/Statements/switch-001.js b/js/src/tests/ecma_3/Statements/switch-001.js index aae6659cc14a..3c0e8937f045 100644 --- a/js/src/tests/ecma_3/Statements/switch-001.js +++ b/js/src/tests/ecma_3/Statements/switch-001.js @@ -44,7 +44,6 @@ * See ECMA3 Section 12.11, "The switch Statement" */ //----------------------------------------------------------------------------- -var gTestfile = 'switch-001.js'; var UBound = 0; var BUGNUMBER = '(none)'; var summary = 'Testing the switch statement'; diff --git a/js/src/tests/ecma_3/String/15.5.4.11.js b/js/src/tests/ecma_3/String/15.5.4.11.js index ef518bb9e5d3..7cbf2114332b 100644 --- a/js/src/tests/ecma_3/String/15.5.4.11.js +++ b/js/src/tests/ecma_3/String/15.5.4.11.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '15.5.4.11.js'; var BUGNUMBER = 392378; var summary = '15.5.4.11 - String.prototype.replace'; var rex, f, a, i; diff --git a/js/src/tests/ecma_3/String/15.5.4.14.js b/js/src/tests/ecma_3/String/15.5.4.14.js index aa6c7354c2de..d5e57088ef92 100644 --- a/js/src/tests/ecma_3/String/15.5.4.14.js +++ b/js/src/tests/ecma_3/String/15.5.4.14.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '15.5.4.14.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 287630; var summary = '15.5.4.14 - String.prototype.split(/()/)'; diff --git a/js/src/tests/ecma_3/String/regress-104375.js b/js/src/tests/ecma_3/String/regress-104375.js index c5593948d70d..0352ca3ba4be 100644 --- a/js/src/tests/ecma_3/String/regress-104375.js +++ b/js/src/tests/ecma_3/String/regress-104375.js @@ -43,7 +43,6 @@ * See http://bugzilla.mozilla.org/show_bug.cgi?id=104375 */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-104375.js'; var UBound = 0; var BUGNUMBER = 104375; var summary = 'Testing string.replace() with backreferences'; diff --git a/js/src/tests/ecma_3/String/regress-189898.js b/js/src/tests/ecma_3/String/regress-189898.js index c75c0815136b..4206cece9ae8 100644 --- a/js/src/tests/ecma_3/String/regress-189898.js +++ b/js/src/tests/ecma_3/String/regress-189898.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-189898.js'; var UBound = 0; var BUGNUMBER = 189898; var summary = 'Regression test for bug 189898'; diff --git a/js/src/tests/ecma_3/String/regress-304376.js b/js/src/tests/ecma_3/String/regress-304376.js index 733cd713d8df..a25fd2a43440 100644 --- a/js/src/tests/ecma_3/String/regress-304376.js +++ b/js/src/tests/ecma_3/String/regress-304376.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-304376.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 304376; var summary = 'String.prototype should be readonly and permanent'; diff --git a/js/src/tests/ecma_3/String/regress-313567.js b/js/src/tests/ecma_3/String/regress-313567.js index 9610238cc321..c9f1cb8ec13b 100644 --- a/js/src/tests/ecma_3/String/regress-313567.js +++ b/js/src/tests/ecma_3/String/regress-313567.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-313567.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 313567; var summary = 'String.prototype.length should not be generic'; diff --git a/js/src/tests/ecma_3/String/regress-392378.js b/js/src/tests/ecma_3/String/regress-392378.js index 368fde12787a..6cbb5978b609 100644 --- a/js/src/tests/ecma_3/String/regress-392378.js +++ b/js/src/tests/ecma_3/String/regress-392378.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-392378.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 392378; var summary = 'Regular Expression Non-participating Capture Groups are inaccurate in edge cases'; diff --git a/js/src/tests/ecma_3/String/regress-83293.js b/js/src/tests/ecma_3/String/regress-83293.js index 55e74d4dd534..b6a8b992c462 100644 --- a/js/src/tests/ecma_3/String/regress-83293.js +++ b/js/src/tests/ecma_3/String/regress-83293.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-83293.js'; /* * Creation Date: 30 May 2001 diff --git a/js/src/tests/ecma_3/String/shell.js b/js/src/tests/ecma_3/String/shell.js index 7d850446cce8..e69de29bb2d1 100644 --- a/js/src/tests/ecma_3/String/shell.js +++ b/js/src/tests/ecma_3/String/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'String'; diff --git a/js/src/tests/ecma_3/Unicode/regress-352044-01.js b/js/src/tests/ecma_3/Unicode/regress-352044-01.js index bb10ac6f7af2..b134b3b46e5d 100644 --- a/js/src/tests/ecma_3/Unicode/regress-352044-01.js +++ b/js/src/tests/ecma_3/Unicode/regress-352044-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-352044-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 352044; var summary = 'issues with Unicode escape sequences in JavaScript source code'; diff --git a/js/src/tests/ecma_3/Unicode/regress-352044-02-n.js b/js/src/tests/ecma_3/Unicode/regress-352044-02-n.js index 0e3c4b01892a..efe25407b267 100644 --- a/js/src/tests/ecma_3/Unicode/regress-352044-02-n.js +++ b/js/src/tests/ecma_3/Unicode/regress-352044-02-n.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-352044-02-n.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 352044; var summary = 'issues with Unicode escape sequences in JavaScript source code'; diff --git a/js/src/tests/ecma_3/Unicode/shell.js b/js/src/tests/ecma_3/Unicode/shell.js index 97a64fe83d1e..e69de29bb2d1 100644 --- a/js/src/tests/ecma_3/Unicode/shell.js +++ b/js/src/tests/ecma_3/Unicode/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Unicode'; diff --git a/js/src/tests/ecma_3/Unicode/uc-001-n.js b/js/src/tests/ecma_3/Unicode/uc-001-n.js index 31a13f70e22b..f93f25b4c066 100644 --- a/js/src/tests/ecma_3/Unicode/uc-001-n.js +++ b/js/src/tests/ecma_3/Unicode/uc-001-n.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'uc-001-n.js'; test(); diff --git a/js/src/tests/ecma_3/Unicode/uc-001.js b/js/src/tests/ecma_3/Unicode/uc-001.js index 3fc0c8d9271c..6a9aa3025926 100644 --- a/js/src/tests/ecma_3/Unicode/uc-001.js +++ b/js/src/tests/ecma_3/Unicode/uc-001.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'uc-001.js'; test(); diff --git a/js/src/tests/ecma_3/Unicode/uc-002-n.js b/js/src/tests/ecma_3/Unicode/uc-002-n.js index f1ae9a749dee..e8cc0c1ba187 100644 --- a/js/src/tests/ecma_3/Unicode/uc-002-n.js +++ b/js/src/tests/ecma_3/Unicode/uc-002-n.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'uc-002-n.js'; DESCRIPTION = "Non-character escapes in identifiers negative test."; EXPECTED = "error"; diff --git a/js/src/tests/ecma_3/Unicode/uc-002.js b/js/src/tests/ecma_3/Unicode/uc-002.js index d19b2c4786a2..5e3aa690d8bf 100644 --- a/js/src/tests/ecma_3/Unicode/uc-002.js +++ b/js/src/tests/ecma_3/Unicode/uc-002.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'uc-002.js'; test(); diff --git a/js/src/tests/ecma_3/Unicode/uc-003.js b/js/src/tests/ecma_3/Unicode/uc-003.js index 66c3f098602f..8c2ea004c3bd 100644 --- a/js/src/tests/ecma_3/Unicode/uc-003.js +++ b/js/src/tests/ecma_3/Unicode/uc-003.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'uc-003.js'; test(); diff --git a/js/src/tests/ecma_3/Unicode/uc-004.js b/js/src/tests/ecma_3/Unicode/uc-004.js index a54923c52502..dac085ac66d2 100644 --- a/js/src/tests/ecma_3/Unicode/uc-004.js +++ b/js/src/tests/ecma_3/Unicode/uc-004.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'uc-004.js'; test(); diff --git a/js/src/tests/ecma_3/Unicode/uc-005.js b/js/src/tests/ecma_3/Unicode/uc-005.js index 3727042046af..9572e3b8ea52 100644 --- a/js/src/tests/ecma_3/Unicode/uc-005.js +++ b/js/src/tests/ecma_3/Unicode/uc-005.js @@ -66,7 +66,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'uc-005.js'; var UBound = 0; var BUGNUMBER = 58274; var summary = 'Testing identifiers with double-byte names'; diff --git a/js/src/tests/ecma_3/extensions/10.1.3-2.js b/js/src/tests/ecma_3/extensions/10.1.3-2.js index f941cb780047..be4c6eb5e0c2 100644 --- a/js/src/tests/ecma_3/extensions/10.1.3-2.js +++ b/js/src/tests/ecma_3/extensions/10.1.3-2.js @@ -49,7 +49,6 @@ * extensions to the language. So we include a test for them at the beginning - */ //----------------------------------------------------------------------------- -var gTestfile = '10.1.3-2.js'; var UBound = 0; var BUGNUMBER = '(none)'; var summary = 'Testing functions having duplicate formal parameter names'; diff --git a/js/src/tests/ecma_3/extensions/7.9.1.js b/js/src/tests/ecma_3/extensions/7.9.1.js index b69e9d065abb..5c3c2df76e19 100644 --- a/js/src/tests/ecma_3/extensions/7.9.1.js +++ b/js/src/tests/ecma_3/extensions/7.9.1.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '7.9.1.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 402386; var summary = 'Automatic Semicolon insertion in restricted statements'; diff --git a/js/src/tests/ecma_3/extensions/regress-103087.js b/js/src/tests/ecma_3/extensions/regress-103087.js index 8cef9404e95e..a9af59ac06ea 100644 --- a/js/src/tests/ecma_3/extensions/regress-103087.js +++ b/js/src/tests/ecma_3/extensions/regress-103087.js @@ -49,7 +49,6 @@ * I crashed on that, and also on i=43 ('XML_SPE' regexp) */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-103087.js'; var UBound = 0; var BUGNUMBER = 103087; var summary = "Testing that we don't crash on any of these regexps -"; diff --git a/js/src/tests/ecma_3/extensions/regress-188206-01.js b/js/src/tests/ecma_3/extensions/regress-188206-01.js index f09963a7b544..b4c1f377fa15 100644 --- a/js/src/tests/ecma_3/extensions/regress-188206-01.js +++ b/js/src/tests/ecma_3/extensions/regress-188206-01.js @@ -37,7 +37,6 @@ * ***** END LICENSE BLOCK ***** */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-188206-01.js'; var UBound = 0; var BUGNUMBER = 188206; var summary = 'Invalid use of regexp quantifiers should generate SyntaxErrors'; diff --git a/js/src/tests/ecma_3/extensions/regress-188206-02.js b/js/src/tests/ecma_3/extensions/regress-188206-02.js index 3bd079fae6b1..292e7c7279c7 100644 --- a/js/src/tests/ecma_3/extensions/regress-188206-02.js +++ b/js/src/tests/ecma_3/extensions/regress-188206-02.js @@ -37,7 +37,6 @@ * ***** END LICENSE BLOCK ***** */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-188206-02.js'; var UBound = 0; var BUGNUMBER = 188206; var summary = 'Invalid use of regexp quantifiers should generate SyntaxErrors'; diff --git a/js/src/tests/ecma_3/extensions/regress-220367-002.js b/js/src/tests/ecma_3/extensions/regress-220367-002.js index 7af2a9d63f20..51e0e2e37601 100644 --- a/js/src/tests/ecma_3/extensions/regress-220367-002.js +++ b/js/src/tests/ecma_3/extensions/regress-220367-002.js @@ -45,7 +45,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-220367-002.js'; var UBound = 0; var BUGNUMBER = 220367; var summary = 'Regexp conformance test'; diff --git a/js/src/tests/ecma_3/extensions/regress-228087.js b/js/src/tests/ecma_3/extensions/regress-228087.js index 6e16126cc014..1e8dcaa20bc3 100644 --- a/js/src/tests/ecma_3/extensions/regress-228087.js +++ b/js/src/tests/ecma_3/extensions/regress-228087.js @@ -49,7 +49,6 @@ * See http://bugzilla.mozilla.org/show_bug.cgi?id=223273 and its testcase. */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-228087.js'; var i = 0; var BUGNUMBER = 228087; var summary = 'Testing regexps with unescaped braces'; diff --git a/js/src/tests/ecma_3/extensions/regress-274152.js b/js/src/tests/ecma_3/extensions/regress-274152.js index d7074d91287a..2810f3f09f69 100644 --- a/js/src/tests/ecma_3/extensions/regress-274152.js +++ b/js/src/tests/ecma_3/extensions/regress-274152.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-274152.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 274152; var summary = 'Do not ignore unicode format-control characters'; diff --git a/js/src/tests/ecma_3/extensions/regress-320854.js b/js/src/tests/ecma_3/extensions/regress-320854.js index 85e684882fa1..c244b85338b3 100644 --- a/js/src/tests/ecma_3/extensions/regress-320854.js +++ b/js/src/tests/ecma_3/extensions/regress-320854.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-320854.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 320854; var summary = 'o.hasOwnProperty("length") should not lie when o has function in proto chain'; diff --git a/js/src/tests/ecma_3/extensions/regress-327170.js b/js/src/tests/ecma_3/extensions/regress-327170.js index 5d15ce31a911..20de1db3db50 100644 --- a/js/src/tests/ecma_3/extensions/regress-327170.js +++ b/js/src/tests/ecma_3/extensions/regress-327170.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-327170.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 327170; var summary = 'Reuse of RegExp in string.replace(rx.compile(...), function() { rx.compile(...); }) causes a crash'; diff --git a/js/src/tests/ecma_3/extensions/regress-368516.js b/js/src/tests/ecma_3/extensions/regress-368516.js index a5f5fb769bad..a78909d42090 100644 --- a/js/src/tests/ecma_3/extensions/regress-368516.js +++ b/js/src/tests/ecma_3/extensions/regress-368516.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-368516.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 368516; var summary = 'Treat unicode BOM characters as whitespace'; diff --git a/js/src/tests/ecma_3/extensions/regress-385393-03.js b/js/src/tests/ecma_3/extensions/regress-385393-03.js index 40c7e8dd8107..0aaa5647c834 100644 --- a/js/src/tests/ecma_3/extensions/regress-385393-03.js +++ b/js/src/tests/ecma_3/extensions/regress-385393-03.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-385393-03.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 385393; diff --git a/js/src/tests/ecma_3/extensions/regress-429248.js b/js/src/tests/ecma_3/extensions/regress-429248.js index 996626911526..31f656c60f93 100644 --- a/js/src/tests/ecma_3/extensions/regress-429248.js +++ b/js/src/tests/ecma_3/extensions/regress-429248.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-429248.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 429248; var summary = 'Do not assert: 0'; diff --git a/js/src/tests/ecma_3/extensions/regress-430740.js b/js/src/tests/ecma_3/extensions/regress-430740.js index 446adb95a6d8..638bb1c84920 100644 --- a/js/src/tests/ecma_3/extensions/regress-430740.js +++ b/js/src/tests/ecma_3/extensions/regress-430740.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-430740.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 430740; var summary = 'Do not strip format-control characters from string literals'; diff --git a/js/src/tests/ecma_3/extensions/shell.js b/js/src/tests/ecma_3/extensions/shell.js index d83e3591af08..70b34db886da 100644 --- a/js/src/tests/ecma_3/extensions/shell.js +++ b/js/src/tests/ecma_3/extensions/shell.js @@ -43,7 +43,6 @@ */ //----------------------------------------------------------------------------- -gTestsubsuite = 'extensions'; var MSG_PATTERN = '\nregexp = '; var MSG_STRING = '\nstring = '; diff --git a/js/src/tests/ecma_3/shell.js b/js/src/tests/ecma_3/shell.js index ea63a51957c5..789059f6b15a 100644 --- a/js/src/tests/ecma_3/shell.js +++ b/js/src/tests/ecma_3/shell.js @@ -37,4 +37,3 @@ * * ***** END LICENSE BLOCK ***** */ -gTestsuite = 'ecma_3'; diff --git a/js/src/tests/ecma_3/template.js b/js/src/tests/ecma_3/template.js index 4dfe62ffe310..8b892ec769b9 100644 --- a/js/src/tests/ecma_3/template.js +++ b/js/src/tests/ecma_3/template.js @@ -5,7 +5,6 @@ * Contributor: */ -var gTestfile = 'template.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 99999; var summary = ''; diff --git a/js/src/tests/ecma_3_1/Object/regress-444787.js b/js/src/tests/ecma_3_1/Object/regress-444787.js index 21ffcdafeafa..fcc3efaa656e 100644 --- a/js/src/tests/ecma_3_1/Object/regress-444787.js +++ b/js/src/tests/ecma_3_1/Object/regress-444787.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-444787.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 444787; var summary = 'Object.getPrototypeOf'; diff --git a/js/src/tests/ecma_3_1/Object/shell.js b/js/src/tests/ecma_3_1/Object/shell.js index 114255345b4e..e69de29bb2d1 100644 --- a/js/src/tests/ecma_3_1/Object/shell.js +++ b/js/src/tests/ecma_3_1/Object/shell.js @@ -1 +0,0 @@ -gTestsubsuite='Object'; diff --git a/js/src/tests/ecma_3_1/RegExp/regress-305064.js b/js/src/tests/ecma_3_1/RegExp/regress-305064.js index 9bbb13828621..59ce25c93d8e 100644 --- a/js/src/tests/ecma_3_1/RegExp/regress-305064.js +++ b/js/src/tests/ecma_3_1/RegExp/regress-305064.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-305064.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 305064; var summary = 'CharacterClassEscape \\s'; diff --git a/js/src/tests/ecma_3_1/RegExp/shell.js b/js/src/tests/ecma_3_1/RegExp/shell.js index f5fba0512240..e69de29bb2d1 100644 --- a/js/src/tests/ecma_3_1/RegExp/shell.js +++ b/js/src/tests/ecma_3_1/RegExp/shell.js @@ -1 +0,0 @@ -gTestsubsuite='RegExp'; diff --git a/js/src/tests/ecma_3_1/extensions/shell.js b/js/src/tests/ecma_3_1/extensions/shell.js index 3f52cffbc059..e69de29bb2d1 100644 --- a/js/src/tests/ecma_3_1/extensions/shell.js +++ b/js/src/tests/ecma_3_1/extensions/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'extensions'; diff --git a/js/src/tests/ecma_3_1/shell.js b/js/src/tests/ecma_3_1/shell.js index 8ed96b740314..789059f6b15a 100644 --- a/js/src/tests/ecma_3_1/shell.js +++ b/js/src/tests/ecma_3_1/shell.js @@ -37,4 +37,3 @@ * * ***** END LICENSE BLOCK ***** */ -gTestsuite = 'ecma_3_1'; diff --git a/js/src/tests/ecma_3_1/template.js b/js/src/tests/ecma_3_1/template.js index 4dfe62ffe310..8b892ec769b9 100644 --- a/js/src/tests/ecma_3_1/template.js +++ b/js/src/tests/ecma_3_1/template.js @@ -5,7 +5,6 @@ * Contributor: */ -var gTestfile = 'template.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 99999; var summary = ''; diff --git a/js/src/tests/ecma_5/Array/shell.js b/js/src/tests/ecma_5/Array/shell.js index a218a2226cea..e69de29bb2d1 100644 --- a/js/src/tests/ecma_5/Array/shell.js +++ b/js/src/tests/ecma_5/Array/shell.js @@ -1 +0,0 @@ -gTestsubsuite='Array'; diff --git a/js/src/tests/ecma_5/Array/toLocaleString-01.js b/js/src/tests/ecma_5/Array/toLocaleString-01.js index ef7bd952e0a6..d5734ec9185f 100644 --- a/js/src/tests/ecma_5/Array/toLocaleString-01.js +++ b/js/src/tests/ecma_5/Array/toLocaleString-01.js @@ -5,7 +5,6 @@ * Jeff Walden */ -var gTestfile = 'toLocaleString-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 562446; var summary = 'ES5: Array.prototype.toLocaleString'; diff --git a/js/src/tests/ecma_5/Array/toString-01.js b/js/src/tests/ecma_5/Array/toString-01.js index 969e0851727b..a92fe6369ba9 100644 --- a/js/src/tests/ecma_5/Array/toString-01.js +++ b/js/src/tests/ecma_5/Array/toString-01.js @@ -5,7 +5,6 @@ * Jeff Walden */ -var gTestfile = 'toString-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 562446; var summary = 'ES5: Array.prototype.toString'; diff --git a/js/src/tests/ecma_5/Date/15.9.4.2.js b/js/src/tests/ecma_5/Date/15.9.4.2.js index ecf81b75a925..feafebba81c7 100644 --- a/js/src/tests/ecma_5/Date/15.9.4.2.js +++ b/js/src/tests/ecma_5/Date/15.9.4.2.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '15.9.4.2.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 430930; diff --git a/js/src/tests/ecma_5/Date/shell.js b/js/src/tests/ecma_5/Date/shell.js index 8ceac286bc20..e69de29bb2d1 100644 --- a/js/src/tests/ecma_5/Date/shell.js +++ b/js/src/tests/ecma_5/Date/shell.js @@ -1 +0,0 @@ -gTestsubsuite='Date'; diff --git a/js/src/tests/ecma_5/Expressions/11.1.5-01.js b/js/src/tests/ecma_5/Expressions/11.1.5-01.js index 243608ec36ff..b09d6365da08 100644 --- a/js/src/tests/ecma_5/Expressions/11.1.5-01.js +++ b/js/src/tests/ecma_5/Expressions/11.1.5-01.js @@ -1,7 +1,6 @@ // Any copyright is dedicated to the Public Domain. // http://creativecommons.org/licenses/publicdomain/ -var gTestfile = '11.1.5-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 520696; var summary = diff --git a/js/src/tests/ecma_5/Expressions/named-accessor-function.js b/js/src/tests/ecma_5/Expressions/named-accessor-function.js index c52eb6c6f9ab..d6a055487b20 100644 --- a/js/src/tests/ecma_5/Expressions/named-accessor-function.js +++ b/js/src/tests/ecma_5/Expressions/named-accessor-function.js @@ -3,7 +3,6 @@ // Contributor: // Jeff Walden -var gTestfile = 'named-accessor-function.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 999999; var summary = '{ get x y() { } } is not valid getter syntax'; diff --git a/js/src/tests/ecma_5/Expressions/shell.js b/js/src/tests/ecma_5/Expressions/shell.js index 032f0053b582..9c3e4eaf81fa 100644 --- a/js/src/tests/ecma_5/Expressions/shell.js +++ b/js/src/tests/ecma_5/Expressions/shell.js @@ -5,4 +5,3 @@ * http://creativecommons.org/licenses/publicdomain/ */ -var gTestsubsuite = 'Expressions'; diff --git a/js/src/tests/ecma_5/Function/15.3.4.3-01.js b/js/src/tests/ecma_5/Function/15.3.4.3-01.js index 47cb9387584c..e256059356d6 100644 --- a/js/src/tests/ecma_5/Function/15.3.4.3-01.js +++ b/js/src/tests/ecma_5/Function/15.3.4.3-01.js @@ -5,7 +5,6 @@ * Jeff Walden */ -var gTestfile = '15.3.4.3-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 562448; var summary = 'Function.prototype.apply should accept any arraylike arguments'; diff --git a/js/src/tests/ecma_5/Function/shell.js b/js/src/tests/ecma_5/Function/shell.js index 1dc37ed7344d..e69de29bb2d1 100644 --- a/js/src/tests/ecma_5/Function/shell.js +++ b/js/src/tests/ecma_5/Function/shell.js @@ -1 +0,0 @@ -gTestsubsuite='Function'; diff --git a/js/src/tests/ecma_5/Global/parseInt-01.js b/js/src/tests/ecma_5/Global/parseInt-01.js index 9975e0546ca9..0417086697e9 100644 --- a/js/src/tests/ecma_5/Global/parseInt-01.js +++ b/js/src/tests/ecma_5/Global/parseInt-01.js @@ -1,7 +1,6 @@ // Any copyright is dedicated to the Public Domain. // http://creativecommons.org/licenses/publicdomain/ -var gTestfile = 'parseInt-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 577536; var summary = "ES5 15.1.2.2 parseInt(string, radix)"; diff --git a/js/src/tests/ecma_5/Global/shell.js b/js/src/tests/ecma_5/Global/shell.js index 284f6f2fe683..e69de29bb2d1 100644 --- a/js/src/tests/ecma_5/Global/shell.js +++ b/js/src/tests/ecma_5/Global/shell.js @@ -1 +0,0 @@ -gTestsubsuite='Global'; diff --git a/js/src/tests/ecma_5/JSON/cyclic-stringify.js b/js/src/tests/ecma_5/JSON/cyclic-stringify.js index 3f72a2b9fca1..ad19e9e9de74 100644 --- a/js/src/tests/ecma_5/JSON/cyclic-stringify.js +++ b/js/src/tests/ecma_5/JSON/cyclic-stringify.js @@ -1,7 +1,6 @@ // Any copyright is dedicated to the Public Domain. // http://creativecommons.org/licenses/publicdomain/ -var gTestfile = 'cyclic-stringify.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 578273; var summary = diff --git a/js/src/tests/ecma_5/JSON/shell.js b/js/src/tests/ecma_5/JSON/shell.js index 413a0ddb0438..e69de29bb2d1 100644 --- a/js/src/tests/ecma_5/JSON/shell.js +++ b/js/src/tests/ecma_5/JSON/shell.js @@ -1 +0,0 @@ -gTestsubsuite='JSON'; diff --git a/js/src/tests/ecma_5/Object/15.2.3.14-01.js b/js/src/tests/ecma_5/Object/15.2.3.14-01.js index 796531745e54..81ab3fe38a5a 100644 --- a/js/src/tests/ecma_5/Object/15.2.3.14-01.js +++ b/js/src/tests/ecma_5/Object/15.2.3.14-01.js @@ -3,7 +3,6 @@ * http://creativecommons.org/licenses/publicdomain/ */ -var gTestfile = '15.2.3.14-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 307791; var summary = 'ES5 Object.keys(O)'; diff --git a/js/src/tests/ecma_5/Object/15.2.3.3-01.js b/js/src/tests/ecma_5/Object/15.2.3.3-01.js index 64ccb6110d1f..ee3487fba1f8 100644 --- a/js/src/tests/ecma_5/Object/15.2.3.3-01.js +++ b/js/src/tests/ecma_5/Object/15.2.3.3-01.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '15.2.3.3-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 505587; var summary = 'ES5 Object.getOwnPropertyDescriptor(O)'; diff --git a/js/src/tests/ecma_5/Object/15.2.3.4-01.js b/js/src/tests/ecma_5/Object/15.2.3.4-01.js index ce46bbb6a86f..3a84f0b667cb 100644 --- a/js/src/tests/ecma_5/Object/15.2.3.4-01.js +++ b/js/src/tests/ecma_5/Object/15.2.3.4-01.js @@ -5,7 +5,6 @@ * Jeff Walden */ -var gTestfile = '15.2.3.4-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 518663; var summary = diff --git a/js/src/tests/ecma_5/Object/15.2.3.4-02.js b/js/src/tests/ecma_5/Object/15.2.3.4-02.js index d6beb862587a..b5e0842c26db 100644 --- a/js/src/tests/ecma_5/Object/15.2.3.4-02.js +++ b/js/src/tests/ecma_5/Object/15.2.3.4-02.js @@ -5,7 +5,6 @@ * Jeff Walden */ -var gTestfile = '15.2.3.4-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 518663; var summary = 'Object.getOwnPropertyNames: array objects'; diff --git a/js/src/tests/ecma_5/Object/15.2.3.4-03.js b/js/src/tests/ecma_5/Object/15.2.3.4-03.js index e47a138df505..55dcc139c561 100644 --- a/js/src/tests/ecma_5/Object/15.2.3.4-03.js +++ b/js/src/tests/ecma_5/Object/15.2.3.4-03.js @@ -5,7 +5,6 @@ * Jeff Walden */ -var gTestfile = '15.2.3.4-03.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 518663; var summary = 'Object.getOwnPropertyNames: function objects'; diff --git a/js/src/tests/ecma_5/Object/15.2.3.4-04.js b/js/src/tests/ecma_5/Object/15.2.3.4-04.js index f53d1028f174..378a52e76e3a 100644 --- a/js/src/tests/ecma_5/Object/15.2.3.4-04.js +++ b/js/src/tests/ecma_5/Object/15.2.3.4-04.js @@ -5,7 +5,6 @@ * Jeff Walden */ -var gTestfile = '15.2.3.4-04.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 518663; var summary = 'Object.getOwnPropertyNames: regular expression objects'; diff --git a/js/src/tests/ecma_5/Object/15.2.3.5-01.js b/js/src/tests/ecma_5/Object/15.2.3.5-01.js index f623c2dc20b1..d4bd2edde273 100644 --- a/js/src/tests/ecma_5/Object/15.2.3.5-01.js +++ b/js/src/tests/ecma_5/Object/15.2.3.5-01.js @@ -3,7 +3,6 @@ * http://creativecommons.org/licenses/publicdomain/ */ -var gTestfile = '15.2.3.5-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 492840; var summary = 'ES5 Object.create(O [, Properties])'; diff --git a/js/src/tests/ecma_5/Object/15.2.3.6-define-over-method.js b/js/src/tests/ecma_5/Object/15.2.3.6-define-over-method.js index 63b7c36d3465..43b3e4146a2a 100644 --- a/js/src/tests/ecma_5/Object/15.2.3.6-define-over-method.js +++ b/js/src/tests/ecma_5/Object/15.2.3.6-define-over-method.js @@ -1,7 +1,6 @@ // Any copyright is dedicated to the Public Domain. // http://creativecommons.org/licenses/publicdomain/ -var gTestfile = '15.2.3.6-define-over-method.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 568786; var summary = diff --git a/js/src/tests/ecma_5/Object/15.2.3.6-function-length.js b/js/src/tests/ecma_5/Object/15.2.3.6-function-length.js index 3cfae6a83f29..497f04ce0c81 100644 --- a/js/src/tests/ecma_5/Object/15.2.3.6-function-length.js +++ b/js/src/tests/ecma_5/Object/15.2.3.6-function-length.js @@ -1,7 +1,6 @@ // Any copyright is dedicated to the Public Domain. // http://creativecommons.org/licenses/publicdomain/ -var gTestfile = '15.2.3.6-function-length.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 430133; var summary = 'ES5 Object.defineProperty(O, P, Attributes): Function.length'; diff --git a/js/src/tests/ecma_5/Object/15.2.3.6-miscellaneous.js b/js/src/tests/ecma_5/Object/15.2.3.6-miscellaneous.js index e5fef909b59c..9f671c52cec2 100644 --- a/js/src/tests/ecma_5/Object/15.2.3.6-miscellaneous.js +++ b/js/src/tests/ecma_5/Object/15.2.3.6-miscellaneous.js @@ -1,7 +1,6 @@ // Any copyright is dedicated to the Public Domain. // http://creativecommons.org/licenses/publicdomain/ -var gTestfile = '15.2.3.6-miscellaneous.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 430133; var summary = 'ES5 Object.defineProperty(O, P, Attributes)'; diff --git a/js/src/tests/ecma_5/Object/15.2.3.6-new-definition.js b/js/src/tests/ecma_5/Object/15.2.3.6-new-definition.js index 5b8b29ed94f3..1ba1d842d431 100644 --- a/js/src/tests/ecma_5/Object/15.2.3.6-new-definition.js +++ b/js/src/tests/ecma_5/Object/15.2.3.6-new-definition.js @@ -1,7 +1,6 @@ // Any copyright is dedicated to the Public Domain. // http://creativecommons.org/licenses/publicdomain/ -var gTestfile = '15.2.3.6-new-definition.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 430133; var summary = 'ES5 Object.defineProperty(O, P, Attributes): new definition'; diff --git a/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-1-of-4.js b/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-1-of-4.js index 257a1e1b39ae..c98963760e9a 100644 --- a/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-1-of-4.js +++ b/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-1-of-4.js @@ -3,7 +3,6 @@ var PART = 1, PARTS = 4; -var gTestfile = '15.2.3.6-redefinition-1-of-4.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 430133; var summary = diff --git a/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-2-of-4.js b/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-2-of-4.js index 1fb4478f7a35..a9ec292e3bc1 100644 --- a/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-2-of-4.js +++ b/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-2-of-4.js @@ -3,7 +3,6 @@ var PART = 2, PARTS = 4; -var gTestfile = '15.2.3.6-redefinition-2-of-4.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 430133; var summary = diff --git a/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-3-of-4.js b/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-3-of-4.js index d3ffba208236..136a3e28c198 100644 --- a/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-3-of-4.js +++ b/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-3-of-4.js @@ -3,7 +3,6 @@ var PART = 3, PARTS = 4; -var gTestfile = '15.2.3.6-redefinition-3-of-4.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 430133; var summary = diff --git a/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-4-of-4.js b/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-4-of-4.js index ae94e0f0fc65..4bede825ad6a 100644 --- a/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-4-of-4.js +++ b/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-4-of-4.js @@ -3,7 +3,6 @@ var PART = 4, PARTS = 4; -var gTestfile = '15.2.3.6-redefinition-4-of-4.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 430133; var summary = diff --git a/js/src/tests/ecma_5/Object/15.2.3.7-01.js b/js/src/tests/ecma_5/Object/15.2.3.7-01.js index 9e20c71e695a..5220e1483fea 100644 --- a/js/src/tests/ecma_5/Object/15.2.3.7-01.js +++ b/js/src/tests/ecma_5/Object/15.2.3.7-01.js @@ -3,7 +3,6 @@ * http://creativecommons.org/licenses/publicdomain/ */ -var gTestfile = '15.2.3.7-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 430133; var summary = 'ES5 Object.defineProperties(O, Properties)'; diff --git a/js/src/tests/ecma_5/Object/defineProperty-setup.js b/js/src/tests/ecma_5/Object/defineProperty-setup.js index 25d2acc1021d..4d620175f649 100644 --- a/js/src/tests/ecma_5/Object/defineProperty-setup.js +++ b/js/src/tests/ecma_5/Object/defineProperty-setup.js @@ -1064,8 +1064,6 @@ function runDictionaryPropertyPresentTestsFraction(PART, PARTS) function runNonTerminalPropertyPresentTestsFraction(PART, PARTS) { - var gTestfile = - '15.2.3.6-middle-redefinition-' + PART + '-of-' + PARTS + '.js'; var BUGNUMBER = 560566; var summary = 'ES5 Object.defineProperty(O, P, Attributes): middle redefinition ' + diff --git a/js/src/tests/ecma_5/Object/shell.js b/js/src/tests/ecma_5/Object/shell.js index 114255345b4e..e69de29bb2d1 100644 --- a/js/src/tests/ecma_5/Object/shell.js +++ b/js/src/tests/ecma_5/Object/shell.js @@ -1 +0,0 @@ -gTestsubsuite='Object'; diff --git a/js/src/tests/ecma_5/RegExp/15.10.7.5-01.js b/js/src/tests/ecma_5/RegExp/15.10.7.5-01.js index 8adfcdf591d8..ab9d071a7ea8 100644 --- a/js/src/tests/ecma_5/RegExp/15.10.7.5-01.js +++ b/js/src/tests/ecma_5/RegExp/15.10.7.5-01.js @@ -3,7 +3,6 @@ * http://creativecommons.org/licenses/publicdomain/ */ -var gTestfile = '15.10.7.5-01.js'; var BUGNUMBER = 465199; var summary = "RegExp lastIndex property set should not coerce type to number"; diff --git a/js/src/tests/ecma_5/RegExp/shell.js b/js/src/tests/ecma_5/RegExp/shell.js index f5fba0512240..e69de29bb2d1 100644 --- a/js/src/tests/ecma_5/RegExp/shell.js +++ b/js/src/tests/ecma_5/RegExp/shell.js @@ -1 +0,0 @@ -gTestsubsuite='RegExp'; diff --git a/js/src/tests/ecma_5/Types/8.12.5-01.js b/js/src/tests/ecma_5/Types/8.12.5-01.js index fc26031a6de8..5ebd363905bb 100644 --- a/js/src/tests/ecma_5/Types/8.12.5-01.js +++ b/js/src/tests/ecma_5/Types/8.12.5-01.js @@ -7,7 +7,6 @@ * Jeff Walden */ -var gTestfile = "template.js"; //----------------------------------------------------------------------------- var BUGNUMBER = 523846; var summary = diff --git a/js/src/tests/ecma_5/Types/shell.js b/js/src/tests/ecma_5/Types/shell.js index 9781dd06c428..e69de29bb2d1 100644 --- a/js/src/tests/ecma_5/Types/shell.js +++ b/js/src/tests/ecma_5/Types/shell.js @@ -1 +0,0 @@ -gTestsubsuite='Types'; diff --git a/js/src/tests/ecma_5/extensions/8.12.5-01.js b/js/src/tests/ecma_5/extensions/8.12.5-01.js index 1ba710aed3d5..05dcbd91cdbc 100644 --- a/js/src/tests/ecma_5/extensions/8.12.5-01.js +++ b/js/src/tests/ecma_5/extensions/8.12.5-01.js @@ -7,7 +7,6 @@ * Jeff Walden */ -var gTestfile = "template.js"; //----------------------------------------------------------------------------- var BUGNUMBER = 523846; var summary = diff --git a/js/src/tests/ecma_5/extensions/shell.js b/js/src/tests/ecma_5/extensions/shell.js index 97491bc0d066..9c3e4eaf81fa 100644 --- a/js/src/tests/ecma_5/extensions/shell.js +++ b/js/src/tests/ecma_5/extensions/shell.js @@ -5,4 +5,3 @@ * http://creativecommons.org/licenses/publicdomain/ */ -var gTestsubsuite = 'extensions'; diff --git a/js/src/tests/ecma_5/misc/enumerate-undefined.js b/js/src/tests/ecma_5/misc/enumerate-undefined.js index 163c611b2025..17bc1c4c87af 100644 --- a/js/src/tests/ecma_5/misc/enumerate-undefined.js +++ b/js/src/tests/ecma_5/misc/enumerate-undefined.js @@ -3,7 +3,6 @@ * http://creativecommons.org/licenses/publicdomain/ */ -var gTestfile = 'enumerate-undefined.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 547087; var summary = 'JS_EnumerateStandardClasses uses wrong attributes for undefined'; diff --git a/js/src/tests/ecma_5/misc/global-numeric-properties.js b/js/src/tests/ecma_5/misc/global-numeric-properties.js index 1a85945dc7ae..352c0d3b7507 100644 --- a/js/src/tests/ecma_5/misc/global-numeric-properties.js +++ b/js/src/tests/ecma_5/misc/global-numeric-properties.js @@ -3,7 +3,6 @@ * http://creativecommons.org/licenses/publicdomain/ */ -var gTestfile = 'global-numeric-properties.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 537863; var summary = diff --git a/js/src/tests/ecma_5/misc/redeclare-var-non-writable-property.js b/js/src/tests/ecma_5/misc/redeclare-var-non-writable-property.js index 760b7dcb4e51..f21289d853e0 100644 --- a/js/src/tests/ecma_5/misc/redeclare-var-non-writable-property.js +++ b/js/src/tests/ecma_5/misc/redeclare-var-non-writable-property.js @@ -3,7 +3,6 @@ * http://creativecommons.org/licenses/publicdomain/ */ -var gTestfile = 'redeclare-var-non-writable-property.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 539488; var summary = diff --git a/js/src/tests/ecma_5/misc/shell.js b/js/src/tests/ecma_5/misc/shell.js index 660919678092..e69de29bb2d1 100644 --- a/js/src/tests/ecma_5/misc/shell.js +++ b/js/src/tests/ecma_5/misc/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'misc'; diff --git a/js/src/tests/ecma_5/shell.js b/js/src/tests/ecma_5/shell.js index 2d56da4316dc..789059f6b15a 100644 --- a/js/src/tests/ecma_5/shell.js +++ b/js/src/tests/ecma_5/shell.js @@ -37,4 +37,3 @@ * * ***** END LICENSE BLOCK ***** */ -gTestsuite = 'ecma_5'; diff --git a/js/src/tests/ecma_5/strict/shell.js b/js/src/tests/ecma_5/strict/shell.js index 5f0f6f87062c..e92cd6ad7f05 100644 --- a/js/src/tests/ecma_5/strict/shell.js +++ b/js/src/tests/ecma_5/strict/shell.js @@ -5,7 +5,6 @@ * http://creativecommons.org/licenses/publicdomain/ */ -var gTestsubsuite='strict'; /* * Return true if both of these return true: diff --git a/js/src/tests/ecma_5/template.js b/js/src/tests/ecma_5/template.js index 4dfe62ffe310..8b892ec769b9 100644 --- a/js/src/tests/ecma_5/template.js +++ b/js/src/tests/ecma_5/template.js @@ -5,7 +5,6 @@ * Contributor: */ -var gTestfile = 'template.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 99999; var summary = ''; diff --git a/js/src/tests/js1_1/regress/function-001.js b/js/src/tests/js1_1/regress/function-001.js index 1e4dbc50dec5..34fa69fcd554 100644 --- a/js/src/tests/js1_1/regress/function-001.js +++ b/js/src/tests/js1_1/regress/function-001.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'function-001.js'; /** * File Name: boolean-001.js diff --git a/js/src/tests/js1_1/regress/shell.js b/js/src/tests/js1_1/regress/shell.js index b92184ffc7be..e69de29bb2d1 100644 --- a/js/src/tests/js1_1/regress/shell.js +++ b/js/src/tests/js1_1/regress/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'regress'; diff --git a/js/src/tests/js1_1/shell.js b/js/src/tests/js1_1/shell.js index 6eca631875f1..086eec9fd35e 100644 --- a/js/src/tests/js1_1/shell.js +++ b/js/src/tests/js1_1/shell.js @@ -35,5 +35,4 @@ * * ***** END LICENSE BLOCK ***** */ -gTestsuite = 'js1_1'; diff --git a/js/src/tests/js1_2/Array/array_split_1.js b/js/src/tests/js1_2/Array/array_split_1.js index e21f2746458f..ba0a9e597bc6 100644 --- a/js/src/tests/js1_2/Array/array_split_1.js +++ b/js/src/tests/js1_2/Array/array_split_1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'array_split_1.js'; /** File Name: array_split_1.js diff --git a/js/src/tests/js1_2/Array/general1.js b/js/src/tests/js1_2/Array/general1.js index 2ddc1031aa08..475811c86e0e 100644 --- a/js/src/tests/js1_2/Array/general1.js +++ b/js/src/tests/js1_2/Array/general1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'general1.js'; /** Filename: general1.js diff --git a/js/src/tests/js1_2/Array/general2.js b/js/src/tests/js1_2/Array/general2.js index 40291fdea06b..3278d0fa24b6 100644 --- a/js/src/tests/js1_2/Array/general2.js +++ b/js/src/tests/js1_2/Array/general2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'general2.js'; /** Filename: general2.js diff --git a/js/src/tests/js1_2/Array/shell.js b/js/src/tests/js1_2/Array/shell.js index 9480d9e77dae..e69de29bb2d1 100644 --- a/js/src/tests/js1_2/Array/shell.js +++ b/js/src/tests/js1_2/Array/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Array'; diff --git a/js/src/tests/js1_2/Array/slice.js b/js/src/tests/js1_2/Array/slice.js index 88807ccbcaee..600b6f9d2fdf 100644 --- a/js/src/tests/js1_2/Array/slice.js +++ b/js/src/tests/js1_2/Array/slice.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'slice.js'; /** Filename: slice.js diff --git a/js/src/tests/js1_2/Array/splice1.js b/js/src/tests/js1_2/Array/splice1.js index 91925a472f3a..6a787c40b667 100644 --- a/js/src/tests/js1_2/Array/splice1.js +++ b/js/src/tests/js1_2/Array/splice1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'splice1.js'; /** Filename: splice1.js diff --git a/js/src/tests/js1_2/Array/splice2.js b/js/src/tests/js1_2/Array/splice2.js index 1a445709d685..064a3d5572b0 100644 --- a/js/src/tests/js1_2/Array/splice2.js +++ b/js/src/tests/js1_2/Array/splice2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'splice2.js'; /** Filename: splice2.js diff --git a/js/src/tests/js1_2/Array/tostring_1.js b/js/src/tests/js1_2/Array/tostring_1.js index fc3d735124e8..f872d203883a 100644 --- a/js/src/tests/js1_2/Array/tostring_1.js +++ b/js/src/tests/js1_2/Array/tostring_1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'tostring_1.js'; /** File Name: tostring_1.js diff --git a/js/src/tests/js1_2/Array/tostring_2.js b/js/src/tests/js1_2/Array/tostring_2.js index 779005fa87a1..8dab857bcb49 100644 --- a/js/src/tests/js1_2/Array/tostring_2.js +++ b/js/src/tests/js1_2/Array/tostring_2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'tostring_2.js'; /** File Name: tostring_2.js diff --git a/js/src/tests/js1_2/Objects/shell.js b/js/src/tests/js1_2/Objects/shell.js index e62dabcc9ae0..e69de29bb2d1 100644 --- a/js/src/tests/js1_2/Objects/shell.js +++ b/js/src/tests/js1_2/Objects/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Objects'; diff --git a/js/src/tests/js1_2/Objects/toString-001.js b/js/src/tests/js1_2/Objects/toString-001.js index bea7fe5da646..ec2c9dff7535 100644 --- a/js/src/tests/js1_2/Objects/toString-001.js +++ b/js/src/tests/js1_2/Objects/toString-001.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'toString-001.js'; /** File Name: toString_1.js diff --git a/js/src/tests/js1_2/String/charCodeAt.js b/js/src/tests/js1_2/String/charCodeAt.js index 8be0f1092b42..45075fd78ef8 100644 --- a/js/src/tests/js1_2/String/charCodeAt.js +++ b/js/src/tests/js1_2/String/charCodeAt.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'charCodeAt.js'; /** Filename: charCodeAt.js diff --git a/js/src/tests/js1_2/String/concat.js b/js/src/tests/js1_2/String/concat.js index 4c7982a82a18..525b6ca27595 100644 --- a/js/src/tests/js1_2/String/concat.js +++ b/js/src/tests/js1_2/String/concat.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'concat.js'; /** Filename: concat.js diff --git a/js/src/tests/js1_2/String/match.js b/js/src/tests/js1_2/String/match.js index 77ea105aee92..070f88512eb8 100644 --- a/js/src/tests/js1_2/String/match.js +++ b/js/src/tests/js1_2/String/match.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'match.js'; /** Filename: match.js diff --git a/js/src/tests/js1_2/String/shell.js b/js/src/tests/js1_2/String/shell.js index 7d850446cce8..e69de29bb2d1 100644 --- a/js/src/tests/js1_2/String/shell.js +++ b/js/src/tests/js1_2/String/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'String'; diff --git a/js/src/tests/js1_2/String/slice.js b/js/src/tests/js1_2/String/slice.js index c231efb7e930..238fa8d367f8 100644 --- a/js/src/tests/js1_2/String/slice.js +++ b/js/src/tests/js1_2/String/slice.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'slice.js'; /** Filename: slice.js diff --git a/js/src/tests/js1_2/function/Function_object.js b/js/src/tests/js1_2/function/Function_object.js index 3c9f59a7478e..c6bcc7d229f1 100644 --- a/js/src/tests/js1_2/function/Function_object.js +++ b/js/src/tests/js1_2/function/Function_object.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'Function_object.js'; /** Filename: Function_object.js diff --git a/js/src/tests/js1_2/function/Number.js b/js/src/tests/js1_2/function/Number.js index b1cfa7e11f91..b91497926c96 100644 --- a/js/src/tests/js1_2/function/Number.js +++ b/js/src/tests/js1_2/function/Number.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'Number.js'; /** Filename: Number.js diff --git a/js/src/tests/js1_2/function/String.js b/js/src/tests/js1_2/function/String.js index 34dd1db59f4d..68f59c1c1ff0 100644 --- a/js/src/tests/js1_2/function/String.js +++ b/js/src/tests/js1_2/function/String.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'String.js'; /** Filename: String.js diff --git a/js/src/tests/js1_2/function/definition-1.js b/js/src/tests/js1_2/function/definition-1.js index f540e57de060..3e66eebbf76b 100644 --- a/js/src/tests/js1_2/function/definition-1.js +++ b/js/src/tests/js1_2/function/definition-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'definition-1.js'; /** File Name: definition-1.js diff --git a/js/src/tests/js1_2/function/function-001-n.js b/js/src/tests/js1_2/function/function-001-n.js index 54c9050908d3..0c5a7faadd4f 100644 --- a/js/src/tests/js1_2/function/function-001-n.js +++ b/js/src/tests/js1_2/function/function-001-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'function-001-n.js'; /** * File Name: boolean-001.js diff --git a/js/src/tests/js1_2/function/length.js b/js/src/tests/js1_2/function/length.js index 2cb6e97eb56a..4187c50f2785 100644 --- a/js/src/tests/js1_2/function/length.js +++ b/js/src/tests/js1_2/function/length.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'length.js'; /** File Name: 15.3.5.1.js diff --git a/js/src/tests/js1_2/function/nesting-1.js b/js/src/tests/js1_2/function/nesting-1.js index bc0d4a3fcce7..1d1a0073be56 100644 --- a/js/src/tests/js1_2/function/nesting-1.js +++ b/js/src/tests/js1_2/function/nesting-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'nesting-1.js'; /** File Name: nesting-1.js diff --git a/js/src/tests/js1_2/function/nesting.js b/js/src/tests/js1_2/function/nesting.js index 1e803c8e3b87..1195e572f0f0 100644 --- a/js/src/tests/js1_2/function/nesting.js +++ b/js/src/tests/js1_2/function/nesting.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'nesting.js'; /** Filename: nesting.js diff --git a/js/src/tests/js1_2/function/regexparg-1.js b/js/src/tests/js1_2/function/regexparg-1.js index 8f9bc16bf66c..93e0df4e9c25 100644 --- a/js/src/tests/js1_2/function/regexparg-1.js +++ b/js/src/tests/js1_2/function/regexparg-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regexparg-1.js'; /** File Name: regexparg-1.js diff --git a/js/src/tests/js1_2/function/regexparg-2-n.js b/js/src/tests/js1_2/function/regexparg-2-n.js index 57e856e6714c..5bf24d8c81c7 100644 --- a/js/src/tests/js1_2/function/regexparg-2-n.js +++ b/js/src/tests/js1_2/function/regexparg-2-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regexparg-2-n.js'; /** File Name: regexparg-1.js diff --git a/js/src/tests/js1_2/function/shell.js b/js/src/tests/js1_2/function/shell.js index 81794151e08f..e69de29bb2d1 100644 --- a/js/src/tests/js1_2/function/shell.js +++ b/js/src/tests/js1_2/function/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'function'; diff --git a/js/src/tests/js1_2/function/tostring-1.js b/js/src/tests/js1_2/function/tostring-1.js index b4f51abccba8..3b4e5283d464 100644 --- a/js/src/tests/js1_2/function/tostring-1.js +++ b/js/src/tests/js1_2/function/tostring-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'tostring-1.js'; /** File Name: tostring-1.js diff --git a/js/src/tests/js1_2/function/tostring-2.js b/js/src/tests/js1_2/function/tostring-2.js index f22cafed6f78..c4c54b719b4e 100644 --- a/js/src/tests/js1_2/function/tostring-2.js +++ b/js/src/tests/js1_2/function/tostring-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'tostring-2.js'; /** File Name: tostring-1.js diff --git a/js/src/tests/js1_2/operator/equality.js b/js/src/tests/js1_2/operator/equality.js index 2e03ba8e10b2..09bdc4cd4ca2 100644 --- a/js/src/tests/js1_2/operator/equality.js +++ b/js/src/tests/js1_2/operator/equality.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'equality.js'; /** Filename: equality.js diff --git a/js/src/tests/js1_2/operator/shell.js b/js/src/tests/js1_2/operator/shell.js index 561df675091e..e69de29bb2d1 100644 --- a/js/src/tests/js1_2/operator/shell.js +++ b/js/src/tests/js1_2/operator/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'operator'; diff --git a/js/src/tests/js1_2/operator/strictEquality.js b/js/src/tests/js1_2/operator/strictEquality.js index 3470ac404425..ea16fbc3108e 100644 --- a/js/src/tests/js1_2/operator/strictEquality.js +++ b/js/src/tests/js1_2/operator/strictEquality.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'strictEquality.js'; /** Filename: strictEquality.js diff --git a/js/src/tests/js1_2/regexp/RegExp_dollar_number.js b/js/src/tests/js1_2/regexp/RegExp_dollar_number.js index f871e84edf8a..97956f2be486 100644 --- a/js/src/tests/js1_2/regexp/RegExp_dollar_number.js +++ b/js/src/tests/js1_2/regexp/RegExp_dollar_number.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'RegExp_dollar_number.js'; /** Filename: RegExp_dollar_number.js diff --git a/js/src/tests/js1_2/regexp/RegExp_input.js b/js/src/tests/js1_2/regexp/RegExp_input.js index 0a55af614f7b..8d9c1d5a9dbf 100644 --- a/js/src/tests/js1_2/regexp/RegExp_input.js +++ b/js/src/tests/js1_2/regexp/RegExp_input.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'RegExp_input.js'; /** Filename: RegExp_input.js diff --git a/js/src/tests/js1_2/regexp/RegExp_input_as_array.js b/js/src/tests/js1_2/regexp/RegExp_input_as_array.js index 2982d6ae2ba9..2042947b908f 100644 --- a/js/src/tests/js1_2/regexp/RegExp_input_as_array.js +++ b/js/src/tests/js1_2/regexp/RegExp_input_as_array.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'RegExp_input_as_array.js'; /** Filename: RegExp_input_as_array.js diff --git a/js/src/tests/js1_2/regexp/RegExp_lastIndex.js b/js/src/tests/js1_2/regexp/RegExp_lastIndex.js index 63ac1dbbdeec..937d61a79c5d 100644 --- a/js/src/tests/js1_2/regexp/RegExp_lastIndex.js +++ b/js/src/tests/js1_2/regexp/RegExp_lastIndex.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'RegExp_lastIndex.js'; /** Filename: RegExp_lastIndex.js diff --git a/js/src/tests/js1_2/regexp/RegExp_lastMatch.js b/js/src/tests/js1_2/regexp/RegExp_lastMatch.js index d1aea5bf8ccb..0776fc13d030 100644 --- a/js/src/tests/js1_2/regexp/RegExp_lastMatch.js +++ b/js/src/tests/js1_2/regexp/RegExp_lastMatch.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'RegExp_lastMatch.js'; /** Filename: RegExp_lastMatch.js diff --git a/js/src/tests/js1_2/regexp/RegExp_lastMatch_as_array.js b/js/src/tests/js1_2/regexp/RegExp_lastMatch_as_array.js index cf923ba2eb34..623d69c12d38 100644 --- a/js/src/tests/js1_2/regexp/RegExp_lastMatch_as_array.js +++ b/js/src/tests/js1_2/regexp/RegExp_lastMatch_as_array.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'RegExp_lastMatch_as_array.js'; /** Filename: RegExp_lastMatch_as_array.js diff --git a/js/src/tests/js1_2/regexp/RegExp_lastParen.js b/js/src/tests/js1_2/regexp/RegExp_lastParen.js index c07ab3353536..b3e0edac439c 100644 --- a/js/src/tests/js1_2/regexp/RegExp_lastParen.js +++ b/js/src/tests/js1_2/regexp/RegExp_lastParen.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'RegExp_lastParen.js'; /** Filename: RegExp_lastParen.js diff --git a/js/src/tests/js1_2/regexp/RegExp_lastParen_as_array.js b/js/src/tests/js1_2/regexp/RegExp_lastParen_as_array.js index df0a285b3e75..01ff8b5631e4 100644 --- a/js/src/tests/js1_2/regexp/RegExp_lastParen_as_array.js +++ b/js/src/tests/js1_2/regexp/RegExp_lastParen_as_array.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'RegExp_lastParen_as_array.js'; /** Filename: RegExp_lastParen_as_array.js diff --git a/js/src/tests/js1_2/regexp/RegExp_leftContext.js b/js/src/tests/js1_2/regexp/RegExp_leftContext.js index 89a609f713dc..e21f79ede80d 100644 --- a/js/src/tests/js1_2/regexp/RegExp_leftContext.js +++ b/js/src/tests/js1_2/regexp/RegExp_leftContext.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'RegExp_leftContext.js'; /** Filename: RegExp_leftContext.js diff --git a/js/src/tests/js1_2/regexp/RegExp_leftContext_as_array.js b/js/src/tests/js1_2/regexp/RegExp_leftContext_as_array.js index 1c8c33747e05..cb06ebc2943b 100644 --- a/js/src/tests/js1_2/regexp/RegExp_leftContext_as_array.js +++ b/js/src/tests/js1_2/regexp/RegExp_leftContext_as_array.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'RegExp_leftContext_as_array.js'; /** Filename: RegExp_leftContext_as_array.js diff --git a/js/src/tests/js1_2/regexp/RegExp_multiline.js b/js/src/tests/js1_2/regexp/RegExp_multiline.js index affc2e23debc..10c155c41ccf 100644 --- a/js/src/tests/js1_2/regexp/RegExp_multiline.js +++ b/js/src/tests/js1_2/regexp/RegExp_multiline.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'RegExp_multiline.js'; /** Filename: RegExp_multiline.js diff --git a/js/src/tests/js1_2/regexp/RegExp_multiline_as_array.js b/js/src/tests/js1_2/regexp/RegExp_multiline_as_array.js index 276f1552a722..928c62e75af4 100644 --- a/js/src/tests/js1_2/regexp/RegExp_multiline_as_array.js +++ b/js/src/tests/js1_2/regexp/RegExp_multiline_as_array.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'RegExp_multiline_as_array.js'; /** Filename: RegExp_multiline_as_array.js diff --git a/js/src/tests/js1_2/regexp/RegExp_object.js b/js/src/tests/js1_2/regexp/RegExp_object.js index ab921b92e42c..d268f0fc8eb3 100644 --- a/js/src/tests/js1_2/regexp/RegExp_object.js +++ b/js/src/tests/js1_2/regexp/RegExp_object.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'RegExp_object.js'; /** Filename: RegExp_object.js diff --git a/js/src/tests/js1_2/regexp/RegExp_rightContext.js b/js/src/tests/js1_2/regexp/RegExp_rightContext.js index b05fdb2b6840..820fd465c62a 100644 --- a/js/src/tests/js1_2/regexp/RegExp_rightContext.js +++ b/js/src/tests/js1_2/regexp/RegExp_rightContext.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'RegExp_rightContext.js'; /** Filename: RegExp_rightContext.js diff --git a/js/src/tests/js1_2/regexp/RegExp_rightContext_as_array.js b/js/src/tests/js1_2/regexp/RegExp_rightContext_as_array.js index 1d452d438051..431c8735c246 100644 --- a/js/src/tests/js1_2/regexp/RegExp_rightContext_as_array.js +++ b/js/src/tests/js1_2/regexp/RegExp_rightContext_as_array.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'RegExp_rightContext_as_array.js'; /** Filename: RegExp_rightContext_as_array.js diff --git a/js/src/tests/js1_2/regexp/alphanumeric.js b/js/src/tests/js1_2/regexp/alphanumeric.js index cfb1609057c1..3f069d4d5750 100644 --- a/js/src/tests/js1_2/regexp/alphanumeric.js +++ b/js/src/tests/js1_2/regexp/alphanumeric.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'alphanumeric.js'; /** Filename: alphanumeric.js diff --git a/js/src/tests/js1_2/regexp/asterisk.js b/js/src/tests/js1_2/regexp/asterisk.js index eca32495d96a..2997228d6d01 100644 --- a/js/src/tests/js1_2/regexp/asterisk.js +++ b/js/src/tests/js1_2/regexp/asterisk.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'asterisk.js'; /** Filename: asterisk.js diff --git a/js/src/tests/js1_2/regexp/backslash.js b/js/src/tests/js1_2/regexp/backslash.js index 6c0098655b45..090ec93d1f90 100644 --- a/js/src/tests/js1_2/regexp/backslash.js +++ b/js/src/tests/js1_2/regexp/backslash.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'backslash.js'; /** Filename: backslash.js diff --git a/js/src/tests/js1_2/regexp/backspace.js b/js/src/tests/js1_2/regexp/backspace.js index 787a9fbeca35..5b12e497301d 100644 --- a/js/src/tests/js1_2/regexp/backspace.js +++ b/js/src/tests/js1_2/regexp/backspace.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'backspace.js'; /** Filename: backspace.js diff --git a/js/src/tests/js1_2/regexp/beginLine.js b/js/src/tests/js1_2/regexp/beginLine.js index d3df332a417b..99bcc513740e 100644 --- a/js/src/tests/js1_2/regexp/beginLine.js +++ b/js/src/tests/js1_2/regexp/beginLine.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'beginLine.js'; /** Filename: beginLine.js diff --git a/js/src/tests/js1_2/regexp/character_class.js b/js/src/tests/js1_2/regexp/character_class.js index 7dcd99123824..470ca3522d17 100644 --- a/js/src/tests/js1_2/regexp/character_class.js +++ b/js/src/tests/js1_2/regexp/character_class.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'character_class.js'; /** Filename: character_class.js diff --git a/js/src/tests/js1_2/regexp/compile.js b/js/src/tests/js1_2/regexp/compile.js index 59197a740097..a8e95b48a614 100644 --- a/js/src/tests/js1_2/regexp/compile.js +++ b/js/src/tests/js1_2/regexp/compile.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'compile.js'; /** Filename: compile.js diff --git a/js/src/tests/js1_2/regexp/control_characters.js b/js/src/tests/js1_2/regexp/control_characters.js index e8854d5e32eb..e47bc473b02e 100644 --- a/js/src/tests/js1_2/regexp/control_characters.js +++ b/js/src/tests/js1_2/regexp/control_characters.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'control_characters.js'; /** Filename: control_characters.js diff --git a/js/src/tests/js1_2/regexp/digit.js b/js/src/tests/js1_2/regexp/digit.js index 9132eb0f4fc2..ae7e8699f9fa 100644 --- a/js/src/tests/js1_2/regexp/digit.js +++ b/js/src/tests/js1_2/regexp/digit.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'digit.js'; /** Filename: digit.js diff --git a/js/src/tests/js1_2/regexp/dot.js b/js/src/tests/js1_2/regexp/dot.js index 9e2d81b1b32c..6ab33094c931 100644 --- a/js/src/tests/js1_2/regexp/dot.js +++ b/js/src/tests/js1_2/regexp/dot.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'dot.js'; /** Filename: dot.js diff --git a/js/src/tests/js1_2/regexp/endLine.js b/js/src/tests/js1_2/regexp/endLine.js index 8e5c491ed655..029dd9d9f2ec 100644 --- a/js/src/tests/js1_2/regexp/endLine.js +++ b/js/src/tests/js1_2/regexp/endLine.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'endLine.js'; /** Filename: endLine.js diff --git a/js/src/tests/js1_2/regexp/everything.js b/js/src/tests/js1_2/regexp/everything.js index d7c5a2f545bf..1a09e374cfcf 100644 --- a/js/src/tests/js1_2/regexp/everything.js +++ b/js/src/tests/js1_2/regexp/everything.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'everything.js'; /** Filename: everything.js diff --git a/js/src/tests/js1_2/regexp/exec.js b/js/src/tests/js1_2/regexp/exec.js index aae189dbc0fc..7a5269b4a514 100644 --- a/js/src/tests/js1_2/regexp/exec.js +++ b/js/src/tests/js1_2/regexp/exec.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'exec.js'; /** Filename: exec.js diff --git a/js/src/tests/js1_2/regexp/flags.js b/js/src/tests/js1_2/regexp/flags.js index f271c7e2c794..dffb620ff238 100644 --- a/js/src/tests/js1_2/regexp/flags.js +++ b/js/src/tests/js1_2/regexp/flags.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'flags.js'; /** Filename: regexp.js diff --git a/js/src/tests/js1_2/regexp/global.js b/js/src/tests/js1_2/regexp/global.js index 3539a8f1567a..e2ed1b0b0e06 100644 --- a/js/src/tests/js1_2/regexp/global.js +++ b/js/src/tests/js1_2/regexp/global.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'global.js'; /** Filename: global.js diff --git a/js/src/tests/js1_2/regexp/hexadecimal.js b/js/src/tests/js1_2/regexp/hexadecimal.js index 4614076b6565..6c741998a579 100644 --- a/js/src/tests/js1_2/regexp/hexadecimal.js +++ b/js/src/tests/js1_2/regexp/hexadecimal.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'hexadecimal.js'; /** Filename: hexadecimal.js diff --git a/js/src/tests/js1_2/regexp/ignoreCase.js b/js/src/tests/js1_2/regexp/ignoreCase.js index 96e99b3b46ad..19fe4ec511fe 100644 --- a/js/src/tests/js1_2/regexp/ignoreCase.js +++ b/js/src/tests/js1_2/regexp/ignoreCase.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'ignoreCase.js'; /** Filename: ignoreCase.js diff --git a/js/src/tests/js1_2/regexp/interval.js b/js/src/tests/js1_2/regexp/interval.js index 45c679e62e85..c3a1d6328025 100644 --- a/js/src/tests/js1_2/regexp/interval.js +++ b/js/src/tests/js1_2/regexp/interval.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'interval.js'; /** Filename: interval.js diff --git a/js/src/tests/js1_2/regexp/octal.js b/js/src/tests/js1_2/regexp/octal.js index 6137b2bad80b..664f358cdc80 100644 --- a/js/src/tests/js1_2/regexp/octal.js +++ b/js/src/tests/js1_2/regexp/octal.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'octal.js'; /** Filename: octal.js diff --git a/js/src/tests/js1_2/regexp/parentheses.js b/js/src/tests/js1_2/regexp/parentheses.js index 6fe459238706..9ee900d5c3c6 100644 --- a/js/src/tests/js1_2/regexp/parentheses.js +++ b/js/src/tests/js1_2/regexp/parentheses.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'parentheses.js'; /** Filename: parentheses.js diff --git a/js/src/tests/js1_2/regexp/plus.js b/js/src/tests/js1_2/regexp/plus.js index 2805439f1472..866b14b562fa 100644 --- a/js/src/tests/js1_2/regexp/plus.js +++ b/js/src/tests/js1_2/regexp/plus.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'plus.js'; /** Filename: plus.js diff --git a/js/src/tests/js1_2/regexp/question_mark.js b/js/src/tests/js1_2/regexp/question_mark.js index fb51f55c5cff..949f776f2933 100644 --- a/js/src/tests/js1_2/regexp/question_mark.js +++ b/js/src/tests/js1_2/regexp/question_mark.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'question_mark.js'; /** Filename: question_mark.js diff --git a/js/src/tests/js1_2/regexp/regress-6359.js b/js/src/tests/js1_2/regexp/regress-6359.js index 233ed88a0b6e..94df4420f8bb 100644 --- a/js/src/tests/js1_2/regexp/regress-6359.js +++ b/js/src/tests/js1_2/regexp/regress-6359.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-6359.js'; /** * File Name: regress-6359.js diff --git a/js/src/tests/js1_2/regexp/regress-9141.js b/js/src/tests/js1_2/regexp/regress-9141.js index 377acc2fbf14..c92719cd1e37 100644 --- a/js/src/tests/js1_2/regexp/regress-9141.js +++ b/js/src/tests/js1_2/regexp/regress-9141.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-9141.js'; /** diff --git a/js/src/tests/js1_2/regexp/shell.js b/js/src/tests/js1_2/regexp/shell.js index b07b2b4cb50f..e69de29bb2d1 100644 --- a/js/src/tests/js1_2/regexp/shell.js +++ b/js/src/tests/js1_2/regexp/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'regexp'; diff --git a/js/src/tests/js1_2/regexp/simple_form.js b/js/src/tests/js1_2/regexp/simple_form.js index 98a00cad822c..2bf3bb967cbc 100644 --- a/js/src/tests/js1_2/regexp/simple_form.js +++ b/js/src/tests/js1_2/regexp/simple_form.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'simple_form.js'; /** Filename: simple_form.js diff --git a/js/src/tests/js1_2/regexp/source.js b/js/src/tests/js1_2/regexp/source.js index 34a41a8cfb85..743408c41f10 100644 --- a/js/src/tests/js1_2/regexp/source.js +++ b/js/src/tests/js1_2/regexp/source.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'source.js'; /** Filename: source.js diff --git a/js/src/tests/js1_2/regexp/special_characters.js b/js/src/tests/js1_2/regexp/special_characters.js index b97672d8a168..fa31dc3b0e59 100644 --- a/js/src/tests/js1_2/regexp/special_characters.js +++ b/js/src/tests/js1_2/regexp/special_characters.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'special_characters.js'; /** Filename: special_characters.js diff --git a/js/src/tests/js1_2/regexp/string_replace.js b/js/src/tests/js1_2/regexp/string_replace.js index 5d5077b1953e..e69609df4126 100644 --- a/js/src/tests/js1_2/regexp/string_replace.js +++ b/js/src/tests/js1_2/regexp/string_replace.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'string_replace.js'; /** Filename: string_replace.js diff --git a/js/src/tests/js1_2/regexp/string_search.js b/js/src/tests/js1_2/regexp/string_search.js index 29910eb6c193..351fb6079b11 100644 --- a/js/src/tests/js1_2/regexp/string_search.js +++ b/js/src/tests/js1_2/regexp/string_search.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'string_search.js'; /** Filename: string_search.js diff --git a/js/src/tests/js1_2/regexp/string_split.js b/js/src/tests/js1_2/regexp/string_split.js index 1c3c48db61e1..de05eba8ce12 100644 --- a/js/src/tests/js1_2/regexp/string_split.js +++ b/js/src/tests/js1_2/regexp/string_split.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'string_split.js'; /** Filename: string_split.js diff --git a/js/src/tests/js1_2/regexp/test.js b/js/src/tests/js1_2/regexp/test.js index e4ebf5640627..3f8f6f89de7b 100644 --- a/js/src/tests/js1_2/regexp/test.js +++ b/js/src/tests/js1_2/regexp/test.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'test.js'; /** Filename: test.js diff --git a/js/src/tests/js1_2/regexp/toString.js b/js/src/tests/js1_2/regexp/toString.js index 74e8316e948b..444f5e74fe62 100644 --- a/js/src/tests/js1_2/regexp/toString.js +++ b/js/src/tests/js1_2/regexp/toString.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'toString.js'; /** Filename: toString.js diff --git a/js/src/tests/js1_2/regexp/vertical_bar.js b/js/src/tests/js1_2/regexp/vertical_bar.js index d55c9f79a9bf..4e4b0da2faeb 100644 --- a/js/src/tests/js1_2/regexp/vertical_bar.js +++ b/js/src/tests/js1_2/regexp/vertical_bar.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'vertical_bar.js'; /** Filename: vertical_bar.js diff --git a/js/src/tests/js1_2/regexp/whitespace.js b/js/src/tests/js1_2/regexp/whitespace.js index 0f8549526b71..7722095938f9 100644 --- a/js/src/tests/js1_2/regexp/whitespace.js +++ b/js/src/tests/js1_2/regexp/whitespace.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'whitespace.js'; /** Filename: whitespace.js diff --git a/js/src/tests/js1_2/regexp/word_boundary.js b/js/src/tests/js1_2/regexp/word_boundary.js index 17deb1c1c320..5bc5712aa0e5 100644 --- a/js/src/tests/js1_2/regexp/word_boundary.js +++ b/js/src/tests/js1_2/regexp/word_boundary.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'word_boundary.js'; /** Filename: word_boundary.js diff --git a/js/src/tests/js1_2/regress/regress-144834.js b/js/src/tests/js1_2/regress/regress-144834.js index a24e07ba2821..8ba1bb0109f2 100644 --- a/js/src/tests/js1_2/regress/regress-144834.js +++ b/js/src/tests/js1_2/regress/regress-144834.js @@ -46,7 +46,6 @@ * */ //----------------------------------------------------------------------------- -gTestfile = 'regress-144834.js'; var BUGNUMBER = 144834; var summary = 'Local var having same name as switch label inside function'; diff --git a/js/src/tests/js1_2/regress/regress-7703.js b/js/src/tests/js1_2/regress/regress-7703.js index fef28e98c860..6f841f738ca2 100644 --- a/js/src/tests/js1_2/regress/regress-7703.js +++ b/js/src/tests/js1_2/regress/regress-7703.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-7703.js'; /** diff --git a/js/src/tests/js1_2/regress/shell.js b/js/src/tests/js1_2/regress/shell.js index b92184ffc7be..e69de29bb2d1 100644 --- a/js/src/tests/js1_2/regress/shell.js +++ b/js/src/tests/js1_2/regress/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'regress'; diff --git a/js/src/tests/js1_2/shell.js b/js/src/tests/js1_2/shell.js index 460b371eda1f..008c7f189e18 100644 --- a/js/src/tests/js1_2/shell.js +++ b/js/src/tests/js1_2/shell.js @@ -36,5 +36,4 @@ * * ***** END LICENSE BLOCK ***** */ -gTestsuite = 'js1_2'; diff --git a/js/src/tests/js1_2/statements/break.js b/js/src/tests/js1_2/statements/break.js index 22b503d6cc25..0aa7b835fd3e 100644 --- a/js/src/tests/js1_2/statements/break.js +++ b/js/src/tests/js1_2/statements/break.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'break.js'; /** Filename: break.js diff --git a/js/src/tests/js1_2/statements/continue.js b/js/src/tests/js1_2/statements/continue.js index da718c44825b..5a0ef4887e68 100644 --- a/js/src/tests/js1_2/statements/continue.js +++ b/js/src/tests/js1_2/statements/continue.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'continue.js'; /** Filename: continue.js diff --git a/js/src/tests/js1_2/statements/do_while.js b/js/src/tests/js1_2/statements/do_while.js index ccbfa951f02e..c5b1f7b61554 100644 --- a/js/src/tests/js1_2/statements/do_while.js +++ b/js/src/tests/js1_2/statements/do_while.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'do_while.js'; /** Filename: do_while.js diff --git a/js/src/tests/js1_2/statements/shell.js b/js/src/tests/js1_2/statements/shell.js index 486e027a3cd7..e69de29bb2d1 100644 --- a/js/src/tests/js1_2/statements/shell.js +++ b/js/src/tests/js1_2/statements/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'statements'; diff --git a/js/src/tests/js1_2/statements/switch.js b/js/src/tests/js1_2/statements/switch.js index b8cefd36f02d..e06751153124 100644 --- a/js/src/tests/js1_2/statements/switch.js +++ b/js/src/tests/js1_2/statements/switch.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'switch.js'; /** Filename: switch.js diff --git a/js/src/tests/js1_2/statements/switch2.js b/js/src/tests/js1_2/statements/switch2.js index f08ecadcbf80..6ecf93fe5b0c 100644 --- a/js/src/tests/js1_2/statements/switch2.js +++ b/js/src/tests/js1_2/statements/switch2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'switch2.js'; /** Filename: switch2.js diff --git a/js/src/tests/js1_2/version120/boolean-001.js b/js/src/tests/js1_2/version120/boolean-001.js index fabb471af050..5b9f3e5fa5b2 100644 --- a/js/src/tests/js1_2/version120/boolean-001.js +++ b/js/src/tests/js1_2/version120/boolean-001.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'boolean-001.js'; /** * File Name: boolean-001.js diff --git a/js/src/tests/js1_2/version120/regress-99663.js b/js/src/tests/js1_2/version120/regress-99663.js index b420e5743408..45b0d3f795c6 100644 --- a/js/src/tests/js1_2/version120/regress-99663.js +++ b/js/src/tests/js1_2/version120/regress-99663.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-99663.js'; //----------------------------------------------------------------------------- var UBound = 0; diff --git a/js/src/tests/js1_2/version120/shell.js b/js/src/tests/js1_2/version120/shell.js index b9dce80120ac..872042a8d4f6 100644 --- a/js/src/tests/js1_2/version120/shell.js +++ b/js/src/tests/js1_2/version120/shell.js @@ -37,6 +37,5 @@ /* all files in this dir need version(120) called before they are *loaded* */ -gTestsubsuite = 'version120'; version(120); diff --git a/js/src/tests/js1_3/Boolean/boolean-001.js b/js/src/tests/js1_3/Boolean/boolean-001.js index cd237cf1404d..4c5c19e5dfc6 100644 --- a/js/src/tests/js1_3/Boolean/boolean-001.js +++ b/js/src/tests/js1_3/Boolean/boolean-001.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'boolean-001.js'; /** * File Name: boolean-001.js diff --git a/js/src/tests/js1_3/Boolean/shell.js b/js/src/tests/js1_3/Boolean/shell.js index 2ff7258ce8b9..e69de29bb2d1 100644 --- a/js/src/tests/js1_3/Boolean/shell.js +++ b/js/src/tests/js1_3/Boolean/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Boolean'; diff --git a/js/src/tests/js1_3/Script/delete-001.js b/js/src/tests/js1_3/Script/delete-001.js index 7b08a708ea4f..bc71c0d7b72f 100644 --- a/js/src/tests/js1_3/Script/delete-001.js +++ b/js/src/tests/js1_3/Script/delete-001.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'delete-001.js'; /** File Name: delete-001.js diff --git a/js/src/tests/js1_3/Script/function-001-n.js b/js/src/tests/js1_3/Script/function-001-n.js index 5e3db24c78d1..ed6d83ad989a 100644 --- a/js/src/tests/js1_3/Script/function-001-n.js +++ b/js/src/tests/js1_3/Script/function-001-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'function-001-n.js'; /** * File Name: boolean-001.js diff --git a/js/src/tests/js1_3/Script/function-002.js b/js/src/tests/js1_3/Script/function-002.js index 3c99f1e8e067..67d6fa1c0a56 100644 --- a/js/src/tests/js1_3/Script/function-002.js +++ b/js/src/tests/js1_3/Script/function-002.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'function-002.js'; /** File Name: function-002.js diff --git a/js/src/tests/js1_3/Script/in-001.js b/js/src/tests/js1_3/Script/in-001.js index 621c84fd453d..e942b4d67116 100644 --- a/js/src/tests/js1_3/Script/in-001.js +++ b/js/src/tests/js1_3/Script/in-001.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'in-001.js'; /** File Name: in-001.js diff --git a/js/src/tests/js1_3/Script/new-001.js b/js/src/tests/js1_3/Script/new-001.js index f8184bf98880..6e9f19a18f2a 100644 --- a/js/src/tests/js1_3/Script/new-001.js +++ b/js/src/tests/js1_3/Script/new-001.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'new-001.js'; /** File Name: new-001.js diff --git a/js/src/tests/js1_3/Script/shell.js b/js/src/tests/js1_3/Script/shell.js index bd02fb1ab867..e69de29bb2d1 100644 --- a/js/src/tests/js1_3/Script/shell.js +++ b/js/src/tests/js1_3/Script/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Script'; diff --git a/js/src/tests/js1_3/Script/switch-001.js b/js/src/tests/js1_3/Script/switch-001.js index cee6f3dd0aa0..1bf13f71a214 100644 --- a/js/src/tests/js1_3/Script/switch-001.js +++ b/js/src/tests/js1_3/Script/switch-001.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'switch-001.js'; /** File Name: switch-001.js diff --git a/js/src/tests/js1_3/extensions/proto_10.js b/js/src/tests/js1_3/extensions/proto_10.js index 884c2ad60b98..ec09144f1948 100644 --- a/js/src/tests/js1_3/extensions/proto_10.js +++ b/js/src/tests/js1_3/extensions/proto_10.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'proto_10.js'; /** File Name: proto_10.js diff --git a/js/src/tests/js1_3/extensions/proto_2.js b/js/src/tests/js1_3/extensions/proto_2.js index d7aa0a96abb2..5493233cc0bb 100644 --- a/js/src/tests/js1_3/extensions/proto_2.js +++ b/js/src/tests/js1_3/extensions/proto_2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'proto_2.js'; /** File Name: proto_2.js diff --git a/js/src/tests/js1_3/extensions/proto_5.js b/js/src/tests/js1_3/extensions/proto_5.js index b93c37365eee..d71932437541 100644 --- a/js/src/tests/js1_3/extensions/proto_5.js +++ b/js/src/tests/js1_3/extensions/proto_5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'proto_5.js'; /** File Name: proto_5.js diff --git a/js/src/tests/js1_3/extensions/script-001.js b/js/src/tests/js1_3/extensions/script-001.js index ef989de140d8..28665015ab19 100644 --- a/js/src/tests/js1_3/extensions/script-001.js +++ b/js/src/tests/js1_3/extensions/script-001.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'script-001.js'; /** File Name: script-001.js diff --git a/js/src/tests/js1_3/extensions/shell.js b/js/src/tests/js1_3/extensions/shell.js index 3f52cffbc059..e69de29bb2d1 100644 --- a/js/src/tests/js1_3/extensions/shell.js +++ b/js/src/tests/js1_3/extensions/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'extensions'; diff --git a/js/src/tests/js1_3/inherit/proto_1.js b/js/src/tests/js1_3/inherit/proto_1.js index 2ace73a2f8da..a5c4281774f4 100644 --- a/js/src/tests/js1_3/inherit/proto_1.js +++ b/js/src/tests/js1_3/inherit/proto_1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'proto_1.js'; /** File Name: proto_1.js diff --git a/js/src/tests/js1_3/inherit/proto_10.js b/js/src/tests/js1_3/inherit/proto_10.js index 8106fff8ddb7..b57a6b9d235d 100644 --- a/js/src/tests/js1_3/inherit/proto_10.js +++ b/js/src/tests/js1_3/inherit/proto_10.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'proto_10.js'; /** File Name: proto_10.js diff --git a/js/src/tests/js1_3/inherit/proto_11.js b/js/src/tests/js1_3/inherit/proto_11.js index 884925f21b12..bb97c6d69e77 100644 --- a/js/src/tests/js1_3/inherit/proto_11.js +++ b/js/src/tests/js1_3/inherit/proto_11.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'proto_11.js'; /** File Name: proto_11.js diff --git a/js/src/tests/js1_3/inherit/proto_12.js b/js/src/tests/js1_3/inherit/proto_12.js index 9b79fa1c255b..dd2af7debc54 100644 --- a/js/src/tests/js1_3/inherit/proto_12.js +++ b/js/src/tests/js1_3/inherit/proto_12.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'proto_12.js'; /** File Name: proto_12.js diff --git a/js/src/tests/js1_3/inherit/proto_3.js b/js/src/tests/js1_3/inherit/proto_3.js index 84ea8842bccc..a85d6de1e629 100644 --- a/js/src/tests/js1_3/inherit/proto_3.js +++ b/js/src/tests/js1_3/inherit/proto_3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'proto_3.js'; /** File Name: proto_3.js diff --git a/js/src/tests/js1_3/inherit/proto_4.js b/js/src/tests/js1_3/inherit/proto_4.js index 40b51e38807c..841d468d4b16 100644 --- a/js/src/tests/js1_3/inherit/proto_4.js +++ b/js/src/tests/js1_3/inherit/proto_4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'proto_4.js'; /** File Name: proto_4.js diff --git a/js/src/tests/js1_3/inherit/proto_6.js b/js/src/tests/js1_3/inherit/proto_6.js index 4b1219653cbd..527ea06f409f 100644 --- a/js/src/tests/js1_3/inherit/proto_6.js +++ b/js/src/tests/js1_3/inherit/proto_6.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'proto_6.js'; /** File Name: proto_6.js diff --git a/js/src/tests/js1_3/inherit/proto_7.js b/js/src/tests/js1_3/inherit/proto_7.js index 98e641f79abb..144dff5735dd 100644 --- a/js/src/tests/js1_3/inherit/proto_7.js +++ b/js/src/tests/js1_3/inherit/proto_7.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'proto_7.js'; /** File Name: proto_7.js diff --git a/js/src/tests/js1_3/inherit/proto_8.js b/js/src/tests/js1_3/inherit/proto_8.js index 7eca8caf1800..0736c1706035 100644 --- a/js/src/tests/js1_3/inherit/proto_8.js +++ b/js/src/tests/js1_3/inherit/proto_8.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'proto_8.js'; /** File Name: proto_8.js diff --git a/js/src/tests/js1_3/inherit/proto_9.js b/js/src/tests/js1_3/inherit/proto_9.js index 35319c54b090..b2f1db5b1352 100644 --- a/js/src/tests/js1_3/inherit/proto_9.js +++ b/js/src/tests/js1_3/inherit/proto_9.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'proto_9.js'; /** File Name: proto_9.js diff --git a/js/src/tests/js1_3/inherit/shell.js b/js/src/tests/js1_3/inherit/shell.js index be5e321c95fc..e69de29bb2d1 100644 --- a/js/src/tests/js1_3/inherit/shell.js +++ b/js/src/tests/js1_3/inherit/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'inherit'; diff --git a/js/src/tests/js1_3/misc/shell.js b/js/src/tests/js1_3/misc/shell.js index 660919678092..e69de29bb2d1 100644 --- a/js/src/tests/js1_3/misc/shell.js +++ b/js/src/tests/js1_3/misc/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'misc'; diff --git a/js/src/tests/js1_3/regress/delete-001.js b/js/src/tests/js1_3/regress/delete-001.js index 7b08a708ea4f..bc71c0d7b72f 100644 --- a/js/src/tests/js1_3/regress/delete-001.js +++ b/js/src/tests/js1_3/regress/delete-001.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'delete-001.js'; /** File Name: delete-001.js diff --git a/js/src/tests/js1_3/regress/function-001-n.js b/js/src/tests/js1_3/regress/function-001-n.js index 5e3db24c78d1..ed6d83ad989a 100644 --- a/js/src/tests/js1_3/regress/function-001-n.js +++ b/js/src/tests/js1_3/regress/function-001-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'function-001-n.js'; /** * File Name: boolean-001.js diff --git a/js/src/tests/js1_3/regress/function-002.js b/js/src/tests/js1_3/regress/function-002.js index 3c99f1e8e067..67d6fa1c0a56 100644 --- a/js/src/tests/js1_3/regress/function-002.js +++ b/js/src/tests/js1_3/regress/function-002.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'function-002.js'; /** File Name: function-002.js diff --git a/js/src/tests/js1_3/regress/in-001.js b/js/src/tests/js1_3/regress/in-001.js index 542923b36f07..e281ae7e9fa5 100644 --- a/js/src/tests/js1_3/regress/in-001.js +++ b/js/src/tests/js1_3/regress/in-001.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'in-001.js'; /** File Name: in-001.js diff --git a/js/src/tests/js1_3/regress/new-001.js b/js/src/tests/js1_3/regress/new-001.js index f8184bf98880..6e9f19a18f2a 100644 --- a/js/src/tests/js1_3/regress/new-001.js +++ b/js/src/tests/js1_3/regress/new-001.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'new-001.js'; /** File Name: new-001.js diff --git a/js/src/tests/js1_3/regress/shell.js b/js/src/tests/js1_3/regress/shell.js index b92184ffc7be..e69de29bb2d1 100644 --- a/js/src/tests/js1_3/regress/shell.js +++ b/js/src/tests/js1_3/regress/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'regress'; diff --git a/js/src/tests/js1_3/regress/switch-001.js b/js/src/tests/js1_3/regress/switch-001.js index 6ab0ab3345c4..de5408aea2ea 100644 --- a/js/src/tests/js1_3/regress/switch-001.js +++ b/js/src/tests/js1_3/regress/switch-001.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'switch-001.js'; /** File Name: switch-001.js diff --git a/js/src/tests/js1_3/shell.js b/js/src/tests/js1_3/shell.js index 1ade4faeca8c..008c7f189e18 100644 --- a/js/src/tests/js1_3/shell.js +++ b/js/src/tests/js1_3/shell.js @@ -36,5 +36,4 @@ * * ***** END LICENSE BLOCK ***** */ -gTestsuite = 'js1_3'; diff --git a/js/src/tests/js1_4/Eval/eval-001.js b/js/src/tests/js1_4/Eval/eval-001.js index 655cd0e72f29..a05cf66851d9 100644 --- a/js/src/tests/js1_4/Eval/eval-001.js +++ b/js/src/tests/js1_4/Eval/eval-001.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'eval-001.js'; /** * File Name: eval-001.js diff --git a/js/src/tests/js1_4/Eval/eval-002.js b/js/src/tests/js1_4/Eval/eval-002.js index 644dab9c07a3..9f74ce392fc2 100644 --- a/js/src/tests/js1_4/Eval/eval-002.js +++ b/js/src/tests/js1_4/Eval/eval-002.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'eval-002.js'; /** * File Name: eval-002.js diff --git a/js/src/tests/js1_4/Eval/eval-003.js b/js/src/tests/js1_4/Eval/eval-003.js index 4fa41a365157..9a426373347a 100644 --- a/js/src/tests/js1_4/Eval/eval-003.js +++ b/js/src/tests/js1_4/Eval/eval-003.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'eval-003.js'; /** * File Name: eval-003.js diff --git a/js/src/tests/js1_4/Eval/regress-531682.js b/js/src/tests/js1_4/Eval/regress-531682.js index 25f5778807a8..d76c2dcb82ab 100644 --- a/js/src/tests/js1_4/Eval/regress-531682.js +++ b/js/src/tests/js1_4/Eval/regress-531682.js @@ -4,7 +4,6 @@ * http://creativecommons.org/licenses/publicdomain/ */ -var gTestfile = 'regress-531682.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 531682; var summary = 'Checking proper wrapping of scope in eval(source, scope)'; diff --git a/js/src/tests/js1_4/Eval/shell.js b/js/src/tests/js1_4/Eval/shell.js index 844b940a5a6f..e69de29bb2d1 100644 --- a/js/src/tests/js1_4/Eval/shell.js +++ b/js/src/tests/js1_4/Eval/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Eval'; diff --git a/js/src/tests/js1_4/Functions/function-001.js b/js/src/tests/js1_4/Functions/function-001.js index d6d156571b42..320bd4dee1f8 100644 --- a/js/src/tests/js1_4/Functions/function-001.js +++ b/js/src/tests/js1_4/Functions/function-001.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'function-001.js'; /** * File Name: function-001.js diff --git a/js/src/tests/js1_4/Functions/shell.js b/js/src/tests/js1_4/Functions/shell.js index 69919e74c833..e69de29bb2d1 100644 --- a/js/src/tests/js1_4/Functions/shell.js +++ b/js/src/tests/js1_4/Functions/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Functions'; diff --git a/js/src/tests/js1_4/Regress/date-001-n.js b/js/src/tests/js1_4/Regress/date-001-n.js index 111bc0765b1a..d7aae0afb7a5 100644 --- a/js/src/tests/js1_4/Regress/date-001-n.js +++ b/js/src/tests/js1_4/Regress/date-001-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'date-001-n.js'; /** * File Name: date-001-n.js diff --git a/js/src/tests/js1_4/Regress/function-001.js b/js/src/tests/js1_4/Regress/function-001.js index 5bcc33572b85..1a1bb95540c8 100644 --- a/js/src/tests/js1_4/Regress/function-001.js +++ b/js/src/tests/js1_4/Regress/function-001.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'function-001.js'; /** * File Name: function-001.js diff --git a/js/src/tests/js1_4/Regress/function-002.js b/js/src/tests/js1_4/Regress/function-002.js index f86f96bec279..402dbc25ede9 100644 --- a/js/src/tests/js1_4/Regress/function-002.js +++ b/js/src/tests/js1_4/Regress/function-002.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'function-002.js'; /** * File Name: function-002.js diff --git a/js/src/tests/js1_4/Regress/function-003.js b/js/src/tests/js1_4/Regress/function-003.js index 225ae51f8e67..6280dfe6ab40 100644 --- a/js/src/tests/js1_4/Regress/function-003.js +++ b/js/src/tests/js1_4/Regress/function-003.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'function-003.js'; /** * File Name: function-003.js diff --git a/js/src/tests/js1_4/Regress/function-004-n.js b/js/src/tests/js1_4/Regress/function-004-n.js index eb8627414c8a..45ce760aea2e 100644 --- a/js/src/tests/js1_4/Regress/function-004-n.js +++ b/js/src/tests/js1_4/Regress/function-004-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'function-004-n.js'; /** * File Name: function-004.js diff --git a/js/src/tests/js1_4/Regress/regress-7224.js b/js/src/tests/js1_4/Regress/regress-7224.js index 689423bd699c..42af7f5d76be 100644 --- a/js/src/tests/js1_4/Regress/regress-7224.js +++ b/js/src/tests/js1_4/Regress/regress-7224.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'regress-7224.js'; /** * File Name: regress-7224.js diff --git a/js/src/tests/js1_4/Regress/shell.js b/js/src/tests/js1_4/Regress/shell.js index 8c8336902000..e69de29bb2d1 100644 --- a/js/src/tests/js1_4/Regress/shell.js +++ b/js/src/tests/js1_4/Regress/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Regress'; diff --git a/js/src/tests/js1_4/Regress/toString-001-n.js b/js/src/tests/js1_4/Regress/toString-001-n.js index fe5f9bf17ee7..56ed3390a25d 100644 --- a/js/src/tests/js1_4/Regress/toString-001-n.js +++ b/js/src/tests/js1_4/Regress/toString-001-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -gTestfile = 'toString-001-n.js'; /** * File Name: toString-001-n.js diff --git a/js/src/tests/js1_4/shell.js b/js/src/tests/js1_4/shell.js index f19ed52c5c2e..086eec9fd35e 100644 --- a/js/src/tests/js1_4/shell.js +++ b/js/src/tests/js1_4/shell.js @@ -35,5 +35,4 @@ * * ***** END LICENSE BLOCK ***** */ -gTestsuite = 'js1_4'; diff --git a/js/src/tests/js1_5/Array/11.1.4.js b/js/src/tests/js1_5/Array/11.1.4.js index 3ecd4e90492d..077630827c37 100644 --- a/js/src/tests/js1_5/Array/11.1.4.js +++ b/js/src/tests/js1_5/Array/11.1.4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '11.1.4.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 260106; var summary = 'Elisons in Array literals should not be enumed'; diff --git a/js/src/tests/js1_5/Array/array-001.js b/js/src/tests/js1_5/Array/array-001.js index b14d0c4192af..f2dd41529753 100644 --- a/js/src/tests/js1_5/Array/array-001.js +++ b/js/src/tests/js1_5/Array/array-001.js @@ -43,7 +43,6 @@ * From correspondence with Igor Bukanov : */ //----------------------------------------------------------------------------- -var gTestfile = 'array-001.js'; var UBound = 0; var BUGNUMBER = '(none)'; var summary = 'Truncating arrays that have decimal property names'; diff --git a/js/src/tests/js1_5/Array/regress-101964.js b/js/src/tests/js1_5/Array/regress-101964.js index 9ac949dec9d3..875f2d30f132 100644 --- a/js/src/tests/js1_5/Array/regress-101964.js +++ b/js/src/tests/js1_5/Array/regress-101964.js @@ -46,7 +46,6 @@ * an upper bound in milliseconds for any truncation to take. */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-101964.js'; var UBound = 0; var BUGNUMBER = 101964; var summary = 'Performance: truncating even very large arrays should be fast!'; diff --git a/js/src/tests/js1_5/Array/regress-107138.js b/js/src/tests/js1_5/Array/regress-107138.js index e1ca691bc3f6..2f8f9e57e87a 100644 --- a/js/src/tests/js1_5/Array/regress-107138.js +++ b/js/src/tests/js1_5/Array/regress-107138.js @@ -48,7 +48,6 @@ * The cnSTRESS constant defines how many times to repeat this test. */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-107138.js'; var UBound = 0; var cnSTRESS = 10; var cnDASH = '-'; diff --git a/js/src/tests/js1_5/Array/regress-108440.js b/js/src/tests/js1_5/Array/regress-108440.js index 5ab8d7ea17cc..03b524c391e4 100644 --- a/js/src/tests/js1_5/Array/regress-108440.js +++ b/js/src/tests/js1_5/Array/regress-108440.js @@ -49,7 +49,6 @@ * avoiding recursive death on a cycle." */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-108440.js'; var BUGNUMBER = 108440; var summary = "Shouldn't crash trying to add an array as an element of itself"; var self = this; diff --git a/js/src/tests/js1_5/Array/regress-154338.js b/js/src/tests/js1_5/Array/regress-154338.js index 69d1724195bd..8a18df1b2adc 100644 --- a/js/src/tests/js1_5/Array/regress-154338.js +++ b/js/src/tests/js1_5/Array/regress-154338.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-154338.js'; var UBound = 0; var BUGNUMBER = 154338; var summary = 'Test array.join() when separator is a variable, not a literal'; diff --git a/js/src/tests/js1_5/Array/regress-157652.js b/js/src/tests/js1_5/Array/regress-157652.js index 6b89ef3542f1..83ce8efd790c 100644 --- a/js/src/tests/js1_5/Array/regress-157652.js +++ b/js/src/tests/js1_5/Array/regress-157652.js @@ -114,7 +114,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-157652.js'; var BUGNUMBER = 157652; var summary = "Testing that Array.sort() doesn't crash on very large arrays"; var expect = 'No Crash'; diff --git a/js/src/tests/js1_5/Array/regress-178722.js b/js/src/tests/js1_5/Array/regress-178722.js index e34f830b270a..5369b4be3ff3 100644 --- a/js/src/tests/js1_5/Array/regress-178722.js +++ b/js/src/tests/js1_5/Array/regress-178722.js @@ -60,7 +60,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-178722.js'; var UBound = 0; var BUGNUMBER = 178722; var summary = 'arr.sort() should not output |undefined| when |arr| is empty'; diff --git a/js/src/tests/js1_5/Array/regress-255555.js b/js/src/tests/js1_5/Array/regress-255555.js index 554f2e9a4167..9fd1e340ba48 100644 --- a/js/src/tests/js1_5/Array/regress-255555.js +++ b/js/src/tests/js1_5/Array/regress-255555.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-255555.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 255555; var summary = 'Array.prototype.sort(comparefn) never passes undefined to comparefn'; diff --git a/js/src/tests/js1_5/Array/regress-299644.js b/js/src/tests/js1_5/Array/regress-299644.js index 17a3125cc5a1..c202908e4908 100644 --- a/js/src/tests/js1_5/Array/regress-299644.js +++ b/js/src/tests/js1_5/Array/regress-299644.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-299644.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 299644; var summary = 'Arrays with holes'; diff --git a/js/src/tests/js1_5/Array/regress-300858.js b/js/src/tests/js1_5/Array/regress-300858.js index e673ca8ada3d..534f1f484068 100644 --- a/js/src/tests/js1_5/Array/regress-300858.js +++ b/js/src/tests/js1_5/Array/regress-300858.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-300858.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 300858; var summary = 'Do not crash when sorting array with holes'; diff --git a/js/src/tests/js1_5/Array/regress-310351.js b/js/src/tests/js1_5/Array/regress-310351.js index e881054bc5ad..caa4bc8b76f4 100644 --- a/js/src/tests/js1_5/Array/regress-310351.js +++ b/js/src/tests/js1_5/Array/regress-310351.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-310351.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 310351; var summary = 'Convert host "list" objects to arrays'; diff --git a/js/src/tests/js1_5/Array/regress-311515.js b/js/src/tests/js1_5/Array/regress-311515.js index 152aef14b18b..705874e62545 100644 --- a/js/src/tests/js1_5/Array/regress-311515.js +++ b/js/src/tests/js1_5/Array/regress-311515.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-311515.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 311515; var summary = 'Array.sort should skip holes and undefined during sort'; diff --git a/js/src/tests/js1_5/Array/regress-313153.js b/js/src/tests/js1_5/Array/regress-313153.js index 1c1d436ae989..ca7dfa6768a8 100644 --- a/js/src/tests/js1_5/Array/regress-313153.js +++ b/js/src/tests/js1_5/Array/regress-313153.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-313153.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 313153; var summary = 'generic native method dispatcher extra actual arguments'; diff --git a/js/src/tests/js1_5/Array/regress-315509-01.js b/js/src/tests/js1_5/Array/regress-315509-01.js index af0851b43e6d..8aedcb3b493a 100644 --- a/js/src/tests/js1_5/Array/regress-315509-01.js +++ b/js/src/tests/js1_5/Array/regress-315509-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-315509-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 315509; var summary = 'Array.prototype.unshift on Arrays with holes'; diff --git a/js/src/tests/js1_5/Array/regress-330812.js b/js/src/tests/js1_5/Array/regress-330812.js index 884eff376c12..6b89d17e662c 100644 --- a/js/src/tests/js1_5/Array/regress-330812.js +++ b/js/src/tests/js1_5/Array/regress-330812.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-330812.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 330812; var summary = 'Making Array(1<<29).sort() less problematic'; diff --git a/js/src/tests/js1_5/Array/regress-345961.js b/js/src/tests/js1_5/Array/regress-345961.js index 55c67f19ab1a..6caaeee66201 100644 --- a/js/src/tests/js1_5/Array/regress-345961.js +++ b/js/src/tests/js1_5/Array/regress-345961.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-345961.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 345961; var summary = 'Array.prototype.shift should preserve holes'; diff --git a/js/src/tests/js1_5/Array/regress-348810.js b/js/src/tests/js1_5/Array/regress-348810.js index 3a991d631f62..10075bbbd926 100644 --- a/js/src/tests/js1_5/Array/regress-348810.js +++ b/js/src/tests/js1_5/Array/regress-348810.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-348810.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 348810; var summary = 'Do not crash when sorting an array of holes'; diff --git a/js/src/tests/js1_5/Array/regress-350256-01.js b/js/src/tests/js1_5/Array/regress-350256-01.js index d6fe512e7917..3fe3d3044086 100644 --- a/js/src/tests/js1_5/Array/regress-350256-01.js +++ b/js/src/tests/js1_5/Array/regress-350256-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-350256-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 350256; var summary = 'Array.apply maximum arguments: 2^16'; diff --git a/js/src/tests/js1_5/Array/regress-350256-02.js b/js/src/tests/js1_5/Array/regress-350256-02.js index 30d97aa3fd96..8c196d1aaa54 100644 --- a/js/src/tests/js1_5/Array/regress-350256-02.js +++ b/js/src/tests/js1_5/Array/regress-350256-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-350256-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 350256; var summary = 'Array.apply maximum arguments: 2^19 - 1024'; diff --git a/js/src/tests/js1_5/Array/regress-350256-03.js b/js/src/tests/js1_5/Array/regress-350256-03.js index 6a8624897145..f6ae72c7a41c 100644 --- a/js/src/tests/js1_5/Array/regress-350256-03.js +++ b/js/src/tests/js1_5/Array/regress-350256-03.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-350256-03.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 350256; var summary = 'Array.apply maximum arguments: 2^19-1024'; diff --git a/js/src/tests/js1_5/Array/regress-360681-01.js b/js/src/tests/js1_5/Array/regress-360681-01.js index 2e565b9d9ea1..b8b758ab13d9 100644 --- a/js/src/tests/js1_5/Array/regress-360681-01.js +++ b/js/src/tests/js1_5/Array/regress-360681-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-360681-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 360681; var summary = 'Regression from bug 224128'; diff --git a/js/src/tests/js1_5/Array/regress-360681-02.js b/js/src/tests/js1_5/Array/regress-360681-02.js index 0de4018bc313..62c67244ceb7 100644 --- a/js/src/tests/js1_5/Array/regress-360681-02.js +++ b/js/src/tests/js1_5/Array/regress-360681-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-360681-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 360681; var summary = 'Regression from bug 224128'; diff --git a/js/src/tests/js1_5/Array/regress-364104.js b/js/src/tests/js1_5/Array/regress-364104.js index 25305d3677a7..694255600b73 100644 --- a/js/src/tests/js1_5/Array/regress-364104.js +++ b/js/src/tests/js1_5/Array/regress-364104.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-364104.js'; //----------------------------------------------------------------------------- var BUGNUMBER = "364104"; var summary = "Array.prototype.indexOf, Array.prototype.lastIndexOf issues " + diff --git a/js/src/tests/js1_5/Array/regress-422286.js b/js/src/tests/js1_5/Array/regress-422286.js index f9a7ce73b84e..72ad2feb70a5 100644 --- a/js/src/tests/js1_5/Array/regress-422286.js +++ b/js/src/tests/js1_5/Array/regress-422286.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-422286.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 422286; var summary = 'Array slice when array\'s length is assigned'; diff --git a/js/src/tests/js1_5/Array/regress-424954.js b/js/src/tests/js1_5/Array/regress-424954.js index 436718ed3c70..77991836636c 100644 --- a/js/src/tests/js1_5/Array/regress-424954.js +++ b/js/src/tests/js1_5/Array/regress-424954.js @@ -5,7 +5,6 @@ * Contributor: Bob Clary */ -var gTestfile = 'regress-424954.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 424954; var summary = 'Do not crash with [].concat(null)'; diff --git a/js/src/tests/js1_5/Array/regress-451483.js b/js/src/tests/js1_5/Array/regress-451483.js index 70df6079129a..3354e64023d2 100644 --- a/js/src/tests/js1_5/Array/regress-451483.js +++ b/js/src/tests/js1_5/Array/regress-451483.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-451483.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 451483; var summary = '[].splice.call(0) == []'; diff --git a/js/src/tests/js1_5/Array/regress-451906.js b/js/src/tests/js1_5/Array/regress-451906.js index 3efcd6adbf81..a70028f6b251 100644 --- a/js/src/tests/js1_5/Array/regress-451906.js +++ b/js/src/tests/js1_5/Array/regress-451906.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-451906.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 451906; var summary = 'Index array by numeric string'; diff --git a/js/src/tests/js1_5/Array/regress-456845.js b/js/src/tests/js1_5/Array/regress-456845.js index 7c7f729674a6..fe19980ae1a7 100644 --- a/js/src/tests/js1_5/Array/regress-456845.js +++ b/js/src/tests/js1_5/Array/regress-456845.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-456845.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 456845; var summary = 'JIT: popArrs[a].pop is not a function'; diff --git a/js/src/tests/js1_5/Array/regress-465980-01.js b/js/src/tests/js1_5/Array/regress-465980-01.js index 9e441440d03d..c481d21e186a 100755 --- a/js/src/tests/js1_5/Array/regress-465980-01.js +++ b/js/src/tests/js1_5/Array/regress-465980-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-465980-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 465980; var summary = 'Do not crash @ InitArrayElements'; diff --git a/js/src/tests/js1_5/Array/regress-465980-02.js b/js/src/tests/js1_5/Array/regress-465980-02.js index a2662a7f0516..9c5d8e4fa73b 100755 --- a/js/src/tests/js1_5/Array/regress-465980-02.js +++ b/js/src/tests/js1_5/Array/regress-465980-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-465980-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 465980; var summary = 'Do not crash @ InitArrayElements'; diff --git a/js/src/tests/js1_5/Array/regress-474529.js b/js/src/tests/js1_5/Array/regress-474529.js index c003c709ccba..b705af6dbf3c 100755 --- a/js/src/tests/js1_5/Array/regress-474529.js +++ b/js/src/tests/js1_5/Array/regress-474529.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-474529.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 474529; var summary = 'Do not assert: _buf->_nextPage'; diff --git a/js/src/tests/js1_5/Array/regress-94257.js b/js/src/tests/js1_5/Array/regress-94257.js index b93e2d4f50ba..a62cef3a1aeb 100644 --- a/js/src/tests/js1_5/Array/regress-94257.js +++ b/js/src/tests/js1_5/Array/regress-94257.js @@ -47,7 +47,6 @@ * arr[1+1] += 2; */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-94257.js'; var UBound = 0; var BUGNUMBER = 94257; var summary = "Making sure we don't crash on this code -"; diff --git a/js/src/tests/js1_5/Array/regress-99120-01.js b/js/src/tests/js1_5/Array/regress-99120-01.js index 821aa24d71cb..6c39f6d94e20 100644 --- a/js/src/tests/js1_5/Array/regress-99120-01.js +++ b/js/src/tests/js1_5/Array/regress-99120-01.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-99120-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 99120; var summary = 'sort() should not be O(N^2) on sorted data'; diff --git a/js/src/tests/js1_5/Array/regress-99120-02.js b/js/src/tests/js1_5/Array/regress-99120-02.js index d4b6f61f80d7..3139928c396e 100644 --- a/js/src/tests/js1_5/Array/regress-99120-02.js +++ b/js/src/tests/js1_5/Array/regress-99120-02.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-99120-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 99120; var summary = 'sort() should not be O(N^2) on nearly sorted data'; diff --git a/js/src/tests/js1_5/Array/shell.js b/js/src/tests/js1_5/Array/shell.js index 9480d9e77dae..e69de29bb2d1 100644 --- a/js/src/tests/js1_5/Array/shell.js +++ b/js/src/tests/js1_5/Array/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Array'; diff --git a/js/src/tests/js1_5/Date/regress-188211.js b/js/src/tests/js1_5/Date/regress-188211.js index 4013658da894..6aef09730810 100644 --- a/js/src/tests/js1_5/Date/regress-188211.js +++ b/js/src/tests/js1_5/Date/regress-188211.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-188211.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 188211; var summary = 'Date.prototype.toLocaleString() error on future dates'; diff --git a/js/src/tests/js1_5/Date/regress-301738-01.js b/js/src/tests/js1_5/Date/regress-301738-01.js index bc34dc1bbd4d..99304d5c0500 100644 --- a/js/src/tests/js1_5/Date/regress-301738-01.js +++ b/js/src/tests/js1_5/Date/regress-301738-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-301738-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 301738; var summary = 'Date parse compatibilty with MSIE'; diff --git a/js/src/tests/js1_5/Date/regress-301738-02.js b/js/src/tests/js1_5/Date/regress-301738-02.js index 2267d00a7789..306247cf7051 100644 --- a/js/src/tests/js1_5/Date/regress-301738-02.js +++ b/js/src/tests/js1_5/Date/regress-301738-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-301738-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 301738; var summary = 'Date parse compatibilty with MSIE'; diff --git a/js/src/tests/js1_5/Date/regress-309925-01.js b/js/src/tests/js1_5/Date/regress-309925-01.js index b31aa2c4c6eb..b81b3eacdb5f 100644 --- a/js/src/tests/js1_5/Date/regress-309925-01.js +++ b/js/src/tests/js1_5/Date/regress-309925-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-309925-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 309925; var summary = 'Correctly parse Date strings with HH:MM'; diff --git a/js/src/tests/js1_5/Date/regress-309925-02.js b/js/src/tests/js1_5/Date/regress-309925-02.js index 2791b6cb7872..5dc6b0317c1a 100644 --- a/js/src/tests/js1_5/Date/regress-309925-02.js +++ b/js/src/tests/js1_5/Date/regress-309925-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-309925-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 309925; var summary = 'Correctly parse Date strings with HH:MM(comment)'; diff --git a/js/src/tests/js1_5/Date/regress-346027.js b/js/src/tests/js1_5/Date/regress-346027.js index 03129a801fe7..e81af7d17261 100644 --- a/js/src/tests/js1_5/Date/regress-346027.js +++ b/js/src/tests/js1_5/Date/regress-346027.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-346027.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 346027; var summary = 'Date.prototype.setFullYear()'; diff --git a/js/src/tests/js1_5/Date/regress-346363.js b/js/src/tests/js1_5/Date/regress-346363.js index eb7fab2cd3d4..43194949d46d 100644 --- a/js/src/tests/js1_5/Date/regress-346363.js +++ b/js/src/tests/js1_5/Date/regress-346363.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-346363.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 346363; var summary = 'Date.prototype.setFullYear()'; diff --git a/js/src/tests/js1_5/Date/shell.js b/js/src/tests/js1_5/Date/shell.js index 0beb78e06463..e69de29bb2d1 100644 --- a/js/src/tests/js1_5/Date/shell.js +++ b/js/src/tests/js1_5/Date/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Date'; diff --git a/js/src/tests/js1_5/Error/regress-354246.js b/js/src/tests/js1_5/Error/regress-354246.js index 6892335101f9..09082bf89042 100644 --- a/js/src/tests/js1_5/Error/regress-354246.js +++ b/js/src/tests/js1_5/Error/regress-354246.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-354246.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 354246; var summary = 'calling Error constructor with object with bad toString'; diff --git a/js/src/tests/js1_5/Error/regress-412324.js b/js/src/tests/js1_5/Error/regress-412324.js index 43db05c4b243..4c27a780c664 100644 --- a/js/src/tests/js1_5/Error/regress-412324.js +++ b/js/src/tests/js1_5/Error/regress-412324.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-412324.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 412324; var summary = 'Allow function Error(){} for the love of Pete'; diff --git a/js/src/tests/js1_5/Error/regress-465377.js b/js/src/tests/js1_5/Error/regress-465377.js index c7dc64aa986f..876b61c83f26 100644 --- a/js/src/tests/js1_5/Error/regress-465377.js +++ b/js/src/tests/js1_5/Error/regress-465377.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-465377.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 465377; var summary = 'instanceof relations between Error objects'; diff --git a/js/src/tests/js1_5/Error/shell.js b/js/src/tests/js1_5/Error/shell.js index cb413e854f23..e69de29bb2d1 100644 --- a/js/src/tests/js1_5/Error/shell.js +++ b/js/src/tests/js1_5/Error/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Error'; diff --git a/js/src/tests/js1_5/Exceptions/catchguard-002-n.js b/js/src/tests/js1_5/Exceptions/catchguard-002-n.js index e1a6fffc5315..519b9b3a7146 100644 --- a/js/src/tests/js1_5/Exceptions/catchguard-002-n.js +++ b/js/src/tests/js1_5/Exceptions/catchguard-002-n.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'catchguard-002-n.js'; DESCRIPTION = "var in catch clause should have caused an error."; EXPECTED = "error"; diff --git a/js/src/tests/js1_5/Exceptions/catchguard-003-n.js b/js/src/tests/js1_5/Exceptions/catchguard-003-n.js index 85797fc1a709..34dc07139f98 100644 --- a/js/src/tests/js1_5/Exceptions/catchguard-003-n.js +++ b/js/src/tests/js1_5/Exceptions/catchguard-003-n.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'catchguard-003-n.js'; DESCRIPTION = "Illegally constructed catchguard should have thrown an exception."; EXPECTED = "error"; diff --git a/js/src/tests/js1_5/Exceptions/errstack-001.js b/js/src/tests/js1_5/Exceptions/errstack-001.js index 0cfc96df14f2..0d49a6935f67 100644 --- a/js/src/tests/js1_5/Exceptions/errstack-001.js +++ b/js/src/tests/js1_5/Exceptions/errstack-001.js @@ -59,7 +59,6 @@ * ECMA extension, see http://bugzilla.mozilla.org/show_bug.cgi?id=123177 */ //----------------------------------------------------------------------------- -var gTestfile = 'errstack-001.js'; var UBound = 0; var BUGNUMBER = '(none)'; var summary = 'Testing Error.stack'; diff --git a/js/src/tests/js1_5/Exceptions/regress-121658.js b/js/src/tests/js1_5/Exceptions/regress-121658.js index aca6b3ceec91..71ac386bcaaf 100644 --- a/js/src/tests/js1_5/Exceptions/regress-121658.js +++ b/js/src/tests/js1_5/Exceptions/regress-121658.js @@ -48,7 +48,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-121658.js'; var UBound = 0; var BUGNUMBER = 121658; var msg = '"Too much recursion" errors should be safely caught by try...catch'; diff --git a/js/src/tests/js1_5/Exceptions/regress-123002.js b/js/src/tests/js1_5/Exceptions/regress-123002.js index 5f03f454284f..2a7ad976dc63 100644 --- a/js/src/tests/js1_5/Exceptions/regress-123002.js +++ b/js/src/tests/js1_5/Exceptions/regress-123002.js @@ -58,7 +58,6 @@ * To do this, just change the two LENGTH constants below - */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-123002.js'; var LENGTH_RHINO = 1; var LENGTH_SPIDERMONKEY = 3; var UBound = 0; diff --git a/js/src/tests/js1_5/Exceptions/regress-232182.js b/js/src/tests/js1_5/Exceptions/regress-232182.js index dc999b915912..3644e35b4d54 100644 --- a/js/src/tests/js1_5/Exceptions/regress-232182.js +++ b/js/src/tests/js1_5/Exceptions/regress-232182.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-232182.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 232182; diff --git a/js/src/tests/js1_5/Exceptions/regress-257751.js b/js/src/tests/js1_5/Exceptions/regress-257751.js index f161810ee15b..a1d0fe1c5e5a 100644 --- a/js/src/tests/js1_5/Exceptions/regress-257751.js +++ b/js/src/tests/js1_5/Exceptions/regress-257751.js @@ -37,7 +37,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-257751.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 257751; var summary = 'RegExp Syntax Errors should have lineNumber and fileName'; diff --git a/js/src/tests/js1_5/Exceptions/regress-273931.js b/js/src/tests/js1_5/Exceptions/regress-273931.js index f623ae8c5db8..6756afe0692e 100644 --- a/js/src/tests/js1_5/Exceptions/regress-273931.js +++ b/js/src/tests/js1_5/Exceptions/regress-273931.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-273931.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 273931; var summary = 'Pop scope chain in exception handling'; diff --git a/js/src/tests/js1_5/Exceptions/regress-315147.js b/js/src/tests/js1_5/Exceptions/regress-315147.js index b7b2c2931e2a..e0c58d3873b1 100644 --- a/js/src/tests/js1_5/Exceptions/regress-315147.js +++ b/js/src/tests/js1_5/Exceptions/regress-315147.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-315147.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 315147; var summary = 'Error JSMSG_UNDEFINED_PROP should be JSEXN_REFERENCEERR'; diff --git a/js/src/tests/js1_5/Exceptions/regress-332472.js b/js/src/tests/js1_5/Exceptions/regress-332472.js index 9ac132e063ec..6d855dd38959 100644 --- a/js/src/tests/js1_5/Exceptions/regress-332472.js +++ b/js/src/tests/js1_5/Exceptions/regress-332472.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-332472.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 332472; var summary = 'new RegExp() ignores string boundaries when throwing exceptions'; diff --git a/js/src/tests/js1_5/Exceptions/regress-333728.js b/js/src/tests/js1_5/Exceptions/regress-333728.js index 3ff804a8a6fe..7eb27c762c1f 100644 --- a/js/src/tests/js1_5/Exceptions/regress-333728.js +++ b/js/src/tests/js1_5/Exceptions/regress-333728.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-333728.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 333728; var summary = 'Throw ReferenceErrors for typeof(...undef)'; diff --git a/js/src/tests/js1_5/Exceptions/regress-342359.js b/js/src/tests/js1_5/Exceptions/regress-342359.js index 0468b27079e9..f3951fbd9259 100644 --- a/js/src/tests/js1_5/Exceptions/regress-342359.js +++ b/js/src/tests/js1_5/Exceptions/regress-342359.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-342359.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 342359; var summary = 'Overriding ReferenceError should stick'; diff --git a/js/src/tests/js1_5/Exceptions/regress-347674.js b/js/src/tests/js1_5/Exceptions/regress-347674.js index ea91b72d14b4..33a55d687ebd 100644 --- a/js/src/tests/js1_5/Exceptions/regress-347674.js +++ b/js/src/tests/js1_5/Exceptions/regress-347674.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-347674.js'; //----------------------------------------------------------------------------- var BUGNUMBER = "347674"; var summary = "ReferenceError thrown when accessing exception bound in a " + diff --git a/js/src/tests/js1_5/Exceptions/regress-350650-n.js b/js/src/tests/js1_5/Exceptions/regress-350650-n.js index cb96cc325a5c..bf982ae0d892 100644 --- a/js/src/tests/js1_5/Exceptions/regress-350650-n.js +++ b/js/src/tests/js1_5/Exceptions/regress-350650-n.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-350650-n.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 350650; var summary = 'js reports "uncaught exception'; diff --git a/js/src/tests/js1_5/Exceptions/regress-350837.js b/js/src/tests/js1_5/Exceptions/regress-350837.js index 3de441ed1c75..1666212f2531 100644 --- a/js/src/tests/js1_5/Exceptions/regress-350837.js +++ b/js/src/tests/js1_5/Exceptions/regress-350837.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-350837.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 350837; var summary = 'clear cx->throwing in finally'; diff --git a/js/src/tests/js1_5/Exceptions/shell.js b/js/src/tests/js1_5/Exceptions/shell.js index 6c671f1eea44..e69de29bb2d1 100644 --- a/js/src/tests/js1_5/Exceptions/shell.js +++ b/js/src/tests/js1_5/Exceptions/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Exceptions'; diff --git a/js/src/tests/js1_5/Expressions/regress-192288.js b/js/src/tests/js1_5/Expressions/regress-192288.js index 4ecbcd75cba9..0ed8f7b6238e 100644 --- a/js/src/tests/js1_5/Expressions/regress-192288.js +++ b/js/src/tests/js1_5/Expressions/regress-192288.js @@ -45,7 +45,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-192288.js'; var UBound = 0; var BUGNUMBER = 192288; var summary = 'Testing 0/0 inside functions '; diff --git a/js/src/tests/js1_5/Expressions/regress-394673.js b/js/src/tests/js1_5/Expressions/regress-394673.js index 4d8ff56366d5..99b2f95770f5 100644 --- a/js/src/tests/js1_5/Expressions/regress-394673.js +++ b/js/src/tests/js1_5/Expressions/regress-394673.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-394673.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 394673; var summary = 'Parsing long chains of "&&" or "||"'; diff --git a/js/src/tests/js1_5/Expressions/regress-96526-argsub.js b/js/src/tests/js1_5/Expressions/regress-96526-argsub.js index 65c7488b62c0..65d449c1742c 100644 --- a/js/src/tests/js1_5/Expressions/regress-96526-argsub.js +++ b/js/src/tests/js1_5/Expressions/regress-96526-argsub.js @@ -48,7 +48,6 @@ * (to hit the optimization for arguments[0]... that uses JSOP_ARGSUB)." */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-96526-argsub.js'; var UBound = 0; var BUGNUMBER = 96526; var summary = 'Testing "use" and "set" ops on expressions like a[i][j][k]'; diff --git a/js/src/tests/js1_5/Expressions/regress-96526-delelem.js b/js/src/tests/js1_5/Expressions/regress-96526-delelem.js index a3fd39a36179..db987dcb6991 100644 --- a/js/src/tests/js1_5/Expressions/regress-96526-delelem.js +++ b/js/src/tests/js1_5/Expressions/regress-96526-delelem.js @@ -48,7 +48,6 @@ * (to hit the optimization for arguments[0]... that uses JSOP_ARGSUB)." */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-96526-delelem.js'; var UBound = 0; var BUGNUMBER = 96526; var summary = 'Testing "use" and "set" ops on expressions like a[i][j][k]'; diff --git a/js/src/tests/js1_5/Expressions/regress-96526-noargsub.js b/js/src/tests/js1_5/Expressions/regress-96526-noargsub.js index d5c9e4a3e118..c6f21c7bfae0 100644 --- a/js/src/tests/js1_5/Expressions/regress-96526-noargsub.js +++ b/js/src/tests/js1_5/Expressions/regress-96526-noargsub.js @@ -48,7 +48,6 @@ * (to hit the optimization for arguments[0]... that uses JSOP_ARGSUB)." */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-96526-noargsub.js'; var UBound = 0; var BUGNUMBER = 96526; var summary = 'Testing "use" and "set" ops on expressions like a[i][j][k]'; diff --git a/js/src/tests/js1_5/Expressions/shell.js b/js/src/tests/js1_5/Expressions/shell.js index 5d1a335160ef..aecb6ecb778e 100644 --- a/js/src/tests/js1_5/Expressions/shell.js +++ b/js/src/tests/js1_5/Expressions/shell.js @@ -43,7 +43,6 @@ */ //----------------------------------------------------------------------------- -gTestsubsuite = 'Expressions'; var CHAR_LBRACKET = '['; var CHAR_RBRACKET = ']'; diff --git a/js/src/tests/js1_5/Function/10.1.6-01.js b/js/src/tests/js1_5/Function/10.1.6-01.js index 77440826977c..b456f6439138 100644 --- a/js/src/tests/js1_5/Function/10.1.6-01.js +++ b/js/src/tests/js1_5/Function/10.1.6-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '10.1.6-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 293782; var summary = 'Local variables should not be enumerable properties of the function'; diff --git a/js/src/tests/js1_5/Function/10.1.6.js b/js/src/tests/js1_5/Function/10.1.6.js index c3cc2fa6384d..b3901ed0ad98 100644 --- a/js/src/tests/js1_5/Function/10.1.6.js +++ b/js/src/tests/js1_5/Function/10.1.6.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '10.1.6.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 293782; var summary = 'Local variables can cause predefined function object properties to be undefined'; diff --git a/js/src/tests/js1_5/Function/15.3.4.4.js b/js/src/tests/js1_5/Function/15.3.4.4.js index d7a6011be9fe..f502217e90c4 100644 --- a/js/src/tests/js1_5/Function/15.3.4.4.js +++ b/js/src/tests/js1_5/Function/15.3.4.4.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = '15.3.4.4.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 290488; var summary = '15.3.4.4 - Function.prototype.call() Scope'; diff --git a/js/src/tests/js1_5/Function/regress-123371.js b/js/src/tests/js1_5/Function/regress-123371.js index f95f40248e0e..d167cc9a142a 100644 --- a/js/src/tests/js1_5/Function/regress-123371.js +++ b/js/src/tests/js1_5/Function/regress-123371.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-123371.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 123371; var summary = 'Do not crash when newline separates function name from arglist'; diff --git a/js/src/tests/js1_5/Function/regress-178389.js b/js/src/tests/js1_5/Function/regress-178389.js index 725c12bd94c7..9cb5c58083cd 100644 --- a/js/src/tests/js1_5/Function/regress-178389.js +++ b/js/src/tests/js1_5/Function/regress-178389.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-178389.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 178389; var summary = 'Function.prototype.toSource should not override Function.prototype.toString'; diff --git a/js/src/tests/js1_5/Function/regress-222029-001.js b/js/src/tests/js1_5/Function/regress-222029-001.js index fccbd158e0d2..660a5006beda 100644 --- a/js/src/tests/js1_5/Function/regress-222029-001.js +++ b/js/src/tests/js1_5/Function/regress-222029-001.js @@ -55,7 +55,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-222029-001.js'; var UBound = 0; var BUGNUMBER = 222029; var summary = "Make our f.caller property match IE's wrt f.apply and f.call"; diff --git a/js/src/tests/js1_5/Function/regress-222029-002.js b/js/src/tests/js1_5/Function/regress-222029-002.js index f5209250efff..36b9a03e4580 100644 --- a/js/src/tests/js1_5/Function/regress-222029-002.js +++ b/js/src/tests/js1_5/Function/regress-222029-002.js @@ -55,7 +55,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-222029-002.js'; var UBound = 0; var BUGNUMBER = 222029; var summary = "Make our f.caller property match IE's wrt f.apply and f.call"; diff --git a/js/src/tests/js1_5/Function/regress-292215.js b/js/src/tests/js1_5/Function/regress-292215.js index 60bf7a240bdd..44dc2ca18960 100644 --- a/js/src/tests/js1_5/Function/regress-292215.js +++ b/js/src/tests/js1_5/Function/regress-292215.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-292215.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 292215; var summary = 'Set arguments'; diff --git a/js/src/tests/js1_5/Function/regress-338001.js b/js/src/tests/js1_5/Function/regress-338001.js index 7952b0e9954c..af02b28a2739 100644 --- a/js/src/tests/js1_5/Function/regress-338001.js +++ b/js/src/tests/js1_5/Function/regress-338001.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-338001.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 338001; var summary = 'integer overflow in jsfun.c:Function'; diff --git a/js/src/tests/js1_5/Function/regress-338121-01.js b/js/src/tests/js1_5/Function/regress-338121-01.js index c3d4b304ba3d..91c55542fb4f 100644 --- a/js/src/tests/js1_5/Function/regress-338121-01.js +++ b/js/src/tests/js1_5/Function/regress-338121-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-338121-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 338121; var summary = 'Issues with JS_ARENA_ALLOCATE_CAST'; diff --git a/js/src/tests/js1_5/Function/regress-338121-02.js b/js/src/tests/js1_5/Function/regress-338121-02.js index 5fd36cf7e49f..94af57f9f4ce 100644 --- a/js/src/tests/js1_5/Function/regress-338121-02.js +++ b/js/src/tests/js1_5/Function/regress-338121-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-338121-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 338121; var summary = 'Issues with JS_ARENA_ALLOCATE_CAST'; diff --git a/js/src/tests/js1_5/Function/regress-338121-03.js b/js/src/tests/js1_5/Function/regress-338121-03.js index 6bebd0b8717e..d028f44e150d 100644 --- a/js/src/tests/js1_5/Function/regress-338121-03.js +++ b/js/src/tests/js1_5/Function/regress-338121-03.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-338121-03.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 338121; var summary = 'Issues with JS_ARENA_ALLOCATE_CAST'; diff --git a/js/src/tests/js1_5/Function/regress-344052.js b/js/src/tests/js1_5/Function/regress-344052.js index 84745a18253a..575d6fa88330 100644 --- a/js/src/tests/js1_5/Function/regress-344052.js +++ b/js/src/tests/js1_5/Function/regress-344052.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-344052.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 344052; var summary = 'Function prototype - simple shared property'; diff --git a/js/src/tests/js1_5/Function/regress-364023.js b/js/src/tests/js1_5/Function/regress-364023.js index 7c169382f1cb..8c92abb05c4e 100644 --- a/js/src/tests/js1_5/Function/regress-364023.js +++ b/js/src/tests/js1_5/Function/regress-364023.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-364023.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 364023; var summary = 'Do not crash in JS_GetPrivate'; diff --git a/js/src/tests/js1_5/Function/shell.js b/js/src/tests/js1_5/Function/shell.js index eebf3d51f88e..e69de29bb2d1 100644 --- a/js/src/tests/js1_5/Function/shell.js +++ b/js/src/tests/js1_5/Function/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Function'; diff --git a/js/src/tests/js1_5/GC/regress-104584.js b/js/src/tests/js1_5/GC/regress-104584.js index cbf187d67658..8fef8effe04b 100644 --- a/js/src/tests/js1_5/GC/regress-104584.js +++ b/js/src/tests/js1_5/GC/regress-104584.js @@ -48,7 +48,6 @@ */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-104584.js'; var BUGNUMBER = 104584; var summary = "Testing that we don't crash on this code -"; diff --git a/js/src/tests/js1_5/GC/regress-203278-2.js b/js/src/tests/js1_5/GC/regress-203278-2.js index f445a6a09208..6bcd624768ad 100644 --- a/js/src/tests/js1_5/GC/regress-203278-2.js +++ b/js/src/tests/js1_5/GC/regress-203278-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-203278-2.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 203278; var summary = 'Don\'t crash in recursive js_MarkGCThing'; diff --git a/js/src/tests/js1_5/GC/regress-203278-3.js b/js/src/tests/js1_5/GC/regress-203278-3.js index f04897592b4e..17caf364fe0d 100644 --- a/js/src/tests/js1_5/GC/regress-203278-3.js +++ b/js/src/tests/js1_5/GC/regress-203278-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-203278-3.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 203278; var summary = 'Don\'t crash in recursive js_MarkGCThing'; diff --git a/js/src/tests/js1_5/GC/regress-278725.js b/js/src/tests/js1_5/GC/regress-278725.js index 7841815ebdce..1a150ba3ddc6 100644 --- a/js/src/tests/js1_5/GC/regress-278725.js +++ b/js/src/tests/js1_5/GC/regress-278725.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-278725.js'; //----------------------------------------------------------------------------- // testcase by James Ross var BUGNUMBER = 278725; diff --git a/js/src/tests/js1_5/GC/regress-306788.js b/js/src/tests/js1_5/GC/regress-306788.js index 5d828c6e546c..7efef15eee2d 100644 --- a/js/src/tests/js1_5/GC/regress-306788.js +++ b/js/src/tests/js1_5/GC/regress-306788.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-306788.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 306788; var summary = 'Do not crash sorting Arrays due to GC'; diff --git a/js/src/tests/js1_5/GC/regress-311497.js b/js/src/tests/js1_5/GC/regress-311497.js index fb225a4e7842..f7faeccd4dad 100644 --- a/js/src/tests/js1_5/GC/regress-311497.js +++ b/js/src/tests/js1_5/GC/regress-311497.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-311497.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 311497; var summary = 'Root pivots in js_HeapSort'; diff --git a/js/src/tests/js1_5/GC/regress-313276.js b/js/src/tests/js1_5/GC/regress-313276.js index f747a122a177..1624229e379b 100644 --- a/js/src/tests/js1_5/GC/regress-313276.js +++ b/js/src/tests/js1_5/GC/regress-313276.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-313276.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 313276; var summary = 'Root strings'; diff --git a/js/src/tests/js1_5/GC/regress-313479.js b/js/src/tests/js1_5/GC/regress-313479.js index 123ab63fb5e4..c6ee2b433b49 100644 --- a/js/src/tests/js1_5/GC/regress-313479.js +++ b/js/src/tests/js1_5/GC/regress-313479.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-313479.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 313479; var summary = 'Root access in jsnum.c'; diff --git a/js/src/tests/js1_5/GC/regress-316885-01.js b/js/src/tests/js1_5/GC/regress-316885-01.js index f3361db73605..4183f27e59c6 100644 --- a/js/src/tests/js1_5/GC/regress-316885-01.js +++ b/js/src/tests/js1_5/GC/regress-316885-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-316885-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 316885; var summary = 'Unrooted access in jsinterp.c'; diff --git a/js/src/tests/js1_5/GC/regress-316885-02.js b/js/src/tests/js1_5/GC/regress-316885-02.js index dd1761f8abb9..6d98f2f8e349 100644 --- a/js/src/tests/js1_5/GC/regress-316885-02.js +++ b/js/src/tests/js1_5/GC/regress-316885-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-316885-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 316885; var summary = 'Unrooted access in jsinterp.c'; diff --git a/js/src/tests/js1_5/GC/regress-316885-03.js b/js/src/tests/js1_5/GC/regress-316885-03.js index bb27b52a7f5a..c4706b1e69b6 100644 --- a/js/src/tests/js1_5/GC/regress-316885-03.js +++ b/js/src/tests/js1_5/GC/regress-316885-03.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-316885-03.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 316885; var summary = 'Unrooted access in jsinterp.c'; diff --git a/js/src/tests/js1_5/GC/regress-319980-01.js b/js/src/tests/js1_5/GC/regress-319980-01.js index 13200da764a4..2560ca54cba6 100644 --- a/js/src/tests/js1_5/GC/regress-319980-01.js +++ b/js/src/tests/js1_5/GC/regress-319980-01.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-319980-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 319980; var summary = 'GC not called during non-fatal out of memory'; diff --git a/js/src/tests/js1_5/GC/regress-324278.js b/js/src/tests/js1_5/GC/regress-324278.js index 9421c0b5eacc..27016a9df82c 100644 --- a/js/src/tests/js1_5/GC/regress-324278.js +++ b/js/src/tests/js1_5/GC/regress-324278.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-324278.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 324278; var summary = 'GC without recursion'; diff --git a/js/src/tests/js1_5/GC/regress-331719.js b/js/src/tests/js1_5/GC/regress-331719.js index 6b8116fa9327..55c8c41ecd48 100644 --- a/js/src/tests/js1_5/GC/regress-331719.js +++ b/js/src/tests/js1_5/GC/regress-331719.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-331719.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 331719; var summary = 'Problem with String.replace running with WAY_TOO_MUCH_GC'; diff --git a/js/src/tests/js1_5/GC/regress-338653.js b/js/src/tests/js1_5/GC/regress-338653.js index 79d69cf13f72..ed0186887c55 100644 --- a/js/src/tests/js1_5/GC/regress-338653.js +++ b/js/src/tests/js1_5/GC/regress-338653.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-338653.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 338653; var summary = 'Force GC when JSRuntime.gcMallocBytes hits ' + diff --git a/js/src/tests/js1_5/GC/regress-341877-01.js b/js/src/tests/js1_5/GC/regress-341877-01.js index 79e84781c8e0..c00f2e09c5d3 100644 --- a/js/src/tests/js1_5/GC/regress-341877-01.js +++ b/js/src/tests/js1_5/GC/regress-341877-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-341877-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 341877; var summary = 'GC hazard with for-in loop'; diff --git a/js/src/tests/js1_5/GC/regress-341877-02.js b/js/src/tests/js1_5/GC/regress-341877-02.js index 358d96fce0de..189e281ac812 100644 --- a/js/src/tests/js1_5/GC/regress-341877-02.js +++ b/js/src/tests/js1_5/GC/regress-341877-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-341877-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 341877; var summary = 'GC hazard with for-in loop'; diff --git a/js/src/tests/js1_5/GC/regress-346794.js b/js/src/tests/js1_5/GC/regress-346794.js index 6bc5477fc146..c6544acac625 100644 --- a/js/src/tests/js1_5/GC/regress-346794.js +++ b/js/src/tests/js1_5/GC/regress-346794.js @@ -37,7 +37,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-346794.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 346794; var summary = 'Do not crash'; diff --git a/js/src/tests/js1_5/GC/regress-348532.js b/js/src/tests/js1_5/GC/regress-348532.js index e4e96388737d..acb8948c3395 100644 --- a/js/src/tests/js1_5/GC/regress-348532.js +++ b/js/src/tests/js1_5/GC/regress-348532.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-348532.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 348532; var summary = 'Do not overflow int when constructing Error.stack'; diff --git a/js/src/tests/js1_5/GC/regress-352606.js b/js/src/tests/js1_5/GC/regress-352606.js index 07881439125c..9cabdfc0b26e 100644 --- a/js/src/tests/js1_5/GC/regress-352606.js +++ b/js/src/tests/js1_5/GC/regress-352606.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-352606.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 352606; var summary = 'Do not crash involving post decrement'; diff --git a/js/src/tests/js1_5/GC/regress-383269-01.js b/js/src/tests/js1_5/GC/regress-383269-01.js index 44c13019bf24..47a357dbbe55 100644 --- a/js/src/tests/js1_5/GC/regress-383269-01.js +++ b/js/src/tests/js1_5/GC/regress-383269-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-383269-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 383269; var summary = 'Leak related to arguments object'; diff --git a/js/src/tests/js1_5/GC/regress-383269-02.js b/js/src/tests/js1_5/GC/regress-383269-02.js index 8f8511004a41..c6f33f697855 100644 --- a/js/src/tests/js1_5/GC/regress-383269-02.js +++ b/js/src/tests/js1_5/GC/regress-383269-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-383269-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 383269; var summary = 'Leak related to arguments object'; diff --git a/js/src/tests/js1_5/GC/regress-390078.js b/js/src/tests/js1_5/GC/regress-390078.js index 0528120b4912..cf9d84954b25 100644 --- a/js/src/tests/js1_5/GC/regress-390078.js +++ b/js/src/tests/js1_5/GC/regress-390078.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-390078.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 390078; diff --git a/js/src/tests/js1_5/GC/regress-418128.js b/js/src/tests/js1_5/GC/regress-418128.js index be08b1d59e74..a92d6c565cfe 100644 --- a/js/src/tests/js1_5/GC/regress-418128.js +++ b/js/src/tests/js1_5/GC/regress-418128.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-418128.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 418128; var summary = 'GC hazard with ++/--'; diff --git a/js/src/tests/js1_5/GC/regress-440558.js b/js/src/tests/js1_5/GC/regress-440558.js index 427e9020e1a4..3e16485fad34 100644 --- a/js/src/tests/js1_5/GC/regress-440558.js +++ b/js/src/tests/js1_5/GC/regress-440558.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-440558.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 440558; var summary = 'Do not assert: *flagp != GCF_FINAL'; diff --git a/js/src/tests/js1_5/GC/shell.js b/js/src/tests/js1_5/GC/shell.js index 123ca9efed3b..e69de29bb2d1 100644 --- a/js/src/tests/js1_5/GC/shell.js +++ b/js/src/tests/js1_5/GC/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'GC'; diff --git a/js/src/tests/js1_5/GetSet/getset-002.js b/js/src/tests/js1_5/GetSet/getset-002.js index c2e238525e93..866ac8c9650c 100644 --- a/js/src/tests/js1_5/GetSet/getset-002.js +++ b/js/src/tests/js1_5/GetSet/getset-002.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'getset-002.js'; var t = { _y: "", diff --git a/js/src/tests/js1_5/GetSet/regress-353264.js b/js/src/tests/js1_5/GetSet/regress-353264.js index 7741cf3f9bc5..cb16c5e5feb0 100644 --- a/js/src/tests/js1_5/GetSet/regress-353264.js +++ b/js/src/tests/js1_5/GetSet/regress-353264.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-353264.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 353264; var summary = 'Do not crash defining getter'; diff --git a/js/src/tests/js1_5/GetSet/regress-375976.js b/js/src/tests/js1_5/GetSet/regress-375976.js index eb50b8a19c1a..0fade383dbbe 100644 --- a/js/src/tests/js1_5/GetSet/regress-375976.js +++ b/js/src/tests/js1_5/GetSet/regress-375976.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-375976.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 375976; diff --git a/js/src/tests/js1_5/GetSet/shell.js b/js/src/tests/js1_5/GetSet/shell.js index 78080b135c72..e69de29bb2d1 100644 --- a/js/src/tests/js1_5/GetSet/shell.js +++ b/js/src/tests/js1_5/GetSet/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'GetSet'; diff --git a/js/src/tests/js1_5/LexicalConventions/lexical-001.js b/js/src/tests/js1_5/LexicalConventions/lexical-001.js index c3f1ef9f7aff..d093a097b59a 100644 --- a/js/src/tests/js1_5/LexicalConventions/lexical-001.js +++ b/js/src/tests/js1_5/LexicalConventions/lexical-001.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'lexical-001.js'; /* * Date: 26 November 2000 diff --git a/js/src/tests/js1_5/LexicalConventions/regress-177314.js b/js/src/tests/js1_5/LexicalConventions/regress-177314.js index 1cb81308b59d..0aaaae9a2bd2 100644 --- a/js/src/tests/js1_5/LexicalConventions/regress-177314.js +++ b/js/src/tests/js1_5/LexicalConventions/regress-177314.js @@ -48,7 +48,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-177314.js'; var UBound = 0; var BUGNUMBER = 177314; var summary = "'\\" + "400' should lex as a 2-digit octal escape + '0'"; diff --git a/js/src/tests/js1_5/LexicalConventions/regress-343675.js b/js/src/tests/js1_5/LexicalConventions/regress-343675.js index 8f537c00986a..026d682ee619 100644 --- a/js/src/tests/js1_5/LexicalConventions/regress-343675.js +++ b/js/src/tests/js1_5/LexicalConventions/regress-343675.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-343675.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 343675; var summary = 'Allow keywords, reserved words as function names'; diff --git a/js/src/tests/js1_5/LexicalConventions/regress-469940.js b/js/src/tests/js1_5/LexicalConventions/regress-469940.js index b2dc68029611..67cb8ce3224b 100644 --- a/js/src/tests/js1_5/LexicalConventions/regress-469940.js +++ b/js/src/tests/js1_5/LexicalConventions/regress-469940.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-469940.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 469940; var summary = 'Do not insert semi-colon after var with multiline initializer'; diff --git a/js/src/tests/js1_5/LexicalConventions/shell.js b/js/src/tests/js1_5/LexicalConventions/shell.js index 4e1d61d68af6..e69de29bb2d1 100644 --- a/js/src/tests/js1_5/LexicalConventions/shell.js +++ b/js/src/tests/js1_5/LexicalConventions/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'LexicalConventions'; diff --git a/js/src/tests/js1_5/Object/regress-137000.js b/js/src/tests/js1_5/Object/regress-137000.js index 0a17dacd9051..a55c3e8e845b 100644 --- a/js/src/tests/js1_5/Object/regress-137000.js +++ b/js/src/tests/js1_5/Object/regress-137000.js @@ -48,7 +48,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-137000.js'; var UBound = 0; var BUGNUMBER = 137000; var summary = 'Function param or local var with same name as a function prop'; diff --git a/js/src/tests/js1_5/Object/regress-192105.js b/js/src/tests/js1_5/Object/regress-192105.js index c6d6b29366d4..d8f3be88efe4 100644 --- a/js/src/tests/js1_5/Object/regress-192105.js +++ b/js/src/tests/js1_5/Object/regress-192105.js @@ -45,7 +45,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-192105.js'; var UBound = 0; var BUGNUMBER = 192105; var summary = 'Using |instanceof| to check if f() is called as constructor'; diff --git a/js/src/tests/js1_5/Object/regress-308806-01.js b/js/src/tests/js1_5/Object/regress-308806-01.js index bd6d2e209cca..57bf3cf39333 100644 --- a/js/src/tests/js1_5/Object/regress-308806-01.js +++ b/js/src/tests/js1_5/Object/regress-308806-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-308806-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 308806; var summary = 'Object.prototype.toLocaleString() should track Object.prototype.toString() '; diff --git a/js/src/tests/js1_5/Object/regress-338709.js b/js/src/tests/js1_5/Object/regress-338709.js index da35a8a46dc0..3145a4a70fe3 100644 --- a/js/src/tests/js1_5/Object/regress-338709.js +++ b/js/src/tests/js1_5/Object/regress-338709.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-338709.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 338709; var summary = 'ReadOnly properties should not be overwritten by using ' + diff --git a/js/src/tests/js1_5/Object/regress-362872-01.js b/js/src/tests/js1_5/Object/regress-362872-01.js index 661794dce424..b4b308283bf6 100644 --- a/js/src/tests/js1_5/Object/regress-362872-01.js +++ b/js/src/tests/js1_5/Object/regress-362872-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-362872-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 362872; var summary = 'script should not drop watchpoint that is in use'; diff --git a/js/src/tests/js1_5/Object/regress-362872-02.js b/js/src/tests/js1_5/Object/regress-362872-02.js index 1a6126327433..30f6e7e0c475 100644 --- a/js/src/tests/js1_5/Object/regress-362872-02.js +++ b/js/src/tests/js1_5/Object/regress-362872-02.js @@ -5,7 +5,6 @@ * Contributor: Blake Kaplan */ -var gTestfile = 'regress-362872-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 362872; var summary = 'script should not drop watchpoint that is in use'; diff --git a/js/src/tests/js1_5/Object/regress-382503.js b/js/src/tests/js1_5/Object/regress-382503.js index 3d1b13c35f51..3264a8a611d5 100644 --- a/js/src/tests/js1_5/Object/regress-382503.js +++ b/js/src/tests/js1_5/Object/regress-382503.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-382503.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 382503; var summary = 'Do not assert: with prototype=regexp'; diff --git a/js/src/tests/js1_5/Object/regress-382532.js b/js/src/tests/js1_5/Object/regress-382532.js index 1265df9f871a..e56b72de33d4 100644 --- a/js/src/tests/js1_5/Object/regress-382532.js +++ b/js/src/tests/js1_5/Object/regress-382532.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-382532.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 382532; var summary = 'instanceof,... broken by use of |prototype| in heavyweight constructor'; diff --git a/js/src/tests/js1_5/Object/regress-465476.js b/js/src/tests/js1_5/Object/regress-465476.js index fc63a2f3f757..3018a9fc1e9f 100644 --- a/js/src/tests/js1_5/Object/regress-465476.js +++ b/js/src/tests/js1_5/Object/regress-465476.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-465476.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 465476; var summary = '"-0" and "0" are distinct properties.'; diff --git a/js/src/tests/js1_5/Object/regress-90596-003.js b/js/src/tests/js1_5/Object/regress-90596-003.js index 42c6390ab31d..d6fcd321ebe2 100644 --- a/js/src/tests/js1_5/Object/regress-90596-003.js +++ b/js/src/tests/js1_5/Object/regress-90596-003.js @@ -54,7 +54,6 @@ * alphabetically is necessary for the test to work in Rhino. */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-90596-003.js'; var UBound = 0; var BUGNUMBER = 90596; var summary = '[DontEnum] props (if overridden) should appear in for-in loops'; diff --git a/js/src/tests/js1_5/Object/shell.js b/js/src/tests/js1_5/Object/shell.js index acbd0366f31c..e69de29bb2d1 100644 --- a/js/src/tests/js1_5/Object/shell.js +++ b/js/src/tests/js1_5/Object/shell.js @@ -1 +0,0 @@ -gTestsubsuite = 'Object'; diff --git a/js/src/tests/js1_5/Regress/regress-102725.js b/js/src/tests/js1_5/Regress/regress-102725.js index c02a50bb7b21..4c937f77662f 100644 --- a/js/src/tests/js1_5/Regress/regress-102725.js +++ b/js/src/tests/js1_5/Regress/regress-102725.js @@ -46,7 +46,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-102725.js'; var UBound = 0; var BUGNUMBER = 102725; var summary = 'Testing converting numbers to strings'; diff --git a/js/src/tests/js1_5/Regress/regress-10278.js b/js/src/tests/js1_5/Regress/regress-10278.js index cc7f7e3887e2..085eb5d7ba09 100644 --- a/js/src/tests/js1_5/Regress/regress-10278.js +++ b/js/src/tests/js1_5/Regress/regress-10278.js @@ -5,7 +5,6 @@ * Contributor: Bob Clary */ -var gTestfile = 'regress-10278.js'; /** * File Name: regress-10278.js * Reference: https://bugzilla.mozilla.org/show_bug.cgi?id=10278 diff --git a/js/src/tests/js1_5/Regress/regress-103602.js b/js/src/tests/js1_5/Regress/regress-103602.js index ddd5a0347936..75360b74910f 100644 --- a/js/src/tests/js1_5/Regress/regress-103602.js +++ b/js/src/tests/js1_5/Regress/regress-103602.js @@ -54,7 +54,6 @@ * to say so. */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-103602.js'; var UBound = 0; var BUGNUMBER = 103602; var summary = 'Reassignment to a const is NOT an error per ECMA'; diff --git a/js/src/tests/js1_5/Regress/regress-104077.js b/js/src/tests/js1_5/Regress/regress-104077.js index 13e6d9abb2af..5dc739a9e1f6 100644 --- a/js/src/tests/js1_5/Regress/regress-104077.js +++ b/js/src/tests/js1_5/Regress/regress-104077.js @@ -60,7 +60,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-104077.js'; var UBound = 0; var BUGNUMBER = 104077; var summary = "Just testing that we don't crash on with/finally/return -"; diff --git a/js/src/tests/js1_5/Regress/regress-106244.js b/js/src/tests/js1_5/Regress/regress-106244.js index 2a64ea8159df..eaee28bb4cf4 100644 --- a/js/src/tests/js1_5/Regress/regress-106244.js +++ b/js/src/tests/js1_5/Regress/regress-106244.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-106244.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 106244; var summary = 'No warning in strict mode if (a = b && c == d)...'; diff --git a/js/src/tests/js1_5/Regress/regress-110286.js b/js/src/tests/js1_5/Regress/regress-110286.js index 4468055a1f9a..e98dac60baf8 100644 --- a/js/src/tests/js1_5/Regress/regress-110286.js +++ b/js/src/tests/js1_5/Regress/regress-110286.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-110286.js'; var UBound = 0; var BUGNUMBER = 110286; var summary = 'Multiline comments containing "/*" should not be syntax errors'; diff --git a/js/src/tests/js1_5/Regress/regress-111557.js b/js/src/tests/js1_5/Regress/regress-111557.js index 1d871d5bb98d..c32e854980ca 100644 --- a/js/src/tests/js1_5/Regress/regress-111557.js +++ b/js/src/tests/js1_5/Regress/regress-111557.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-111557.js'; var BUGNUMBER = 111557; var summary = "Just seeing that we don't crash on this code -"; diff --git a/js/src/tests/js1_5/Regress/regress-114491.js b/js/src/tests/js1_5/Regress/regress-114491.js index c6c6235761a0..aa065c2811c3 100644 --- a/js/src/tests/js1_5/Regress/regress-114491.js +++ b/js/src/tests/js1_5/Regress/regress-114491.js @@ -49,7 +49,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-114491.js'; var UBound = 0; var BUGNUMBER = 114491; var summary = 'Regression test for bug 114491'; diff --git a/js/src/tests/js1_5/Regress/regress-114493.js b/js/src/tests/js1_5/Regress/regress-114493.js index 9709f43e5618..80759c4f4ba4 100644 --- a/js/src/tests/js1_5/Regress/regress-114493.js +++ b/js/src/tests/js1_5/Regress/regress-114493.js @@ -56,7 +56,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-114493.js'; var UBound = 0; var BUGNUMBER = 114493; var summary = 'Regression test for bug 114493'; diff --git a/js/src/tests/js1_5/Regress/regress-115436.js b/js/src/tests/js1_5/Regress/regress-115436.js index 60ddb6c75f3a..398bcbb09361 100644 --- a/js/src/tests/js1_5/Regress/regress-115436.js +++ b/js/src/tests/js1_5/Regress/regress-115436.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-115436.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 115436; var summary = 'Do not crash javascript warning duplicate arguments'; diff --git a/js/src/tests/js1_5/Regress/regress-116228.js b/js/src/tests/js1_5/Regress/regress-116228.js index 07b6aeb5bc81..79d73d332173 100644 --- a/js/src/tests/js1_5/Regress/regress-116228.js +++ b/js/src/tests/js1_5/Regress/regress-116228.js @@ -37,7 +37,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-116228.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 116228; var summary = 'Do not crash - JSOP_THIS should null obj register'; diff --git a/js/src/tests/js1_5/Regress/regress-118849.js b/js/src/tests/js1_5/Regress/regress-118849.js index bf2ad3f4ef86..758d655969a9 100644 --- a/js/src/tests/js1_5/Regress/regress-118849.js +++ b/js/src/tests/js1_5/Regress/regress-118849.js @@ -55,7 +55,6 @@ * A string containing JS statements comprising the function definition. */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-118849.js'; var UBound = 0; var BUGNUMBER = 118849; var summary = 'Should not crash if we provide Function() with bad arguments' diff --git a/js/src/tests/js1_5/Regress/regress-119719.js b/js/src/tests/js1_5/Regress/regress-119719.js index eabefdb7d70f..24fe7d14fd0f 100644 --- a/js/src/tests/js1_5/Regress/regress-119719.js +++ b/js/src/tests/js1_5/Regress/regress-119719.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-119719.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 119719; var summary = 'Rethrown errors should have line number updated.'; diff --git a/js/src/tests/js1_5/Regress/regress-127243.js b/js/src/tests/js1_5/Regress/regress-127243.js index cd5e2b86ab89..6a029ad18a88 100644 --- a/js/src/tests/js1_5/Regress/regress-127243.js +++ b/js/src/tests/js1_5/Regress/regress-127243.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-127243.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 127243; var summary = 'Do not crash on watch'; diff --git a/js/src/tests/js1_5/Regress/regress-127557.js b/js/src/tests/js1_5/Regress/regress-127557.js index 7f6acd58c32e..675f26e98703 100644 --- a/js/src/tests/js1_5/Regress/regress-127557.js +++ b/js/src/tests/js1_5/Regress/regress-127557.js @@ -50,7 +50,6 @@ * what was confusing the engine in its attempt to look up h_peer */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-127557.js'; var UBound = 0; var BUGNUMBER = 127557; var summary = 'Testing cloned function objects'; diff --git a/js/src/tests/js1_5/Regress/regress-131510-001.js b/js/src/tests/js1_5/Regress/regress-131510-001.js index 19b61fd4c9c1..ddded4cb6e10 100644 --- a/js/src/tests/js1_5/Regress/regress-131510-001.js +++ b/js/src/tests/js1_5/Regress/regress-131510-001.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-131510-001.js'; var BUGNUMBER = 131510; var summary = "Shouldn't crash if define |var arguments| inside a function"; printBugNumber(BUGNUMBER); diff --git a/js/src/tests/js1_5/Regress/regress-139316.js b/js/src/tests/js1_5/Regress/regress-139316.js index 5f451eae36ec..f0c431062eed 100644 --- a/js/src/tests/js1_5/Regress/regress-139316.js +++ b/js/src/tests/js1_5/Regress/regress-139316.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-139316.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 139316; var summary = 'Do not crash in js_ReportIsNotDefined()'; diff --git a/js/src/tests/js1_5/Regress/regress-140852.js b/js/src/tests/js1_5/Regress/regress-140852.js index b2338fa7bc51..b5f0e4f64b22 100644 --- a/js/src/tests/js1_5/Regress/regress-140852.js +++ b/js/src/tests/js1_5/Regress/regress-140852.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-140852.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 140852; var summary = 'String(number) = xxxx:0000 for some numbers'; diff --git a/js/src/tests/js1_5/Regress/regress-140974.js b/js/src/tests/js1_5/Regress/regress-140974.js index 0f75c2ee7b53..a642b081cfb1 100644 --- a/js/src/tests/js1_5/Regress/regress-140974.js +++ b/js/src/tests/js1_5/Regress/regress-140974.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-140974.js'; var UBound = 0; var BUGNUMBER = 140974; var TEST_PASSED = 'variable was created'; diff --git a/js/src/tests/js1_5/Regress/regress-146596.js b/js/src/tests/js1_5/Regress/regress-146596.js index 46f0f3a3eae8..574b0ec69bed 100644 --- a/js/src/tests/js1_5/Regress/regress-146596.js +++ b/js/src/tests/js1_5/Regress/regress-146596.js @@ -45,7 +45,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-146596.js'; var UBound = 0; var BUGNUMBER = 146596; var summary = "Shouldn't crash when catch parameter is 'hidden' by varX"; diff --git a/js/src/tests/js1_5/Regress/regress-152646.js b/js/src/tests/js1_5/Regress/regress-152646.js index 1c9db7cae0f1..64fc7499fffd 100644 --- a/js/src/tests/js1_5/Regress/regress-152646.js +++ b/js/src/tests/js1_5/Regress/regress-152646.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-152646.js'; var UBound = 0; var BUGNUMBER = 152646; var summary = 'Testing expressions with large numbers of parentheses'; diff --git a/js/src/tests/js1_5/Regress/regress-155081-2.js b/js/src/tests/js1_5/Regress/regress-155081-2.js index f7638e5f78a3..85d4de972b01 100644 --- a/js/src/tests/js1_5/Regress/regress-155081-2.js +++ b/js/src/tests/js1_5/Regress/regress-155081-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-155081-2.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 155081; var summary = 'Limit of 64k literals'; diff --git a/js/src/tests/js1_5/Regress/regress-155081.js b/js/src/tests/js1_5/Regress/regress-155081.js index 2f9a25b98c58..bf875fc73bd7 100644 --- a/js/src/tests/js1_5/Regress/regress-155081.js +++ b/js/src/tests/js1_5/Regress/regress-155081.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-155081.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 155081; var summary = 'Limit of 64k literals'; diff --git a/js/src/tests/js1_5/Regress/regress-156354.js b/js/src/tests/js1_5/Regress/regress-156354.js index acb77964d226..640414f668b0 100644 --- a/js/src/tests/js1_5/Regress/regress-156354.js +++ b/js/src/tests/js1_5/Regress/regress-156354.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-156354.js'; var UBound = 0; var BUGNUMBER = 156354; var summary = 'Testing propertyIsEnumerable() on nonexistent property'; diff --git a/js/src/tests/js1_5/Regress/regress-159334.js b/js/src/tests/js1_5/Regress/regress-159334.js index eaf4f7e365dc..c1c49e49485d 100644 --- a/js/src/tests/js1_5/Regress/regress-159334.js +++ b/js/src/tests/js1_5/Regress/regress-159334.js @@ -54,7 +54,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-159334.js'; var UBound = 0; var BUGNUMBER = 159334; var summary = 'Testing script with at least 64K of different string literals'; diff --git a/js/src/tests/js1_5/Regress/regress-162392.js b/js/src/tests/js1_5/Regress/regress-162392.js index 861508f421c4..43c3b1d08483 100644 --- a/js/src/tests/js1_5/Regress/regress-162392.js +++ b/js/src/tests/js1_5/Regress/regress-162392.js @@ -5,7 +5,6 @@ * Contributor: Bob Clary */ -var gTestfile = 'regress-162392.js'; //----------------------------------------------------------------------------- // SUMMARY: 10.1.8 Arguments Object length diff --git a/js/src/tests/js1_5/Regress/regress-165201.js b/js/src/tests/js1_5/Regress/regress-165201.js index ebde457c684e..8adcf64554ad 100644 --- a/js/src/tests/js1_5/Regress/regress-165201.js +++ b/js/src/tests/js1_5/Regress/regress-165201.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-165201.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 165201; var summary = ''; diff --git a/js/src/tests/js1_5/Regress/regress-167328.js b/js/src/tests/js1_5/Regress/regress-167328.js index 5e96bbcb2249..51f4f70cbb5d 100644 --- a/js/src/tests/js1_5/Regress/regress-167328.js +++ b/js/src/tests/js1_5/Regress/regress-167328.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-167328.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 167328; var summary = 'Normal error reporting code should fill Error object properties'; @@ -46,7 +45,7 @@ var expect = ''; printBugNumber(BUGNUMBER); printStatus (summary); -expect = 'TypeError:53'; +expect = 'TypeError:52'; try { var obj = {toString: function() {return new Object();}}; diff --git a/js/src/tests/js1_5/Regress/regress-167658.js b/js/src/tests/js1_5/Regress/regress-167658.js index 3ec1167a9fe3..6015fe6e7bf1 100644 --- a/js/src/tests/js1_5/Regress/regress-167658.js +++ b/js/src/tests/js1_5/Regress/regress-167658.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-167658.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 167658; var summary = 'Do not crash due to js_NewRegExp initialization'; diff --git a/js/src/tests/js1_5/Regress/regress-168347.js b/js/src/tests/js1_5/Regress/regress-168347.js index a2717c771b76..450894460795 100644 --- a/js/src/tests/js1_5/Regress/regress-168347.js +++ b/js/src/tests/js1_5/Regress/regress-168347.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-168347.js'; var UBound = 0; var BUGNUMBER = 168347; var summary = "Testing F.toString()"; diff --git a/js/src/tests/js1_5/Regress/regress-169559.js b/js/src/tests/js1_5/Regress/regress-169559.js index 93c9c4a5af32..976a0624d902 100644 --- a/js/src/tests/js1_5/Regress/regress-169559.js +++ b/js/src/tests/js1_5/Regress/regress-169559.js @@ -5,7 +5,6 @@ * Contributor: Bob Clary */ -var gTestfile = 'regress-169559.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 169559; var summary = 'Global vars should not be more than 2.5 times slower than local'; diff --git a/js/src/tests/js1_5/Regress/regress-170193.js b/js/src/tests/js1_5/Regress/regress-170193.js index 3fe602d19804..e7d7d3409cfe 100644 --- a/js/src/tests/js1_5/Regress/regress-170193.js +++ b/js/src/tests/js1_5/Regress/regress-170193.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-170193.js'; var UBound = 0; var BUGNUMBER = 170193; var summary = 'adding property after middle-delete of function w duplicate formal args'; diff --git a/js/src/tests/js1_5/Regress/regress-172699.js b/js/src/tests/js1_5/Regress/regress-172699.js index 87645f12c191..a3c53c7692d6 100644 --- a/js/src/tests/js1_5/Regress/regress-172699.js +++ b/js/src/tests/js1_5/Regress/regress-172699.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-172699.js'; var UBound = 0; var BUGNUMBER = 172699; var summary = 'UTF-8 decoder should not accept overlong sequences'; diff --git a/js/src/tests/js1_5/Regress/regress-173067.js b/js/src/tests/js1_5/Regress/regress-173067.js index 26ea4d8c4f23..6bef0b918f74 100644 --- a/js/src/tests/js1_5/Regress/regress-173067.js +++ b/js/src/tests/js1_5/Regress/regress-173067.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-173067.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 173067; var summary = 'Properly report / in a literal regexp class as an error'; diff --git a/js/src/tests/js1_5/Regress/regress-174709.js b/js/src/tests/js1_5/Regress/regress-174709.js index b9c8226410ac..566e1b2866c1 100644 --- a/js/src/tests/js1_5/Regress/regress-174709.js +++ b/js/src/tests/js1_5/Regress/regress-174709.js @@ -37,7 +37,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-174709.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 174709; var summary = 'Don\'t Crash'; diff --git a/js/src/tests/js1_5/Regress/regress-176125.js b/js/src/tests/js1_5/Regress/regress-176125.js index a750be463732..d7c537326b24 100644 --- a/js/src/tests/js1_5/Regress/regress-176125.js +++ b/js/src/tests/js1_5/Regress/regress-176125.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-176125.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 176125; var summary = 'if() should not return a value'; diff --git a/js/src/tests/js1_5/Regress/regress-179524.js b/js/src/tests/js1_5/Regress/regress-179524.js index 55d83a769ba4..ca74807312c6 100644 --- a/js/src/tests/js1_5/Regress/regress-179524.js +++ b/js/src/tests/js1_5/Regress/regress-179524.js @@ -51,7 +51,6 @@ * to str.replace(), if that argument is a string - */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-179524.js'; var UBound = 0; var BUGNUMBER = 179524; var summary = "Don't crash on extraneous arguments to str.match(), etc."; diff --git a/js/src/tests/js1_5/Regress/regress-185165.js b/js/src/tests/js1_5/Regress/regress-185165.js index 42b877fc4790..08f31f75e990 100644 --- a/js/src/tests/js1_5/Regress/regress-185165.js +++ b/js/src/tests/js1_5/Regress/regress-185165.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-185165.js'; var UBound = 0; var BUGNUMBER = 185165; var summary = 'Decompilation of "\\\\" should give "\\\\"'; diff --git a/js/src/tests/js1_5/Regress/regress-191633.js b/js/src/tests/js1_5/Regress/regress-191633.js index 117881881143..679e97249c28 100644 --- a/js/src/tests/js1_5/Regress/regress-191633.js +++ b/js/src/tests/js1_5/Regress/regress-191633.js @@ -45,7 +45,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-191633.js'; var UBound = 0; var BUGNUMBER = 191633; var summary = 'Testing script with huge number of comments'; diff --git a/js/src/tests/js1_5/Regress/regress-191668.js b/js/src/tests/js1_5/Regress/regress-191668.js index b98445344034..9aee26f5d2b3 100644 --- a/js/src/tests/js1_5/Regress/regress-191668.js +++ b/js/src/tests/js1_5/Regress/regress-191668.js @@ -46,7 +46,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-191668.js'; var UBound = 0; var BUGNUMBER = 191668; var summary = 'Testing script containing in var BUGNUMBER = 240577; diff --git a/js/src/tests/js1_5/Regress/regress-243174.js b/js/src/tests/js1_5/Regress/regress-243174.js index 2f5057003b93..f255def1c90a 100644 --- a/js/src/tests/js1_5/Regress/regress-243174.js +++ b/js/src/tests/js1_5/Regress/regress-243174.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-243174.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 243174; var summary = 'Don\'t Crash on Regular Expression'; diff --git a/js/src/tests/js1_5/Regress/regress-243389-n.js b/js/src/tests/js1_5/Regress/regress-243389-n.js index 05d03f8817fc..7fc39362bb9b 100644 --- a/js/src/tests/js1_5/Regress/regress-243389-n.js +++ b/js/src/tests/js1_5/Regress/regress-243389-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-243389-n.js'; //----------------------------------------------------------------------------- // test from Henrik Gemal var BUGNUMBER = 243389; diff --git a/js/src/tests/js1_5/Regress/regress-243869.js b/js/src/tests/js1_5/Regress/regress-243869.js index 2de39d954d8f..456bea974de4 100644 --- a/js/src/tests/js1_5/Regress/regress-243869.js +++ b/js/src/tests/js1_5/Regress/regress-243869.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-243869.js'; //----------------------------------------------------------------------------- // testcase from Alex Vincent var BUGNUMBER = 243869; diff --git a/js/src/tests/js1_5/Regress/regress-244470.js b/js/src/tests/js1_5/Regress/regress-244470.js index 0f3150d64099..607e9c9d8914 100644 --- a/js/src/tests/js1_5/Regress/regress-244470.js +++ b/js/src/tests/js1_5/Regress/regress-244470.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-244470.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 244470; var summary = 'Don\'t Crash'; diff --git a/js/src/tests/js1_5/Regress/regress-244619.js b/js/src/tests/js1_5/Regress/regress-244619.js index 7d473775b08b..16bf511dfa1b 100644 --- a/js/src/tests/js1_5/Regress/regress-244619.js +++ b/js/src/tests/js1_5/Regress/regress-244619.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-244619.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 244619; var summary = 'Don\'t Crash'; diff --git a/js/src/tests/js1_5/Regress/regress-245113.js b/js/src/tests/js1_5/Regress/regress-245113.js index 31b8a630d7db..ba1ecd1d2fbe 100644 --- a/js/src/tests/js1_5/Regress/regress-245113.js +++ b/js/src/tests/js1_5/Regress/regress-245113.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-245113.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 245113; var summary = 'instanceof operator should return false for class prototype'; diff --git a/js/src/tests/js1_5/Regress/regress-245308.js b/js/src/tests/js1_5/Regress/regress-245308.js index 9fd6eb755f29..7b88554b9c9c 100644 --- a/js/src/tests/js1_5/Regress/regress-245308.js +++ b/js/src/tests/js1_5/Regress/regress-245308.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-245308.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 245308; var summary = 'Don\'t Crash with nest try catch'; diff --git a/js/src/tests/js1_5/Regress/regress-246911.js b/js/src/tests/js1_5/Regress/regress-246911.js index 5fdcf07f8c1c..fc0c660bf960 100644 --- a/js/src/tests/js1_5/Regress/regress-246911.js +++ b/js/src/tests/js1_5/Regress/regress-246911.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-246911.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 246911; var summary = 'switch() statement with variable as label'; diff --git a/js/src/tests/js1_5/Regress/regress-246964.js b/js/src/tests/js1_5/Regress/regress-246964.js index 3469cc363f52..bdcdefcd3051 100644 --- a/js/src/tests/js1_5/Regress/regress-246964.js +++ b/js/src/tests/js1_5/Regress/regress-246964.js @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-246964.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 246964; // see also bug 248549, bug 253150, bug 259935 diff --git a/js/src/tests/js1_5/Regress/regress-247179.js b/js/src/tests/js1_5/Regress/regress-247179.js index 77c1268e7020..47a025f50403 100644 --- a/js/src/tests/js1_5/Regress/regress-247179.js +++ b/js/src/tests/js1_5/Regress/regress-247179.js @@ -37,7 +37,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-247179.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 247179; var summary = 'RegExp \\b should not recognize non-ASCII alphanumerics as word characters'; diff --git a/js/src/tests/js1_5/Regress/regress-248444.js b/js/src/tests/js1_5/Regress/regress-248444.js index fb2380352627..945cdea3a4f1 100644 --- a/js/src/tests/js1_5/Regress/regress-248444.js +++ b/js/src/tests/js1_5/Regress/regress-248444.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-248444.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 248444; var summary = 'toString/toSource of RegExp should escape slashes'; diff --git a/js/src/tests/js1_5/Regress/regress-249211.js b/js/src/tests/js1_5/Regress/regress-249211.js index 4c247fa07f63..a344aaa383a8 100644 --- a/js/src/tests/js1_5/Regress/regress-249211.js +++ b/js/src/tests/js1_5/Regress/regress-249211.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-249211.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 249211; var summary = 'support export and import for 4xp'; diff --git a/js/src/tests/js1_5/Regress/regress-252892.js b/js/src/tests/js1_5/Regress/regress-252892.js index 1be3d1247e23..bce57b35fe30 100644 --- a/js/src/tests/js1_5/Regress/regress-252892.js +++ b/js/src/tests/js1_5/Regress/regress-252892.js @@ -37,7 +37,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-252892.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 252892; var summary = 'for (var i in o) in heavyweight function f should define i in f\'s activation'; diff --git a/js/src/tests/js1_5/Regress/regress-253150.js b/js/src/tests/js1_5/Regress/regress-253150.js index 7e39261c9e68..a3878c411474 100644 --- a/js/src/tests/js1_5/Regress/regress-253150.js +++ b/js/src/tests/js1_5/Regress/regress-253150.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-253150.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 253150; var summary = 'Do not warn on detecting properties'; diff --git a/js/src/tests/js1_5/Regress/regress-254296.js b/js/src/tests/js1_5/Regress/regress-254296.js index 30b15d0d7ff6..5dca0f877fd7 100644 --- a/js/src/tests/js1_5/Regress/regress-254296.js +++ b/js/src/tests/js1_5/Regress/regress-254296.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-254296.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 254296; var summary = 'javascript regular expression negative lookahead'; diff --git a/js/src/tests/js1_5/Regress/regress-254974.js b/js/src/tests/js1_5/Regress/regress-254974.js index 546cf51febf1..987be5a66303 100644 --- a/js/src/tests/js1_5/Regress/regress-254974.js +++ b/js/src/tests/js1_5/Regress/regress-254974.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-254974.js'; //----------------------------------------------------------------------------- // this test originally was only seen if typed into the js shell. // loading as a script file did not exhibit the problem. diff --git a/js/src/tests/js1_5/Regress/regress-256501.js b/js/src/tests/js1_5/Regress/regress-256501.js index 2abbfd5495c3..2f1532c4720c 100644 --- a/js/src/tests/js1_5/Regress/regress-256501.js +++ b/js/src/tests/js1_5/Regress/regress-256501.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-256501.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 256501; var summary = 'Check Recursion'; diff --git a/js/src/tests/js1_5/Regress/regress-256617.js b/js/src/tests/js1_5/Regress/regress-256617.js index 0640997a6cea..61b0eefba8a5 100644 --- a/js/src/tests/js1_5/Regress/regress-256617.js +++ b/js/src/tests/js1_5/Regress/regress-256617.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-256617.js'; //----------------------------------------------------------------------------- // should fail with syntax error. won't run in browser... var BUGNUMBER = 256617; diff --git a/js/src/tests/js1_5/Regress/regress-256798.js b/js/src/tests/js1_5/Regress/regress-256798.js index f717383ecea9..fb06c6479df8 100644 --- a/js/src/tests/js1_5/Regress/regress-256798.js +++ b/js/src/tests/js1_5/Regress/regress-256798.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-256798.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 256798; var summary = 'regexp zero-width positive lookahead'; diff --git a/js/src/tests/js1_5/Regress/regress-259935.js b/js/src/tests/js1_5/Regress/regress-259935.js index b00f4c22f627..9242e5d93270 100644 --- a/js/src/tests/js1_5/Regress/regress-259935.js +++ b/js/src/tests/js1_5/Regress/regress-259935.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-259935.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 259935; var summary = 'document.all can be easily detected'; diff --git a/js/src/tests/js1_5/Regress/regress-260541.js b/js/src/tests/js1_5/Regress/regress-260541.js index 1f8f5ef5948a..2ce01f544903 100644 --- a/js/src/tests/js1_5/Regress/regress-260541.js +++ b/js/src/tests/js1_5/Regress/regress-260541.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-260541.js'; //----------------------------------------------------------------------------- // have not been able to reproduce the crash in any build. var BUGNUMBER = 260541; diff --git a/js/src/tests/js1_5/Regress/regress-261886.js b/js/src/tests/js1_5/Regress/regress-261886.js index ceac8467493e..1b6ac53a303c 100644 --- a/js/src/tests/js1_5/Regress/regress-261886.js +++ b/js/src/tests/js1_5/Regress/regress-261886.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-261886.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 261886; var summary = 'Always evaluate delete operand expression'; diff --git a/js/src/tests/js1_5/Regress/regress-261887.js b/js/src/tests/js1_5/Regress/regress-261887.js index 61cf83aa609f..fcc8741f0548 100644 --- a/js/src/tests/js1_5/Regress/regress-261887.js +++ b/js/src/tests/js1_5/Regress/regress-261887.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-261887.js'; //----------------------------------------------------------------------------- // testcase from Oscar Fogelberg var BUGNUMBER = 261887; diff --git a/js/src/tests/js1_5/Regress/regress-271716-n.js b/js/src/tests/js1_5/Regress/regress-271716-n.js index 75532480a221..11bfcb46ddbb 100644 --- a/js/src/tests/js1_5/Regress/regress-271716-n.js +++ b/js/src/tests/js1_5/Regress/regress-271716-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-271716-n.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 271716; var summary = 'Don\'t Crash on infinite loop creating new Arrays'; diff --git a/js/src/tests/js1_5/Regress/regress-274035.js b/js/src/tests/js1_5/Regress/regress-274035.js index 2e4edc1641b9..e3d2f6adc503 100644 --- a/js/src/tests/js1_5/Regress/regress-274035.js +++ b/js/src/tests/js1_5/Regress/regress-274035.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-274035.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 274035; var summary = 'Array.prototype[concat|slice|splice] lengths'; diff --git a/js/src/tests/js1_5/Regress/regress-274888.js b/js/src/tests/js1_5/Regress/regress-274888.js index 972f6b550ed5..b9e548b173b7 100644 --- a/js/src/tests/js1_5/Regress/regress-274888.js +++ b/js/src/tests/js1_5/Regress/regress-274888.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-274888.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 274888; var summary = 'Negative lookahead should match at positions > approx. 64k'; diff --git a/js/src/tests/js1_5/Regress/regress-275378.js b/js/src/tests/js1_5/Regress/regress-275378.js index 08f2a2422d71..138ebd560d78 100644 --- a/js/src/tests/js1_5/Regress/regress-275378.js +++ b/js/src/tests/js1_5/Regress/regress-275378.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-275378.js'; //----------------------------------------------------------------------------- // testcase by Martin Zvieger // if fails, will fail to run in browser due to syntax error diff --git a/js/src/tests/js1_5/Regress/regress-276103.js b/js/src/tests/js1_5/Regress/regress-276103.js index 1b1416280623..40bad19d4f2c 100644 --- a/js/src/tests/js1_5/Regress/regress-276103.js +++ b/js/src/tests/js1_5/Regress/regress-276103.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-276103.js'; //----------------------------------------------------------------------------- // testcase by Gianugo Rabellino var BUGNUMBER = 276103; diff --git a/js/src/tests/js1_5/Regress/regress-278873.js b/js/src/tests/js1_5/Regress/regress-278873.js index 802c20f10077..38348f50b50f 100644 --- a/js/src/tests/js1_5/Regress/regress-278873.js +++ b/js/src/tests/js1_5/Regress/regress-278873.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-278873.js'; //----------------------------------------------------------------------------- // testcase by Philipp Vogt var BUGNUMBER = 278873; diff --git a/js/src/tests/js1_5/Regress/regress-280769-1.js b/js/src/tests/js1_5/Regress/regress-280769-1.js index a6d1b39ff9dd..1b063a0892b2 100644 --- a/js/src/tests/js1_5/Regress/regress-280769-1.js +++ b/js/src/tests/js1_5/Regress/regress-280769-1.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-280769-1.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 280769; var summary = 'Do not crash on overflow of 64K boundary of [] offset in regexp search string '; diff --git a/js/src/tests/js1_5/Regress/regress-280769-2.js b/js/src/tests/js1_5/Regress/regress-280769-2.js index 456667e7906d..f4abb072df06 100644 --- a/js/src/tests/js1_5/Regress/regress-280769-2.js +++ b/js/src/tests/js1_5/Regress/regress-280769-2.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-280769-2.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 280769; var summary = 'Do not overflow 64K boundary in treeDepth'; diff --git a/js/src/tests/js1_5/Regress/regress-280769-3.js b/js/src/tests/js1_5/Regress/regress-280769-3.js index f3096b20f588..d27a858ddfc9 100644 --- a/js/src/tests/js1_5/Regress/regress-280769-3.js +++ b/js/src/tests/js1_5/Regress/regress-280769-3.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-280769-3.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 280769; var summary = 'Do not crash on overflow of 64K boundary in number of classes in regexp'; diff --git a/js/src/tests/js1_5/Regress/regress-280769-4.js b/js/src/tests/js1_5/Regress/regress-280769-4.js index 74ff76aad9cf..5b85639fbfbe 100644 --- a/js/src/tests/js1_5/Regress/regress-280769-4.js +++ b/js/src/tests/js1_5/Regress/regress-280769-4.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-280769-4.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 280769; var summary = 'Do not overflow 64K length of char sequence in RegExp []'; diff --git a/js/src/tests/js1_5/Regress/regress-280769-5.js b/js/src/tests/js1_5/Regress/regress-280769-5.js index a2c05c707428..387044bc5185 100644 --- a/js/src/tests/js1_5/Regress/regress-280769-5.js +++ b/js/src/tests/js1_5/Regress/regress-280769-5.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-280769-5.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 280769; var summary = 'Do not overflow 64K string offset'; diff --git a/js/src/tests/js1_5/Regress/regress-280769.js b/js/src/tests/js1_5/Regress/regress-280769.js index c0c1dac387eb..ea558e00df3c 100644 --- a/js/src/tests/js1_5/Regress/regress-280769.js +++ b/js/src/tests/js1_5/Regress/regress-280769.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-280769.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 280769; var summary = 'Do not crash on overflow of 32K boundary in regexp bytecode jump offset'; diff --git a/js/src/tests/js1_5/Regress/regress-281487.js b/js/src/tests/js1_5/Regress/regress-281487.js index d80baa11cdb5..e4b0f6318703 100644 --- a/js/src/tests/js1_5/Regress/regress-281487.js +++ b/js/src/tests/js1_5/Regress/regress-281487.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-281487.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 281487; var summary = 'JSOP_ARGDEC assertion when tracing'; diff --git a/js/src/tests/js1_5/Regress/regress-281606.js b/js/src/tests/js1_5/Regress/regress-281606.js index 0e1a11a52a8d..2d73aa74ac86 100644 --- a/js/src/tests/js1_5/Regress/regress-281606.js +++ b/js/src/tests/js1_5/Regress/regress-281606.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-281606.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 281606; var summary = 'l instanceof r throws TypeError if r does not support [[HasInstance]]'; diff --git a/js/src/tests/js1_5/Regress/regress-281930.js b/js/src/tests/js1_5/Regress/regress-281930.js index 6f4c956ba5da..ef7762bd0830 100644 --- a/js/src/tests/js1_5/Regress/regress-281930.js +++ b/js/src/tests/js1_5/Regress/regress-281930.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-281930.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 281930; var summary = 'this reference should point to global object in function expressions'; diff --git a/js/src/tests/js1_5/Regress/regress-283477.js b/js/src/tests/js1_5/Regress/regress-283477.js index 61f87582c49f..642169016e02 100644 --- a/js/src/tests/js1_5/Regress/regress-283477.js +++ b/js/src/tests/js1_5/Regress/regress-283477.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-283477.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 283477; var summary = 'a.lastIndexOf(b, c) should return -1 when there is no match'; diff --git a/js/src/tests/js1_5/Regress/regress-286216.js b/js/src/tests/js1_5/Regress/regress-286216.js index 56af89b9ad01..2b30a0b0803a 100644 --- a/js/src/tests/js1_5/Regress/regress-286216.js +++ b/js/src/tests/js1_5/Regress/regress-286216.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-286216.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 286216; var summary = 'Do not crash tracing a for-in loop'; diff --git a/js/src/tests/js1_5/Regress/regress-288688.js b/js/src/tests/js1_5/Regress/regress-288688.js index a80870b0f5ca..952be33ed2d4 100644 --- a/js/src/tests/js1_5/Regress/regress-288688.js +++ b/js/src/tests/js1_5/Regress/regress-288688.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-288688.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 288688; var summary = 'x->regExpStatics should be stacked and unstacked around the lambda invocations'; diff --git a/js/src/tests/js1_5/Regress/regress-289094.js b/js/src/tests/js1_5/Regress/regress-289094.js index 49c3c411d352..79ebc14c7a80 100644 --- a/js/src/tests/js1_5/Regress/regress-289094.js +++ b/js/src/tests/js1_5/Regress/regress-289094.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-289094.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 289094; var summary = 'argument shadowing function property special case for lambdas'; diff --git a/js/src/tests/js1_5/Regress/regress-290575.js b/js/src/tests/js1_5/Regress/regress-290575.js index 509a62833078..ea1eb40a321b 100644 --- a/js/src/tests/js1_5/Regress/regress-290575.js +++ b/js/src/tests/js1_5/Regress/regress-290575.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-290575.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 290575; var summary = 'Do not crash calling function with more than 32768 arguments'; diff --git a/js/src/tests/js1_5/Regress/regress-290656.js b/js/src/tests/js1_5/Regress/regress-290656.js index f8b34c7ef9c0..4fb9b7c370ae 100644 --- a/js/src/tests/js1_5/Regress/regress-290656.js +++ b/js/src/tests/js1_5/Regress/regress-290656.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-290656.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 290656; var summary = 'Regression from bug 254974'; diff --git a/js/src/tests/js1_5/Regress/regress-294191.js b/js/src/tests/js1_5/Regress/regress-294191.js index af331b5ddf16..61e1d4cbffeb 100644 --- a/js/src/tests/js1_5/Regress/regress-294191.js +++ b/js/src/tests/js1_5/Regress/regress-294191.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-294191.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 294191; var summary = 'Do not crash with nested function and "delete" op'; diff --git a/js/src/tests/js1_5/Regress/regress-294195-01.js b/js/src/tests/js1_5/Regress/regress-294195-01.js index 41b3cc3989c8..d82ec2c0ae09 100644 --- a/js/src/tests/js1_5/Regress/regress-294195-01.js +++ b/js/src/tests/js1_5/Regress/regress-294195-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-294195-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 294195; var summary = 'Do not crash during String replace when accessing methods on backreferences'; diff --git a/js/src/tests/js1_5/Regress/regress-294195-02.js b/js/src/tests/js1_5/Regress/regress-294195-02.js index 504d3788e6eb..9930bb9505a7 100644 --- a/js/src/tests/js1_5/Regress/regress-294195-02.js +++ b/js/src/tests/js1_5/Regress/regress-294195-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-294195-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 294195; var summary = 'Do not crash during String replace when accessing methods on backreferences'; diff --git a/js/src/tests/js1_5/Regress/regress-294302.js b/js/src/tests/js1_5/Regress/regress-294302.js index d39bdacf16a4..df75d329ddd7 100644 --- a/js/src/tests/js1_5/Regress/regress-294302.js +++ b/js/src/tests/js1_5/Regress/regress-294302.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-294302.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 294302; var summary = 'JS Shell load should throw catchable exceptions'; diff --git a/js/src/tests/js1_5/Regress/regress-295052.js b/js/src/tests/js1_5/Regress/regress-295052.js index 239f110e1ef6..a57c3e217c59 100644 --- a/js/src/tests/js1_5/Regress/regress-295052.js +++ b/js/src/tests/js1_5/Regress/regress-295052.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-295052.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 295052; var summary = 'Do not crash when apply method is called on String.prototype.match'; diff --git a/js/src/tests/js1_5/Regress/regress-295666.js b/js/src/tests/js1_5/Regress/regress-295666.js index 9cbf4c67d855..6b794a338347 100644 --- a/js/src/tests/js1_5/Regress/regress-295666.js +++ b/js/src/tests/js1_5/Regress/regress-295666.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-295666.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 295666; var summary = 'Check JS only recursion stack overflow'; diff --git a/js/src/tests/js1_5/Regress/regress-299209.js b/js/src/tests/js1_5/Regress/regress-299209.js index aa1cae806e86..8155985a4919 100644 --- a/js/src/tests/js1_5/Regress/regress-299209.js +++ b/js/src/tests/js1_5/Regress/regress-299209.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-299209.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 299209; var summary = 'anonymous function expression statement => JS stack overflow'; diff --git a/js/src/tests/js1_5/Regress/regress-299641.js b/js/src/tests/js1_5/Regress/regress-299641.js index 068c6ab3fdfe..6674287396b0 100644 --- a/js/src/tests/js1_5/Regress/regress-299641.js +++ b/js/src/tests/js1_5/Regress/regress-299641.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-299641.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 299641; var summary = '12.6.4 - LHS for (LHS in expression) execution'; diff --git a/js/src/tests/js1_5/Regress/regress-303213.js b/js/src/tests/js1_5/Regress/regress-303213.js index 7f99d4a910b7..553811da3dc6 100644 --- a/js/src/tests/js1_5/Regress/regress-303213.js +++ b/js/src/tests/js1_5/Regress/regress-303213.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-303213.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 303213; var summary = 'integer overflow in js'; diff --git a/js/src/tests/js1_5/Regress/regress-306633.js b/js/src/tests/js1_5/Regress/regress-306633.js index a8e8cedfc8d1..86c87d71dda9 100644 --- a/js/src/tests/js1_5/Regress/regress-306633.js +++ b/js/src/tests/js1_5/Regress/regress-306633.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-306633.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 306633; var summary = 'report compile warnings in evald code when strict warnings enabled'; diff --git a/js/src/tests/js1_5/Regress/regress-306727.js b/js/src/tests/js1_5/Regress/regress-306727.js index 6e8f5f842056..396391178fdb 100644 --- a/js/src/tests/js1_5/Regress/regress-306727.js +++ b/js/src/tests/js1_5/Regress/regress-306727.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-306727.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 306727; var summary = 'Parsing RegExp of octal expressions in strict mode'; diff --git a/js/src/tests/js1_5/Regress/regress-306794.js b/js/src/tests/js1_5/Regress/regress-306794.js index f8863100c1b6..d61be6abe1ed 100644 --- a/js/src/tests/js1_5/Regress/regress-306794.js +++ b/js/src/tests/js1_5/Regress/regress-306794.js @@ -5,7 +5,6 @@ * Contributor: Blake Kaplan */ -var gTestfile = 'regress-306794.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 306794; var summary = 'Do not assert: parsing foo getter'; diff --git a/js/src/tests/js1_5/Regress/regress-308085.js b/js/src/tests/js1_5/Regress/regress-308085.js index f0aae7e9654b..edb2a7655e4f 100644 --- a/js/src/tests/js1_5/Regress/regress-308085.js +++ b/js/src/tests/js1_5/Regress/regress-308085.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-308085.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 308085; var summary = 'JavaScript switch statement going to the wrong case'; diff --git a/js/src/tests/js1_5/Regress/regress-308566.js b/js/src/tests/js1_5/Regress/regress-308566.js index 7539dafe3338..746fbb123efb 100644 --- a/js/src/tests/js1_5/Regress/regress-308566.js +++ b/js/src/tests/js1_5/Regress/regress-308566.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-308566.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 308566; var summary = 'Do not treat octal sequence as regexp backrefs in strict mode'; diff --git a/js/src/tests/js1_5/Regress/regress-309242.js b/js/src/tests/js1_5/Regress/regress-309242.js index 77b5c8ea0b62..69d769ee6283 100644 --- a/js/src/tests/js1_5/Regress/regress-309242.js +++ b/js/src/tests/js1_5/Regress/regress-309242.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-309242.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 309242; var summary = 'E4X should be on by default while preserving comment hack'; diff --git a/js/src/tests/js1_5/Regress/regress-310295.js b/js/src/tests/js1_5/Regress/regress-310295.js index fca1e056923a..324a4fe6930f 100644 --- a/js/src/tests/js1_5/Regress/regress-310295.js +++ b/js/src/tests/js1_5/Regress/regress-310295.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-310295.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 310295; var summary = 'Do not crash on JS_ValueToString'; diff --git a/js/src/tests/js1_5/Regress/regress-310607.js b/js/src/tests/js1_5/Regress/regress-310607.js index e9754403bcd2..f2af99f1142c 100644 --- a/js/src/tests/js1_5/Regress/regress-310607.js +++ b/js/src/tests/js1_5/Regress/regress-310607.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-310607.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 310607; var summary = 'Do not crash iterating over Object.prototype'; diff --git a/js/src/tests/js1_5/Regress/regress-310993.js b/js/src/tests/js1_5/Regress/regress-310993.js index 892b60d0f189..d41bd68763ae 100644 --- a/js/src/tests/js1_5/Regress/regress-310993.js +++ b/js/src/tests/js1_5/Regress/regress-310993.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-310993.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 310993; var summary = 'treat <! as the start of a comment to end of line if not e4x'; diff --git a/js/src/tests/js1_5/Regress/regress-311071.js b/js/src/tests/js1_5/Regress/regress-311071.js index 221e48decdce..7b407ff72b2f 100644 --- a/js/src/tests/js1_5/Regress/regress-311071.js +++ b/js/src/tests/js1_5/Regress/regress-311071.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-311071.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 311071; var summary = 'treat <! as the start of a comment to end of line if not e4x'; diff --git a/js/src/tests/js1_5/Regress/regress-311629.js b/js/src/tests/js1_5/Regress/regress-311629.js index 156e1d6bdeb3..f37d186731ac 100644 --- a/js/src/tests/js1_5/Regress/regress-311629.js +++ b/js/src/tests/js1_5/Regress/regress-311629.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-311629.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 311629; var summary = 'Prevent recursive death in UnaryExp'; diff --git a/js/src/tests/js1_5/Regress/regress-312260.js b/js/src/tests/js1_5/Regress/regress-312260.js index e81b5c44308a..d1cddfe03e93 100644 --- a/js/src/tests/js1_5/Regress/regress-312260.js +++ b/js/src/tests/js1_5/Regress/regress-312260.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-312260.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 312260; var summary = 'Switch discriminant detecting case should not warn'; diff --git a/js/src/tests/js1_5/Regress/regress-31255.js b/js/src/tests/js1_5/Regress/regress-31255.js index 9d37cfa40456..68d62e67fdb2 100644 --- a/js/src/tests/js1_5/Regress/regress-31255.js +++ b/js/src/tests/js1_5/Regress/regress-31255.js @@ -50,7 +50,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-31255.js'; var UBound = 0; var BUGNUMBER = 31255; var summary = 'JS should treat --> as a single-line comment indicator'; diff --git a/js/src/tests/js1_5/Regress/regress-312588.js b/js/src/tests/js1_5/Regress/regress-312588.js index 9c8c13635e7b..5af283510dd3 100644 --- a/js/src/tests/js1_5/Regress/regress-312588.js +++ b/js/src/tests/js1_5/Regress/regress-312588.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-312588.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 312588; var summary = 'Do not crash creating infinite array'; diff --git a/js/src/tests/js1_5/Regress/regress-313967-01.js b/js/src/tests/js1_5/Regress/regress-313967-01.js index 23474922e785..7952973925a2 100644 --- a/js/src/tests/js1_5/Regress/regress-313967-01.js +++ b/js/src/tests/js1_5/Regress/regress-313967-01.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-313967-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 313967; var summary = 'Compile time of N functions should be O(N)'; diff --git a/js/src/tests/js1_5/Regress/regress-313967-02.js b/js/src/tests/js1_5/Regress/regress-313967-02.js index fa482560e370..592acdf09453 100644 --- a/js/src/tests/js1_5/Regress/regress-313967-02.js +++ b/js/src/tests/js1_5/Regress/regress-313967-02.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-313967-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 313967; var summary = 'Compile time of N functions should be O(N)'; diff --git a/js/src/tests/js1_5/Regress/regress-314401.js b/js/src/tests/js1_5/Regress/regress-314401.js index c3ebe3e37f31..a9d2023bd058 100644 --- a/js/src/tests/js1_5/Regress/regress-314401.js +++ b/js/src/tests/js1_5/Regress/regress-314401.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-314401.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 314401; var summary = 'setTimeout(eval,0,"",null)|setTimeout(Script,0,"",null) should not crash'; diff --git a/js/src/tests/js1_5/Regress/regress-315974.js b/js/src/tests/js1_5/Regress/regress-315974.js index 49b9b81281cd..34068ff29c21 100644 --- a/js/src/tests/js1_5/Regress/regress-315974.js +++ b/js/src/tests/js1_5/Regress/regress-315974.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-315974.js'; //----------------------------------------------------------------------------- /* diff --git a/js/src/tests/js1_5/Regress/regress-315990.js b/js/src/tests/js1_5/Regress/regress-315990.js index 78f29e7fcf2d..9ecf1159ef7d 100644 --- a/js/src/tests/js1_5/Regress/regress-315990.js +++ b/js/src/tests/js1_5/Regress/regress-315990.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-315990.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 315990; var summary = 'this.statement.is.an.error'; diff --git a/js/src/tests/js1_5/Regress/regress-317476.js b/js/src/tests/js1_5/Regress/regress-317476.js index 3bc769fd6ead..735437ffa270 100644 --- a/js/src/tests/js1_5/Regress/regress-317476.js +++ b/js/src/tests/js1_5/Regress/regress-317476.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-317476.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 317476; var summary = 'The error thrown by JS_ReportError should be catchable'; diff --git a/js/src/tests/js1_5/Regress/regress-317533.js b/js/src/tests/js1_5/Regress/regress-317533.js index e8b6d64e9f9d..7d353827e839 100644 --- a/js/src/tests/js1_5/Regress/regress-317533.js +++ b/js/src/tests/js1_5/Regress/regress-317533.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-317533.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 317533; var summary = 'improve function does not always return a value warnings'; diff --git a/js/src/tests/js1_5/Regress/regress-317714-01.js b/js/src/tests/js1_5/Regress/regress-317714-01.js index dc489e1a269c..8d067d948591 100644 --- a/js/src/tests/js1_5/Regress/regress-317714-01.js +++ b/js/src/tests/js1_5/Regress/regress-317714-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-317714-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 317714; var summary = 'Regression test for regression from bug 316885'; diff --git a/js/src/tests/js1_5/Regress/regress-317714-02.js b/js/src/tests/js1_5/Regress/regress-317714-02.js index b2482223b67c..167b8ee62a9f 100644 --- a/js/src/tests/js1_5/Regress/regress-317714-02.js +++ b/js/src/tests/js1_5/Regress/regress-317714-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-317714-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 317714; var summary = 'Regression test for regression from bug 316885'; diff --git a/js/src/tests/js1_5/Regress/regress-319384.js b/js/src/tests/js1_5/Regress/regress-319384.js index 9c8d91d2a29c..073a330b0555 100644 --- a/js/src/tests/js1_5/Regress/regress-319384.js +++ b/js/src/tests/js1_5/Regress/regress-319384.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-319384.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 319384; var summary = 'Do not crash converting string to number'; diff --git a/js/src/tests/js1_5/Regress/regress-319391.js b/js/src/tests/js1_5/Regress/regress-319391.js index ecab485f05af..bf04d7e8270c 100644 --- a/js/src/tests/js1_5/Regress/regress-319391.js +++ b/js/src/tests/js1_5/Regress/regress-319391.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-319391.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 319391; var summary = 'Assignment to eval(...) should be runtime error'; diff --git a/js/src/tests/js1_5/Regress/regress-320032.js b/js/src/tests/js1_5/Regress/regress-320032.js index db0954acd8a5..2407779e90c8 100644 --- a/js/src/tests/js1_5/Regress/regress-320032.js +++ b/js/src/tests/js1_5/Regress/regress-320032.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-320032.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 320032; var summary = 'Parenthesization should not dereference ECMA Reference type'; diff --git a/js/src/tests/js1_5/Regress/regress-320119.js b/js/src/tests/js1_5/Regress/regress-320119.js index be97223f6839..7d60f9a23bcd 100644 --- a/js/src/tests/js1_5/Regress/regress-320119.js +++ b/js/src/tests/js1_5/Regress/regress-320119.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-320119.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 320119; var summary = 'delegating objects and arguments, arity, caller, name'; diff --git a/js/src/tests/js1_5/Regress/regress-321757.js b/js/src/tests/js1_5/Regress/regress-321757.js index aa864ba2c1ef..50939c0fe092 100644 --- a/js/src/tests/js1_5/Regress/regress-321757.js +++ b/js/src/tests/js1_5/Regress/regress-321757.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-321757.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 321757; var summary = 'Compound assignment operators should not bind LHS'; diff --git a/js/src/tests/js1_5/Regress/regress-321874.js b/js/src/tests/js1_5/Regress/regress-321874.js index f3b7c3397330..374bc1708133 100644 --- a/js/src/tests/js1_5/Regress/regress-321874.js +++ b/js/src/tests/js1_5/Regress/regress-321874.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-321874.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 321874; var summary = 'lhs must be a reference in (for lhs in rhs) ...'; diff --git a/js/src/tests/js1_5/Regress/regress-321971.js b/js/src/tests/js1_5/Regress/regress-321971.js index ec4ba9a7d840..32b001098686 100644 --- a/js/src/tests/js1_5/Regress/regress-321971.js +++ b/js/src/tests/js1_5/Regress/regress-321971.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-321971.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 321971; var summary = 'JSOP_FINDNAME replaces JSOP_BINDNAME'; diff --git a/js/src/tests/js1_5/Regress/regress-322430.js b/js/src/tests/js1_5/Regress/regress-322430.js index 349012bf5916..6ed150d44ad2 100644 --- a/js/src/tests/js1_5/Regress/regress-322430.js +++ b/js/src/tests/js1_5/Regress/regress-322430.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-322430.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 322430; var summary = 'Remove deprecated with statement warning'; diff --git a/js/src/tests/js1_5/Regress/regress-323314-1.js b/js/src/tests/js1_5/Regress/regress-323314-1.js index c83ccfc9e628..16835585b19e 100644 --- a/js/src/tests/js1_5/Regress/regress-323314-1.js +++ b/js/src/tests/js1_5/Regress/regress-323314-1.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-323314-1.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 323314; var summary = 'JSMSG_EQUAL_AS_ASSIGN in js.msg should be JSEXN_SYNTAXERR'; diff --git a/js/src/tests/js1_5/Regress/regress-325925.js b/js/src/tests/js1_5/Regress/regress-325925.js index d18b07e3afdd..4db697d87da8 100644 --- a/js/src/tests/js1_5/Regress/regress-325925.js +++ b/js/src/tests/js1_5/Regress/regress-325925.js @@ -5,7 +5,6 @@ * Contributor: Blake Kaplan */ -var gTestfile = 'regress-325925.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 325925; var summary = 'Do not Assert: c <= cs->length in AddCharacterToCharSet'; diff --git a/js/src/tests/js1_5/Regress/regress-326453.js b/js/src/tests/js1_5/Regress/regress-326453.js index 255c487c6982..336b9261523b 100644 --- a/js/src/tests/js1_5/Regress/regress-326453.js +++ b/js/src/tests/js1_5/Regress/regress-326453.js @@ -5,7 +5,6 @@ * Contributor: Blake Kaplan */ -var gTestfile = 'regress-326453.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 326453; var summary = 'Do not assert: while decompiling'; diff --git a/js/src/tests/js1_5/Regress/regress-326467.js b/js/src/tests/js1_5/Regress/regress-326467.js index 50e555917a6e..99b045e9f26d 100644 --- a/js/src/tests/js1_5/Regress/regress-326467.js +++ b/js/src/tests/js1_5/Regress/regress-326467.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-326467.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 326467; var summary = 'Do not assert: slot < fp->nvars, at jsinterp.c'; diff --git a/js/src/tests/js1_5/Regress/regress-328012.js b/js/src/tests/js1_5/Regress/regress-328012.js index f0bf36060b18..582e9460f091 100644 --- a/js/src/tests/js1_5/Regress/regress-328012.js +++ b/js/src/tests/js1_5/Regress/regress-328012.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-328012.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 328012; var summary = 'Content PropertyIterator should not root in chrome'; diff --git a/js/src/tests/js1_5/Regress/regress-328664.js b/js/src/tests/js1_5/Regress/regress-328664.js index 41d8d494064d..58455107e370 100644 --- a/js/src/tests/js1_5/Regress/regress-328664.js +++ b/js/src/tests/js1_5/Regress/regress-328664.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-328664.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 328664; var summary = 'Correct error message for funccall(undefined, undefined.prop)'; diff --git a/js/src/tests/js1_5/Regress/regress-328897.js b/js/src/tests/js1_5/Regress/regress-328897.js index 94031a63786f..df51aa7a6a96 100644 --- a/js/src/tests/js1_5/Regress/regress-328897.js +++ b/js/src/tests/js1_5/Regress/regress-328897.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-328897.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 328897; var summary = 'JS_ReportPendingException should'; diff --git a/js/src/tests/js1_5/Regress/regress-329383.js b/js/src/tests/js1_5/Regress/regress-329383.js index dadf1cade0b7..4fb7ad325703 100644 --- a/js/src/tests/js1_5/Regress/regress-329383.js +++ b/js/src/tests/js1_5/Regress/regress-329383.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-329383.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 329383; var summary = 'Math copysign issues'; diff --git a/js/src/tests/js1_5/Regress/regress-329530.js b/js/src/tests/js1_5/Regress/regress-329530.js index 70bd8e1400e4..796248f60be3 100644 --- a/js/src/tests/js1_5/Regress/regress-329530.js +++ b/js/src/tests/js1_5/Regress/regress-329530.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-329530.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 329530; var summary = 'Do not crash when calling toString on a deeply nested function'; diff --git a/js/src/tests/js1_5/Regress/regress-330352.js b/js/src/tests/js1_5/Regress/regress-330352.js index b35169a2bd71..bf362f02fe57 100644 --- a/js/src/tests/js1_5/Regress/regress-330352.js +++ b/js/src/tests/js1_5/Regress/regress-330352.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-330352.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 330352; var summary = 'Very non-greedy regexp causes crash in jsregexp.c'; diff --git a/js/src/tests/js1_5/Regress/regress-330951.js b/js/src/tests/js1_5/Regress/regress-330951.js index 547c07a2ba82..541052302054 100644 --- a/js/src/tests/js1_5/Regress/regress-330951.js +++ b/js/src/tests/js1_5/Regress/regress-330951.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-330951.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 330951; var summary = 'Crash in Array.sort on array with undefined value'; diff --git a/js/src/tests/js1_5/Regress/regress-334807-01.js b/js/src/tests/js1_5/Regress/regress-334807-01.js index c7cc4ef11566..faff1eadb02f 100644 --- a/js/src/tests/js1_5/Regress/regress-334807-01.js +++ b/js/src/tests/js1_5/Regress/regress-334807-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-334807-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 334807; var summary = '10.1.8 - arguments prototype is the original Object prototype'; diff --git a/js/src/tests/js1_5/Regress/regress-334807-02.js b/js/src/tests/js1_5/Regress/regress-334807-02.js index 0f30be21bb71..4663dbea5cc1 100644 --- a/js/src/tests/js1_5/Regress/regress-334807-02.js +++ b/js/src/tests/js1_5/Regress/regress-334807-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-334807-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 334807; var summary = '10.1.8 - arguments prototype is the original Object prototype.'; diff --git a/js/src/tests/js1_5/Regress/regress-334807-03.js b/js/src/tests/js1_5/Regress/regress-334807-03.js index 65719ac63d12..3af7c8319d9e 100644 --- a/js/src/tests/js1_5/Regress/regress-334807-03.js +++ b/js/src/tests/js1_5/Regress/regress-334807-03.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-334807-03.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 334807; var summary = '10.1.8 - arguments prototype is the original Object prototype'; diff --git a/js/src/tests/js1_5/Regress/regress-334807-04.js b/js/src/tests/js1_5/Regress/regress-334807-04.js index 9aec71363646..6ce5542eb391 100644 --- a/js/src/tests/js1_5/Regress/regress-334807-04.js +++ b/js/src/tests/js1_5/Regress/regress-334807-04.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-334807-04.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 334807; var summary = '10.1.8 - arguments prototype is the original Object prototype.'; diff --git a/js/src/tests/js1_5/Regress/regress-334807-05.js b/js/src/tests/js1_5/Regress/regress-334807-05.js index 59fc3b6c25e2..82908b569cbf 100644 --- a/js/src/tests/js1_5/Regress/regress-334807-05.js +++ b/js/src/tests/js1_5/Regress/regress-334807-05.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-334807-05.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 334807; var summary = '12.14 - exception prototype is the original Object prototype.'; diff --git a/js/src/tests/js1_5/Regress/regress-334807-06.js b/js/src/tests/js1_5/Regress/regress-334807-06.js index f8722cbec98c..929794f437b5 100644 --- a/js/src/tests/js1_5/Regress/regress-334807-06.js +++ b/js/src/tests/js1_5/Regress/regress-334807-06.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-334807-06.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 334807; var summary = '12.14 - exception prototype is the original Object prototype.'; diff --git a/js/src/tests/js1_5/Regress/regress-336100.js b/js/src/tests/js1_5/Regress/regress-336100.js index 0b1e142fbb72..799ff657b61b 100644 --- a/js/src/tests/js1_5/Regress/regress-336100.js +++ b/js/src/tests/js1_5/Regress/regress-336100.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-336100.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 336100; var summary = 'bug 336100 - arguments regressed'; diff --git a/js/src/tests/js1_5/Regress/regress-338307.js b/js/src/tests/js1_5/Regress/regress-338307.js index 3e5fb9d83805..76ae389d253b 100644 --- a/js/src/tests/js1_5/Regress/regress-338307.js +++ b/js/src/tests/js1_5/Regress/regress-338307.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-338307.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 338307; var summary = 'for (i in arguments) causes type error (JS_1_7_ALPHA_BRANCH)'; diff --git a/js/src/tests/js1_5/Regress/regress-340369.js b/js/src/tests/js1_5/Regress/regress-340369.js index eca75b4392dc..4bbf101321e2 100644 --- a/js/src/tests/js1_5/Regress/regress-340369.js +++ b/js/src/tests/js1_5/Regress/regress-340369.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-340369.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 340369; var summary = 'Oh for crying out loud.'; diff --git a/js/src/tests/js1_5/Regress/regress-341360.js b/js/src/tests/js1_5/Regress/regress-341360.js index 21b2e864691e..54024b2ef750 100644 --- a/js/src/tests/js1_5/Regress/regress-341360.js +++ b/js/src/tests/js1_5/Regress/regress-341360.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-341360.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 341360; var summary = 'clearInterval broken'; diff --git a/js/src/tests/js1_5/Regress/regress-343713.js b/js/src/tests/js1_5/Regress/regress-343713.js index 936373f28947..0b2082a32728 100644 --- a/js/src/tests/js1_5/Regress/regress-343713.js +++ b/js/src/tests/js1_5/Regress/regress-343713.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-343713.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 343713; var summary = 'Do not JS_Assert with nested function evaluation'; diff --git a/js/src/tests/js1_5/Regress/regress-343966.js b/js/src/tests/js1_5/Regress/regress-343966.js index 2cf2afd09668..9d5d31c92a8a 100644 --- a/js/src/tests/js1_5/Regress/regress-343966.js +++ b/js/src/tests/js1_5/Regress/regress-343966.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-343966.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 343966; var summary = 'ClearScope foo regressed due to bug 343417'; diff --git a/js/src/tests/js1_5/Regress/regress-344711-n.js b/js/src/tests/js1_5/Regress/regress-344711-n.js index bc48f9211f2d..b7d0f01c6f0b 100644 --- a/js/src/tests/js1_5/Regress/regress-344711-n.js +++ b/js/src/tests/js1_5/Regress/regress-344711-n.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-344711-n.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 344711; var summary = 'Do not crash compiling when peeking over a newline'; diff --git a/js/src/tests/js1_5/Regress/regress-344804.js b/js/src/tests/js1_5/Regress/regress-344804.js index 933ee8ae50b9..1cf1efd5f2a3 100644 --- a/js/src/tests/js1_5/Regress/regress-344804.js +++ b/js/src/tests/js1_5/Regress/regress-344804.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-344804.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 344804; var summary = 'Do not crash iterating over window.Packages'; diff --git a/js/src/tests/js1_5/Regress/regress-344959.js b/js/src/tests/js1_5/Regress/regress-344959.js index ed59dc364897..3bb770118851 100644 --- a/js/src/tests/js1_5/Regress/regress-344959.js +++ b/js/src/tests/js1_5/Regress/regress-344959.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-344959.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 344959; var summary = 'Functions should not lose scope chain after exception'; diff --git a/js/src/tests/js1_5/Regress/regress-346237.js b/js/src/tests/js1_5/Regress/regress-346237.js index 7c1556cd33cb..f65f08ad46cf 100644 --- a/js/src/tests/js1_5/Regress/regress-346237.js +++ b/js/src/tests/js1_5/Regress/regress-346237.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-346237.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 346237; var summary = 'RegExp - /(|)??x/g.exec("y")'; diff --git a/js/src/tests/js1_5/Regress/regress-346801.js b/js/src/tests/js1_5/Regress/regress-346801.js index fd8aa00d4b2f..27fc3998f986 100644 --- a/js/src/tests/js1_5/Regress/regress-346801.js +++ b/js/src/tests/js1_5/Regress/regress-346801.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-346801.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 346801; var summary = 'Hang regression from bug 346021'; diff --git a/js/src/tests/js1_5/Regress/regress-347306-01.js b/js/src/tests/js1_5/Regress/regress-347306-01.js index 02579ab4c847..1008c59ae0ac 100644 --- a/js/src/tests/js1_5/Regress/regress-347306-01.js +++ b/js/src/tests/js1_5/Regress/regress-347306-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-347306-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 347306; var summary = 'decompilation should not be O(N**2)'; diff --git a/js/src/tests/js1_5/Regress/regress-349482-01.js b/js/src/tests/js1_5/Regress/regress-349482-01.js index 836dcf775cde..6e8f8d70cbd3 100644 --- a/js/src/tests/js1_5/Regress/regress-349482-01.js +++ b/js/src/tests/js1_5/Regress/regress-349482-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-349482-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 349482; var summary = 'Decompiling try/catch in for..in should not crash'; diff --git a/js/src/tests/js1_5/Regress/regress-349482-02.js b/js/src/tests/js1_5/Regress/regress-349482-02.js index 747ddbdb308e..a1e204b84298 100644 --- a/js/src/tests/js1_5/Regress/regress-349482-02.js +++ b/js/src/tests/js1_5/Regress/regress-349482-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-349482-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 349482; var summary = 'Decompiling try/catch in with() should not crash'; diff --git a/js/src/tests/js1_5/Regress/regress-349592.js b/js/src/tests/js1_5/Regress/regress-349592.js index 354ffd916212..5fc33e809022 100644 --- a/js/src/tests/js1_5/Regress/regress-349592.js +++ b/js/src/tests/js1_5/Regress/regress-349592.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-349592.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 349592; var summary = 'Do not assert with try/finally inside finally'; diff --git a/js/src/tests/js1_5/Regress/regress-349648.js b/js/src/tests/js1_5/Regress/regress-349648.js index 201314a9df03..6c09fe53daed 100644 --- a/js/src/tests/js1_5/Regress/regress-349648.js +++ b/js/src/tests/js1_5/Regress/regress-349648.js @@ -37,7 +37,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-349648.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 349648; var summary = 'Extra "[" in decomilation of nested array comprehensions'; diff --git a/js/src/tests/js1_5/Regress/regress-350253.js b/js/src/tests/js1_5/Regress/regress-350253.js index 6940c75c8491..9f2b3ac08a1c 100644 --- a/js/src/tests/js1_5/Regress/regress-350253.js +++ b/js/src/tests/js1_5/Regress/regress-350253.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-350253.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 350253; var summary = 'Do not assert on (g()) = 3'; diff --git a/js/src/tests/js1_5/Regress/regress-350268.js b/js/src/tests/js1_5/Regress/regress-350268.js index 8b778a64b1d6..7489a5744751 100644 --- a/js/src/tests/js1_5/Regress/regress-350268.js +++ b/js/src/tests/js1_5/Regress/regress-350268.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-350268.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 350268; var summary = 'new Function with unbalanced braces'; diff --git a/js/src/tests/js1_5/Regress/regress-350312.js b/js/src/tests/js1_5/Regress/regress-350312.js index 5c5fde1fad07..d597e90245d6 100644 --- a/js/src/tests/js1_5/Regress/regress-350312.js +++ b/js/src/tests/js1_5/Regress/regress-350312.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-350312.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 350312; var summary = 'Accessing wrong stack slot with nested catch/finally'; diff --git a/js/src/tests/js1_5/Regress/regress-350415.js b/js/src/tests/js1_5/Regress/regress-350415.js index d9c1fdd23a9a..e38a06cf3183 100644 --- a/js/src/tests/js1_5/Regress/regress-350415.js +++ b/js/src/tests/js1_5/Regress/regress-350415.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-350415.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 350415; var summary = 'Do not assert with new Function("let /*")'; diff --git a/js/src/tests/js1_5/Regress/regress-350529.js b/js/src/tests/js1_5/Regress/regress-350529.js index 1cad19ec33c4..d16780c96a8c 100644 --- a/js/src/tests/js1_5/Regress/regress-350529.js +++ b/js/src/tests/js1_5/Regress/regress-350529.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-350529.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 350529; var summary = "Do not assert: x--'"; diff --git a/js/src/tests/js1_5/Regress/regress-350692.js b/js/src/tests/js1_5/Regress/regress-350692.js index ab72c2053d35..dbc6a4752b54 100644 --- a/js/src/tests/js1_5/Regress/regress-350692.js +++ b/js/src/tests/js1_5/Regress/regress-350692.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-350692.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 350692; var summary = 'import x["y"]["z"]'; diff --git a/js/src/tests/js1_5/Regress/regress-351116.js b/js/src/tests/js1_5/Regress/regress-351116.js index 4820aa3c283a..ada966efbfbd 100644 --- a/js/src/tests/js1_5/Regress/regress-351116.js +++ b/js/src/tests/js1_5/Regress/regress-351116.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-351116.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 351116; var summary = 'formal parameter and inner function have same name'; diff --git a/js/src/tests/js1_5/Regress/regress-351515.js b/js/src/tests/js1_5/Regress/regress-351515.js index e97c4d68cc1f..431c7b73cb71 100644 --- a/js/src/tests/js1_5/Regress/regress-351515.js +++ b/js/src/tests/js1_5/Regress/regress-351515.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-351515.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 351515; var summary = 'js17 features must be enabled by version request'; diff --git a/js/src/tests/js1_5/Regress/regress-352009.js b/js/src/tests/js1_5/Regress/regress-352009.js index 72398e0fe1cd..c396ed0629e6 100644 --- a/js/src/tests/js1_5/Regress/regress-352009.js +++ b/js/src/tests/js1_5/Regress/regress-352009.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-352009.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 352009; var summary = 'Do not assert [1 for (y in [3])]'; diff --git a/js/src/tests/js1_5/Regress/regress-352197.js b/js/src/tests/js1_5/Regress/regress-352197.js index ebbfb9a4fa66..140179589cee 100644 --- a/js/src/tests/js1_5/Regress/regress-352197.js +++ b/js/src/tests/js1_5/Regress/regress-352197.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-352197.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 352197; var summary = 'Strict warning for return e; vs. return;'; diff --git a/js/src/tests/js1_5/Regress/regress-352208.js b/js/src/tests/js1_5/Regress/regress-352208.js index 735cbdaa9e7d..53423c2d83e4 100644 --- a/js/src/tests/js1_5/Regress/regress-352208.js +++ b/js/src/tests/js1_5/Regress/regress-352208.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-352208.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 352208; var summary = 'Do not assert new Function("setter/*\n")'; diff --git a/js/src/tests/js1_5/Regress/regress-352604.js b/js/src/tests/js1_5/Regress/regress-352604.js index 2e72ce6119cd..5f8c764012b8 100644 --- a/js/src/tests/js1_5/Regress/regress-352604.js +++ b/js/src/tests/js1_5/Regress/regress-352604.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-352604.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 352604; var summary = 'Do not assert: !OBJ_GET_PROTO(cx, ctor)'; diff --git a/js/src/tests/js1_5/Regress/regress-354924.js b/js/src/tests/js1_5/Regress/regress-354924.js index 135808deb7f2..f3e07bec3cc7 100644 --- a/js/src/tests/js1_5/Regress/regress-354924.js +++ b/js/src/tests/js1_5/Regress/regress-354924.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-354924.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 354924; var summary = 'Do not crash with export/import and setter'; diff --git a/js/src/tests/js1_5/Regress/regress-355341.js b/js/src/tests/js1_5/Regress/regress-355341.js index b1575ee18f78..46d67c359d36 100644 --- a/js/src/tests/js1_5/Regress/regress-355341.js +++ b/js/src/tests/js1_5/Regress/regress-355341.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-355341.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 355341; var summary = 'Do not crash with watch and setter'; diff --git a/js/src/tests/js1_5/Regress/regress-355344.js b/js/src/tests/js1_5/Regress/regress-355344.js index c3411720d6ba..c3721bac039d 100644 --- a/js/src/tests/js1_5/Regress/regress-355344.js +++ b/js/src/tests/js1_5/Regress/regress-355344.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-355344.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 355344; var summary = 'Exceptions thrown by watch point'; diff --git a/js/src/tests/js1_5/Regress/regress-355556.js b/js/src/tests/js1_5/Regress/regress-355556.js index 0dd051a8f8b0..46f9120df062 100644 --- a/js/src/tests/js1_5/Regress/regress-355556.js +++ b/js/src/tests/js1_5/Regress/regress-355556.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-355556.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 355556; var summary = 'Do not crash with eval(..., arguments)'; diff --git a/js/src/tests/js1_5/Regress/regress-355829-01.js b/js/src/tests/js1_5/Regress/regress-355829-01.js index 0429100afb62..3afb441ad7dd 100755 --- a/js/src/tests/js1_5/Regress/regress-355829-01.js +++ b/js/src/tests/js1_5/Regress/regress-355829-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-355829-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 355829; var summary = 'Do not assert: !argc || JSVAL_IS_NULL(argv[0]) || JSVAL_IS_VOID(argv[0])'; diff --git a/js/src/tests/js1_5/Regress/regress-355829-02.js b/js/src/tests/js1_5/Regress/regress-355829-02.js index c5624aaf3c8c..3b3a0efdec6f 100755 --- a/js/src/tests/js1_5/Regress/regress-355829-02.js +++ b/js/src/tests/js1_5/Regress/regress-355829-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-355829-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 355829; var summary = 'js_ValueToObject should return the original object if OBJ_DEFAULT_VALUE returns a primitive value'; diff --git a/js/src/tests/js1_5/Regress/regress-355829-03.js b/js/src/tests/js1_5/Regress/regress-355829-03.js index 1e2b3f94bede..53bef2e91db6 100755 --- a/js/src/tests/js1_5/Regress/regress-355829-03.js +++ b/js/src/tests/js1_5/Regress/regress-355829-03.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-355829-03.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 355829; var summary = 'js_ValueToObject should return the original object if OBJ_DEFAULT_VALUE returns a primitive value'; diff --git a/js/src/tests/js1_5/Regress/regress-356250.js b/js/src/tests/js1_5/Regress/regress-356250.js index 2d91a509b85f..83711b5ecfdf 100644 --- a/js/src/tests/js1_5/Regress/regress-356250.js +++ b/js/src/tests/js1_5/Regress/regress-356250.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-356250.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 356250; var summary = 'Do not assert: !fp->fun || !(fp->fun->flags & JSFUN_HEAVYWEIGHT) || fp->callobj'; diff --git a/js/src/tests/js1_5/Regress/regress-356693.js b/js/src/tests/js1_5/Regress/regress-356693.js index 480067d039b1..224cb11a92bc 100644 --- a/js/src/tests/js1_5/Regress/regress-356693.js +++ b/js/src/tests/js1_5/Regress/regress-356693.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-356693.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 356693; var summary = 'Do not assert: pn2->pn_op == JSOP_SETCALL'; diff --git a/js/src/tests/js1_5/Regress/regress-360969-01.js b/js/src/tests/js1_5/Regress/regress-360969-01.js index aa1dd792e5f7..db27cb926547 100644 --- a/js/src/tests/js1_5/Regress/regress-360969-01.js +++ b/js/src/tests/js1_5/Regress/regress-360969-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-360969-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 360969; var summary = '2^17: local var'; diff --git a/js/src/tests/js1_5/Regress/regress-360969-02.js b/js/src/tests/js1_5/Regress/regress-360969-02.js index 588ab2a5bd84..36e8435b5fe9 100644 --- a/js/src/tests/js1_5/Regress/regress-360969-02.js +++ b/js/src/tests/js1_5/Regress/regress-360969-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-360969-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 360969; var summary = '2^17: global var'; diff --git a/js/src/tests/js1_5/Regress/regress-360969-03.js b/js/src/tests/js1_5/Regress/regress-360969-03.js index 54e32144a30b..66545774b6c0 100644 --- a/js/src/tests/js1_5/Regress/regress-360969-03.js +++ b/js/src/tests/js1_5/Regress/regress-360969-03.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-360969-03.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 360969; var summary = '2^17: local const'; diff --git a/js/src/tests/js1_5/Regress/regress-360969-04.js b/js/src/tests/js1_5/Regress/regress-360969-04.js index b68b77f3bf7d..9b2544204171 100644 --- a/js/src/tests/js1_5/Regress/regress-360969-04.js +++ b/js/src/tests/js1_5/Regress/regress-360969-04.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-360969-04.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 360969; var summary = '2^17: global const'; diff --git a/js/src/tests/js1_5/Regress/regress-360969-05.js b/js/src/tests/js1_5/Regress/regress-360969-05.js index 6aec4a4bd0af..f71e5e97434c 100644 --- a/js/src/tests/js1_5/Regress/regress-360969-05.js +++ b/js/src/tests/js1_5/Regress/regress-360969-05.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-360969-05.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 360969; var summary = '2^17: local function'; diff --git a/js/src/tests/js1_5/Regress/regress-360969-06.js b/js/src/tests/js1_5/Regress/regress-360969-06.js index e8e0e94c8270..2a2e9ab0fdc1 100644 --- a/js/src/tests/js1_5/Regress/regress-360969-06.js +++ b/js/src/tests/js1_5/Regress/regress-360969-06.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-360969-06.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 360969; var summary = '2^17: global function'; diff --git a/js/src/tests/js1_5/Regress/regress-361467.js b/js/src/tests/js1_5/Regress/regress-361467.js index d2bfa6713dda..cbd7b05d2246 100644 --- a/js/src/tests/js1_5/Regress/regress-361467.js +++ b/js/src/tests/js1_5/Regress/regress-361467.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-361467.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 361467; var summary = 'Do not crash with certain watchers'; diff --git a/js/src/tests/js1_5/Regress/regress-361617.js b/js/src/tests/js1_5/Regress/regress-361617.js index b0fb0bd2c547..f27b56105feb 100644 --- a/js/src/tests/js1_5/Regress/regress-361617.js +++ b/js/src/tests/js1_5/Regress/regress-361617.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-361617.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 361617; var summary = 'Do not crash with getter, watch and gc'; diff --git a/js/src/tests/js1_5/Regress/regress-362583.js b/js/src/tests/js1_5/Regress/regress-362583.js index 1cad2d8267b8..f7dcb33d412b 100644 --- a/js/src/tests/js1_5/Regress/regress-362583.js +++ b/js/src/tests/js1_5/Regress/regress-362583.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-362583.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 362583; var summary = 'Do not assert: caller->fun && !JSFUN_HEAVYWEIGHT_TEST(caller->fun->flags)'; diff --git a/js/src/tests/js1_5/Regress/regress-3649-n.js b/js/src/tests/js1_5/Regress/regress-3649-n.js index b5171fc2713c..2dfd0b2deff3 100644 --- a/js/src/tests/js1_5/Regress/regress-3649-n.js +++ b/js/src/tests/js1_5/Regress/regress-3649-n.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-3649-n.js'; //----------------------------------------------------------------------------- // testcase from bug 2235 mff@research.att.com var BUGNUMBER = 3649; diff --git a/js/src/tests/js1_5/Regress/regress-366122.js b/js/src/tests/js1_5/Regress/regress-366122.js index de67e2a3aa4b..ab751aee4ccb 100644 --- a/js/src/tests/js1_5/Regress/regress-366122.js +++ b/js/src/tests/js1_5/Regress/regress-366122.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-366122.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 366122; var summary = 'Compile large script'; diff --git a/js/src/tests/js1_5/Regress/regress-366468.js b/js/src/tests/js1_5/Regress/regress-366468.js index 379f7da19259..be75902dd4ec 100644 --- a/js/src/tests/js1_5/Regress/regress-366468.js +++ b/js/src/tests/js1_5/Regress/regress-366468.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-366468.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 366468; var summary = 'Set property without setter'; diff --git a/js/src/tests/js1_5/Regress/regress-366601.js b/js/src/tests/js1_5/Regress/regress-366601.js index 8e09459b218d..b9e0f7b4ed20 100644 --- a/js/src/tests/js1_5/Regress/regress-366601.js +++ b/js/src/tests/js1_5/Regress/regress-366601.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-366601.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 366601; var summary = 'Switch with more than 64k atoms'; diff --git a/js/src/tests/js1_5/Regress/regress-367561-01.js b/js/src/tests/js1_5/Regress/regress-367561-01.js index 4f66f18ce735..a68e4e603e87 100644 --- a/js/src/tests/js1_5/Regress/regress-367561-01.js +++ b/js/src/tests/js1_5/Regress/regress-367561-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-367561-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 367561; var summary = 'JSOP_(GET|SET)METHOD and JSOP_SETCONST with > 64K atoms'; diff --git a/js/src/tests/js1_5/Regress/regress-367561-03.js b/js/src/tests/js1_5/Regress/regress-367561-03.js index 955d56020ed6..694f36e7be4a 100644 --- a/js/src/tests/js1_5/Regress/regress-367561-03.js +++ b/js/src/tests/js1_5/Regress/regress-367561-03.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-367561-03.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 367561; var summary = 'JSOP_(GET|SET)METHOD and JSOP_SETCONST with > 64K atoms'; diff --git a/js/src/tests/js1_5/Regress/regress-372364.js b/js/src/tests/js1_5/Regress/regress-372364.js index 47f0ee3ed8a3..e4b8c2e5b783 100644 --- a/js/src/tests/js1_5/Regress/regress-372364.js +++ b/js/src/tests/js1_5/Regress/regress-372364.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-372364.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 372364; var summary = 'Incorrect error message "() has no properties"'; diff --git a/js/src/tests/js1_5/Regress/regress-379245.js b/js/src/tests/js1_5/Regress/regress-379245.js index 7b4147fb0cb3..388d0d7c7045 100644 --- a/js/src/tests/js1_5/Regress/regress-379245.js +++ b/js/src/tests/js1_5/Regress/regress-379245.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-379245.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 379245; var summary = 'inline calls'; diff --git a/js/src/tests/js1_5/Regress/regress-383674.js b/js/src/tests/js1_5/Regress/regress-383674.js index 3c6ce2ff8820..a33bb2018015 100644 --- a/js/src/tests/js1_5/Regress/regress-383674.js +++ b/js/src/tests/js1_5/Regress/regress-383674.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-383674.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 383674; var summary = 'Statement that implicitly calls toString should not be optimized away as a "useless expression"'; diff --git a/js/src/tests/js1_5/Regress/regress-383682.js b/js/src/tests/js1_5/Regress/regress-383682.js index 12a9170ed6a0..73b08885e690 100644 --- a/js/src/tests/js1_5/Regress/regress-383682.js +++ b/js/src/tests/js1_5/Regress/regress-383682.js @@ -5,7 +5,6 @@ * Contributor: Blake Kaplan */ -var gTestfile = 'regress-383682.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 383682; var summary = 'eval is too dynamic'; diff --git a/js/src/tests/js1_5/Regress/regress-385393-06.js b/js/src/tests/js1_5/Regress/regress-385393-06.js index 2f3290387bf6..93de0948877e 100644 --- a/js/src/tests/js1_5/Regress/regress-385393-06.js +++ b/js/src/tests/js1_5/Regress/regress-385393-06.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-385393-06.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 385393; diff --git a/js/src/tests/js1_5/Regress/regress-387951-01.js b/js/src/tests/js1_5/Regress/regress-387951-01.js index 83559be0297b..b7e3b563dc84 100644 --- a/js/src/tests/js1_5/Regress/regress-387951-01.js +++ b/js/src/tests/js1_5/Regress/regress-387951-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-387951-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 387951; var summary = 'Do not assert: cg->stackDepth >= 0'; diff --git a/js/src/tests/js1_5/Regress/regress-387951-02.js b/js/src/tests/js1_5/Regress/regress-387951-02.js index 4ae1f8f0218d..ee0056d91203 100644 --- a/js/src/tests/js1_5/Regress/regress-387951-02.js +++ b/js/src/tests/js1_5/Regress/regress-387951-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-387951-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 387951; var summary = 'Do not assert: cg->stackDepth >= 0'; diff --git a/js/src/tests/js1_5/Regress/regress-387951-03.js b/js/src/tests/js1_5/Regress/regress-387951-03.js index c5db9fb6f2e0..370a8be79ae3 100644 --- a/js/src/tests/js1_5/Regress/regress-387951-03.js +++ b/js/src/tests/js1_5/Regress/regress-387951-03.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-387951-03.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 387951; var summary = 'Do not assert: cg->stackDepth >= 0'; diff --git a/js/src/tests/js1_5/Regress/regress-39309.js b/js/src/tests/js1_5/Regress/regress-39309.js index e0ed487f59f4..2f0b77a53102 100644 --- a/js/src/tests/js1_5/Regress/regress-39309.js +++ b/js/src/tests/js1_5/Regress/regress-39309.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-39309.js'; var UBound = 0; var BUGNUMBER = 39309; var summary = 'Testing concatenation of string + number'; diff --git a/js/src/tests/js1_5/Regress/regress-396684.js b/js/src/tests/js1_5/Regress/regress-396684.js index d69f7f4c7702..6651bb05ff7a 100644 --- a/js/src/tests/js1_5/Regress/regress-396684.js +++ b/js/src/tests/js1_5/Regress/regress-396684.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-396684.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 396684; var summary = 'Function call with stack arena exhausted'; diff --git a/js/src/tests/js1_5/Regress/regress-398085-01.js b/js/src/tests/js1_5/Regress/regress-398085-01.js index e99221786b6b..535c30574705 100644 --- a/js/src/tests/js1_5/Regress/regress-398085-01.js +++ b/js/src/tests/js1_5/Regress/regress-398085-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-398085-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 398085; var summary = 'Do not crash with large switch statement'; diff --git a/js/src/tests/js1_5/Regress/regress-398085-02.js b/js/src/tests/js1_5/Regress/regress-398085-02.js index 72130721efd6..f8df84076d65 100644 --- a/js/src/tests/js1_5/Regress/regress-398085-02.js +++ b/js/src/tests/js1_5/Regress/regress-398085-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-398085-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 398085; var summary = 'Do not crash with large switch statement'; diff --git a/js/src/tests/js1_5/Regress/regress-398609.js b/js/src/tests/js1_5/Regress/regress-398609.js index 8e855b6da1ef..060c4a5543e6 100644 --- a/js/src/tests/js1_5/Regress/regress-398609.js +++ b/js/src/tests/js1_5/Regress/regress-398609.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-398609.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 398609; var summary = 'Test regression from bug 398609'; diff --git a/js/src/tests/js1_5/Regress/regress-404755.js b/js/src/tests/js1_5/Regress/regress-404755.js index b764aa9897a1..6ae1c5d1db61 100644 --- a/js/src/tests/js1_5/Regress/regress-404755.js +++ b/js/src/tests/js1_5/Regress/regress-404755.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-404755.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 404755; var summary = 'Do not consume heap when deleting property'; diff --git a/js/src/tests/js1_5/Regress/regress-406769.js b/js/src/tests/js1_5/Regress/regress-406769.js index e9500b23b6d6..2170949675a9 100644 --- a/js/src/tests/js1_5/Regress/regress-406769.js +++ b/js/src/tests/js1_5/Regress/regress-406769.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-406769.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 406769; var summary = 'Regression from bug 398609 caused infinite loop'; diff --git a/js/src/tests/js1_5/Regress/regress-407024.js b/js/src/tests/js1_5/Regress/regress-407024.js index 12c75c275fe4..62ce8fe2aad8 100644 --- a/js/src/tests/js1_5/Regress/regress-407024.js +++ b/js/src/tests/js1_5/Regress/regress-407024.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-407024.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 407024; var summary = 'Do not assert JSVAL_IS_NUMBER(pn3->pn_val) || JSVAL_IS_STRING(pn3->pn_val) || JSVAL_IS_BOOLEAN(pn3->pn_val)'; diff --git a/js/src/tests/js1_5/Regress/regress-407323.js b/js/src/tests/js1_5/Regress/regress-407323.js index b54ca4cb212c..39ca9168ccee 100644 --- a/js/src/tests/js1_5/Regress/regress-407323.js +++ b/js/src/tests/js1_5/Regress/regress-407323.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-407323.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 407323; var summary = 'XML, XMLList, QName are mutable, Namespace is not.'; diff --git a/js/src/tests/js1_5/Regress/regress-407957.js b/js/src/tests/js1_5/Regress/regress-407957.js index 2b021c013e3a..e2c090f4a8c2 100644 --- a/js/src/tests/js1_5/Regress/regress-407957.js +++ b/js/src/tests/js1_5/Regress/regress-407957.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-407957.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 407957; var summary = 'Iterator is mutable.'; diff --git a/js/src/tests/js1_5/Regress/regress-410852.js b/js/src/tests/js1_5/Regress/regress-410852.js index dcf426ff7564..085511d05226 100644 --- a/js/src/tests/js1_5/Regress/regress-410852.js +++ b/js/src/tests/js1_5/Regress/regress-410852.js @@ -5,7 +5,6 @@ * Contributor: Robert Sayre */ -var gTestfile = 'regress-410852.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 410852; var summary = 'Valgrind errors in jsemit.c'; diff --git a/js/src/tests/js1_5/Regress/regress-416628.js b/js/src/tests/js1_5/Regress/regress-416628.js index 89afa92ed435..400dd5e8324f 100644 --- a/js/src/tests/js1_5/Regress/regress-416628.js +++ b/js/src/tests/js1_5/Regress/regress-416628.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-416628.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 416628; var summary = 'O(n^2) blowup due to overlong cx->tempPool arena list'; diff --git a/js/src/tests/js1_5/Regress/regress-416737-01.js b/js/src/tests/js1_5/Regress/regress-416737-01.js index 1f5b726e34ea..296869decdee 100644 --- a/js/src/tests/js1_5/Regress/regress-416737-01.js +++ b/js/src/tests/js1_5/Regress/regress-416737-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-416737-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 416737; var summary = 'Do not assert: *pc == JSOP_GETARG'; diff --git a/js/src/tests/js1_5/Regress/regress-416737-02.js b/js/src/tests/js1_5/Regress/regress-416737-02.js index 1fd150208b18..2be85bea2dbe 100644 --- a/js/src/tests/js1_5/Regress/regress-416737-02.js +++ b/js/src/tests/js1_5/Regress/regress-416737-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-416737-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 416737; var summary = 'Do not assert: *pc == JSOP_GETARG'; diff --git a/js/src/tests/js1_5/Regress/regress-417893.js b/js/src/tests/js1_5/Regress/regress-417893.js index 93adf41f8503..97eb27d67e32 100644 --- a/js/src/tests/js1_5/Regress/regress-417893.js +++ b/js/src/tests/js1_5/Regress/regress-417893.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-417893.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 417893; var summary = 'Fast natives must use JS_THIS/JS_THIS_OBJECT'; diff --git a/js/src/tests/js1_5/Regress/regress-418504.js b/js/src/tests/js1_5/Regress/regress-418504.js index bc0874614ea1..574896d2159a 100644 --- a/js/src/tests/js1_5/Regress/regress-418504.js +++ b/js/src/tests/js1_5/Regress/regress-418504.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-418504.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 418504; var summary = 'Untagged boolean stored in a jsval in JS_ConvertValue'; diff --git a/js/src/tests/js1_5/Regress/regress-418540.js b/js/src/tests/js1_5/Regress/regress-418540.js index fed0eefedab0..b6707f3ccd70 100644 --- a/js/src/tests/js1_5/Regress/regress-418540.js +++ b/js/src/tests/js1_5/Regress/regress-418540.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-418540.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 418540; var summary = 'Do not assert: OBJ_IS_NATIVE(obj)'; diff --git a/js/src/tests/js1_5/Regress/regress-419018.js b/js/src/tests/js1_5/Regress/regress-419018.js index a28d7a1d28d3..ec7b200e6bdf 100644 --- a/js/src/tests/js1_5/Regress/regress-419018.js +++ b/js/src/tests/js1_5/Regress/regress-419018.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-419018.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 419018; var summary = 'UMR in JSENUMERATE_INIT'; diff --git a/js/src/tests/js1_5/Regress/regress-419803.js b/js/src/tests/js1_5/Regress/regress-419803.js index 1950120ee6f1..1c8c42af77fc 100644 --- a/js/src/tests/js1_5/Regress/regress-419803.js +++ b/js/src/tests/js1_5/Regress/regress-419803.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-419803.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 419803; var summary = 'Do not assert: sprop->parent == scope->lastProp'; diff --git a/js/src/tests/js1_5/Regress/regress-420919.js b/js/src/tests/js1_5/Regress/regress-420919.js index b77000e10019..72c44989c835 100644 --- a/js/src/tests/js1_5/Regress/regress-420919.js +++ b/js/src/tests/js1_5/Regress/regress-420919.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-420919.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 420919; var summary = 'this.u.v = 1 should report this.u is undefined'; diff --git a/js/src/tests/js1_5/Regress/regress-422348.js b/js/src/tests/js1_5/Regress/regress-422348.js index fe2b8b4a150a..28dd036f8111 100644 --- a/js/src/tests/js1_5/Regress/regress-422348.js +++ b/js/src/tests/js1_5/Regress/regress-422348.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-422348.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 422348; var summary = 'Proper overflow error reporting'; diff --git a/js/src/tests/js1_5/Regress/regress-424311.js b/js/src/tests/js1_5/Regress/regress-424311.js index dc5859139f66..41a241108fed 100644 --- a/js/src/tests/js1_5/Regress/regress-424311.js +++ b/js/src/tests/js1_5/Regress/regress-424311.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-424311.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 424311; var summary = 'Do not assert: entry->kpc == ((PCVCAP_TAG(entry->vcap) > 1) ? (jsbytecode *) JSID_TO_ATOM(id) : cx->fp->regs->pc)'; diff --git a/js/src/tests/js1_5/Regress/regress-425360.js b/js/src/tests/js1_5/Regress/regress-425360.js index 6f639f66abf7..1461c4aa3208 100644 --- a/js/src/tests/js1_5/Regress/regress-425360.js +++ b/js/src/tests/js1_5/Regress/regress-425360.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-425360.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 425360; var summary = 'Do not assert: !cx->throwing'; diff --git a/js/src/tests/js1_5/Regress/regress-426827.js b/js/src/tests/js1_5/Regress/regress-426827.js index 7e0483963bfa..80f9e1f0abe7 100644 --- a/js/src/tests/js1_5/Regress/regress-426827.js +++ b/js/src/tests/js1_5/Regress/regress-426827.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-426827.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 426827; var summary = 'Do not assert: !(js_CodeSpec[op2].format & JOF_DEL)'; diff --git a/js/src/tests/js1_5/Regress/regress-428366.js b/js/src/tests/js1_5/Regress/regress-428366.js index a00a249b916e..ce6fcbc79a9f 100644 --- a/js/src/tests/js1_5/Regress/regress-428366.js +++ b/js/src/tests/js1_5/Regress/regress-428366.js @@ -5,7 +5,6 @@ * Contributor: Blake Kaplan */ -var gTestfile = 'regress-428366.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 428366; var summary = 'Do not assert deleting eval 16 times'; diff --git a/js/src/tests/js1_5/Regress/regress-438415-01.js b/js/src/tests/js1_5/Regress/regress-438415-01.js index 7a2c89e44701..479f27cad4bd 100644 --- a/js/src/tests/js1_5/Regress/regress-438415-01.js +++ b/js/src/tests/js1_5/Regress/regress-438415-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-438415-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 438415; var summary = 'Do not assert: *vp != JSVAL_HOLE'; diff --git a/js/src/tests/js1_5/Regress/regress-438415-02.js b/js/src/tests/js1_5/Regress/regress-438415-02.js index 6313303f1968..1f9451867980 100644 --- a/js/src/tests/js1_5/Regress/regress-438415-02.js +++ b/js/src/tests/js1_5/Regress/regress-438415-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-438415-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 438415; var summary = 'Do not assert: *vp != JSVAL_HOLE'; diff --git a/js/src/tests/js1_5/Regress/regress-440926.js b/js/src/tests/js1_5/Regress/regress-440926.js index d921a4701a18..5b5a65888e37 100644 --- a/js/src/tests/js1_5/Regress/regress-440926.js +++ b/js/src/tests/js1_5/Regress/regress-440926.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-440926.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 440926; var summary = 'Correctly match regexps with special "i" characters'; diff --git a/js/src/tests/js1_5/Regress/regress-449627.js b/js/src/tests/js1_5/Regress/regress-449627.js index 2fecf920d43c..fb31c63318bd 100644 --- a/js/src/tests/js1_5/Regress/regress-449627.js +++ b/js/src/tests/js1_5/Regress/regress-449627.js @@ -5,7 +5,6 @@ * Contributor: Robert Sayre */ -var gTestfile = 'regress-449627.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 449627; var summary = 'Crash with JIT in js_FillPropertyCache'; diff --git a/js/src/tests/js1_5/Regress/regress-449666.js b/js/src/tests/js1_5/Regress/regress-449666.js index 1c663b356d58..14df0565532d 100644 --- a/js/src/tests/js1_5/Regress/regress-449666.js +++ b/js/src/tests/js1_5/Regress/regress-449666.js @@ -5,7 +5,6 @@ * Contributor: Robert Sayre */ -var gTestfile = 'regress-449666.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 449666; var summary = 'Do not assert: JSSTRING_IS_FLAT(str_)'; diff --git a/js/src/tests/js1_5/Regress/regress-450369.js b/js/src/tests/js1_5/Regress/regress-450369.js index 6952fe179df6..ca7c7be29af5 100644 --- a/js/src/tests/js1_5/Regress/regress-450369.js +++ b/js/src/tests/js1_5/Regress/regress-450369.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-450369.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 450369; var summary = 'Crash with JIT and json2.js'; diff --git a/js/src/tests/js1_5/Regress/regress-450833.js b/js/src/tests/js1_5/Regress/regress-450833.js index 5867120e85b6..4e8c69f24b27 100644 --- a/js/src/tests/js1_5/Regress/regress-450833.js +++ b/js/src/tests/js1_5/Regress/regress-450833.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-450833.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 450833; var summary = 'TM: Multiple trees per entry point'; diff --git a/js/src/tests/js1_5/Regress/regress-451322.js b/js/src/tests/js1_5/Regress/regress-451322.js index 3bf19517b17b..f87ca6d71455 100755 --- a/js/src/tests/js1_5/Regress/regress-451322.js +++ b/js/src/tests/js1_5/Regress/regress-451322.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-451322.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 451322; var summary = 'Do not crash with OOM in LirBufWriter'; diff --git a/js/src/tests/js1_5/Regress/regress-451884.js b/js/src/tests/js1_5/Regress/regress-451884.js index 558f43898e04..c3ed47611ce3 100644 --- a/js/src/tests/js1_5/Regress/regress-451884.js +++ b/js/src/tests/js1_5/Regress/regress-451884.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-451884.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 451884; var summary = 'Do not crash [@ QuoteString]'; diff --git a/js/src/tests/js1_5/Regress/regress-451946.js b/js/src/tests/js1_5/Regress/regress-451946.js index 83af2af6642f..61cfec142c3e 100644 --- a/js/src/tests/js1_5/Regress/regress-451946.js +++ b/js/src/tests/js1_5/Regress/regress-451946.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-451946.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 451946; var summary = 'Do not crash with SELinux execheap protection'; diff --git a/js/src/tests/js1_5/Regress/regress-452008.js b/js/src/tests/js1_5/Regress/regress-452008.js index a0ac0165fb1a..7d394614e8cd 100644 --- a/js/src/tests/js1_5/Regress/regress-452008.js +++ b/js/src/tests/js1_5/Regress/regress-452008.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-452008.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 452008; var summary = 'Bad math with JIT'; diff --git a/js/src/tests/js1_5/Regress/regress-452170.js b/js/src/tests/js1_5/Regress/regress-452170.js index 37253fa0aa08..5033467152c7 100644 --- a/js/src/tests/js1_5/Regress/regress-452170.js +++ b/js/src/tests/js1_5/Regress/regress-452170.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-452170.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 452170; var summary = 'Do not assert with JIT: (*m != JSVAL_INT) || isInt32(*vp)'; diff --git a/js/src/tests/js1_5/Regress/regress-452189.js b/js/src/tests/js1_5/Regress/regress-452189.js index 1305b6e6baf6..bdec0c5068f9 100644 --- a/js/src/tests/js1_5/Regress/regress-452189.js +++ b/js/src/tests/js1_5/Regress/regress-452189.js @@ -5,7 +5,6 @@ * Contributor: Geoff Garen */ -var gTestfile = 'regress-452189.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 452189; var summary = "Don't shadow a readonly or setter proto-property"; diff --git a/js/src/tests/js1_5/Regress/regress-452333.js b/js/src/tests/js1_5/Regress/regress-452333.js index 891bd20f1420..581796cc1d25 100644 --- a/js/src/tests/js1_5/Regress/regress-452333.js +++ b/js/src/tests/js1_5/Regress/regress-452333.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-452333.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 452333; var summary = 'Do not crash with JIT: @ js_SkipWhiteSpace'; diff --git a/js/src/tests/js1_5/Regress/regress-452336.js b/js/src/tests/js1_5/Regress/regress-452336.js index 1081c2df7a94..c29a93d503ff 100644 --- a/js/src/tests/js1_5/Regress/regress-452336.js +++ b/js/src/tests/js1_5/Regress/regress-452336.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-452336.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 452336; var summary = 'Do not assert with JIT: (slot) < (uint32)(obj)->dslots[-1]'; diff --git a/js/src/tests/js1_5/Regress/regress-452346.js b/js/src/tests/js1_5/Regress/regress-452346.js index cd15ab64fc08..49c53fdfa108 100644 --- a/js/src/tests/js1_5/Regress/regress-452346.js +++ b/js/src/tests/js1_5/Regress/regress-452346.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-452346.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 452346; var summary = 'Do not crash: @ Balloc'; diff --git a/js/src/tests/js1_5/Regress/regress-452495.js b/js/src/tests/js1_5/Regress/regress-452495.js index d6315c1c7e6d..b535753c29bb 100644 --- a/js/src/tests/js1_5/Regress/regress-452495.js +++ b/js/src/tests/js1_5/Regress/regress-452495.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-452495.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 452495; var summary = 'Do not crash with JIT: @ TraceRecorder::getThis'; diff --git a/js/src/tests/js1_5/Regress/regress-452573-01.js b/js/src/tests/js1_5/Regress/regress-452573-01.js index c6958e1374a8..dbec58c93e1c 100644 --- a/js/src/tests/js1_5/Regress/regress-452573-01.js +++ b/js/src/tests/js1_5/Regress/regress-452573-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-452573-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 452573; var summary = 'Do not assert with JIT: JSVAL_IS_VOID(boxed) || JSVAL_IS_BOOLEAN(boxed)'; diff --git a/js/src/tests/js1_5/Regress/regress-452573-02.js b/js/src/tests/js1_5/Regress/regress-452573-02.js index 228301c6bd59..1d9c2355be08 100644 --- a/js/src/tests/js1_5/Regress/regress-452573-02.js +++ b/js/src/tests/js1_5/Regress/regress-452573-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-452573-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 452573; var summary = 'Do not assert with JIT: "(((rmask(rr) & FpRegs) != 0))"'; diff --git a/js/src/tests/js1_5/Regress/regress-452713.js b/js/src/tests/js1_5/Regress/regress-452713.js index 8af9266ca0ee..fd2bbf8c7e02 100644 --- a/js/src/tests/js1_5/Regress/regress-452713.js +++ b/js/src/tests/js1_5/Regress/regress-452713.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-452713.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 452713; var summary = 'Do not assert with JIT: "Should not move data from GPR to XMM": false'; diff --git a/js/src/tests/js1_5/Regress/regress-452724-01.js b/js/src/tests/js1_5/Regress/regress-452724-01.js index 9b5e900cab9c..3383abe88b51 100644 --- a/js/src/tests/js1_5/Regress/regress-452724-01.js +++ b/js/src/tests/js1_5/Regress/regress-452724-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-452724-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 452724; var summary = 'Do not assert with JIT: (rmask(rr) & FpRegs) != 0'; diff --git a/js/src/tests/js1_5/Regress/regress-452724-02.js b/js/src/tests/js1_5/Regress/regress-452724-02.js index 1a4289efc603..e0b833776555 100644 --- a/js/src/tests/js1_5/Regress/regress-452724-02.js +++ b/js/src/tests/js1_5/Regress/regress-452724-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-452724-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 452724; var summary = 'Do not crash with JIT: @TraceRecorder::getThis'; diff --git a/js/src/tests/js1_5/Regress/regress-452742-01.js b/js/src/tests/js1_5/Regress/regress-452742-01.js index bcea682d7349..790edc805207 100644 --- a/js/src/tests/js1_5/Regress/regress-452742-01.js +++ b/js/src/tests/js1_5/Regress/regress-452742-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-452742-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 452742; var summary = 'Do not do overzealous eval inside function optimization in BindNameToSlot'; diff --git a/js/src/tests/js1_5/Regress/regress-452742-02.js b/js/src/tests/js1_5/Regress/regress-452742-02.js index 2c888ce9bf6b..caf891cc7d85 100644 --- a/js/src/tests/js1_5/Regress/regress-452742-02.js +++ b/js/src/tests/js1_5/Regress/regress-452742-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-452742-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 452742; var summary = 'Do not do overzealous eval inside function optimization in BindNameToSlot'; diff --git a/js/src/tests/js1_5/Regress/regress-452853.js b/js/src/tests/js1_5/Regress/regress-452853.js index 5fca3cb6da3f..73f08a3b8db7 100644 --- a/js/src/tests/js1_5/Regress/regress-452853.js +++ b/js/src/tests/js1_5/Regress/regress-452853.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-452853.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 452853; var summary = 'Do not crash in simple loop with array'; diff --git a/js/src/tests/js1_5/Regress/regress-452884-01.js b/js/src/tests/js1_5/Regress/regress-452884-01.js index 66edb5e35d7f..44183d982782 100644 --- a/js/src/tests/js1_5/Regress/regress-452884-01.js +++ b/js/src/tests/js1_5/Regress/regress-452884-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-452884-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 452884; var summary = 'Do not crash in switch'; diff --git a/js/src/tests/js1_5/Regress/regress-452884-02.js b/js/src/tests/js1_5/Regress/regress-452884-02.js index 0e92ef7111fd..0d9057f702d9 100644 --- a/js/src/tests/js1_5/Regress/regress-452884-02.js +++ b/js/src/tests/js1_5/Regress/regress-452884-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-452884-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 452884; var summary = 'Do not crash in switch'; diff --git a/js/src/tests/js1_5/Regress/regress-453024.js b/js/src/tests/js1_5/Regress/regress-453024.js index 6f11e9f719a1..cbcbdeace940 100644 --- a/js/src/tests/js1_5/Regress/regress-453024.js +++ b/js/src/tests/js1_5/Regress/regress-453024.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-453024.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 453024; var summary = 'Do not assert: vp + 2 + argc <= (jsval *) cx->stackPool.current->avail'; diff --git a/js/src/tests/js1_5/Regress/regress-453173.js b/js/src/tests/js1_5/Regress/regress-453173.js index 1c653bfe72f8..bd6b8947357f 100644 --- a/js/src/tests/js1_5/Regress/regress-453173.js +++ b/js/src/tests/js1_5/Regress/regress-453173.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-453173.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 453173; var summary = 'Do not Crash with JIT [@ TraceRecorder::record_JSOP_ENDINIT] with "[,]"'; diff --git a/js/src/tests/js1_5/Regress/regress-453397.js b/js/src/tests/js1_5/Regress/regress-453397.js index 9c1dec1c0d8e..e28fdd82d27a 100644 --- a/js/src/tests/js1_5/Regress/regress-453397.js +++ b/js/src/tests/js1_5/Regress/regress-453397.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-453397.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 453397; var summary = 'Do not assert with JIT: script->main <= target && target < script->code + script->length'; diff --git a/js/src/tests/js1_5/Regress/regress-453701.js b/js/src/tests/js1_5/Regress/regress-453701.js index b295f9f3d0d0..8ab4128ffcb3 100644 --- a/js/src/tests/js1_5/Regress/regress-453701.js +++ b/js/src/tests/js1_5/Regress/regress-453701.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-453701.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 453701; var summary = 'Do not assert with JIT: (rmask(rr) & FpRegs) != 0'; diff --git a/js/src/tests/js1_5/Regress/regress-453747.js b/js/src/tests/js1_5/Regress/regress-453747.js index 4846240025b4..4fe81ad85f43 100644 --- a/js/src/tests/js1_5/Regress/regress-453747.js +++ b/js/src/tests/js1_5/Regress/regress-453747.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-453747.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 453747; var summary = 'Do not assert with JIT: JSVAL_IS_VOID(boxed) || JSVAL_IS_BOOLEAN(boxed)'; diff --git a/js/src/tests/js1_5/Regress/regress-454682.js b/js/src/tests/js1_5/Regress/regress-454682.js index 122bba56c008..8a135b25bf60 100644 --- a/js/src/tests/js1_5/Regress/regress-454682.js +++ b/js/src/tests/js1_5/Regress/regress-454682.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-454682.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 454682; var summary = 'Do not crash with JIT in MatchRegExp'; diff --git a/js/src/tests/js1_5/Regress/regress-454981.js b/js/src/tests/js1_5/Regress/regress-454981.js index 1ad23392a0ca..5c12fee55bbe 100644 --- a/js/src/tests/js1_5/Regress/regress-454981.js +++ b/js/src/tests/js1_5/Regress/regress-454981.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-454981.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 454981; var summary = 'Do not assert with JIT: size_t(p - cx->fp->slots) < cx->fp->script->nslots'; diff --git a/js/src/tests/js1_5/Regress/regress-455605.js b/js/src/tests/js1_5/Regress/regress-455605.js index 87ec658ec3e5..60176a82ea2b 100644 --- a/js/src/tests/js1_5/Regress/regress-455605.js +++ b/js/src/tests/js1_5/Regress/regress-455605.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-455605.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 455605; var summary = 'Do not assert with JIT: "need a way to EOT now, since this is trace end": 0'; diff --git a/js/src/tests/js1_5/Regress/regress-455748.js b/js/src/tests/js1_5/Regress/regress-455748.js index 7119de381d1e..03c21e783a6f 100644 --- a/js/src/tests/js1_5/Regress/regress-455748.js +++ b/js/src/tests/js1_5/Regress/regress-455748.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-455748.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 455748; var summary = 'Do not assert with JIT: Should not move data from GPR to XMM'; diff --git a/js/src/tests/js1_5/Regress/regress-455758-01.js b/js/src/tests/js1_5/Regress/regress-455758-01.js index feb0e07dcd13..b7d55757da9a 100644 --- a/js/src/tests/js1_5/Regress/regress-455758-01.js +++ b/js/src/tests/js1_5/Regress/regress-455758-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-455758-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 455758; var summary = 'Do not assert: (m != JSVAL_INT) || isInt32(*vp)'; diff --git a/js/src/tests/js1_5/Regress/regress-455758-02.js b/js/src/tests/js1_5/Regress/regress-455758-02.js index f44a4bc8bd46..2f3b0f8b4821 100644 --- a/js/src/tests/js1_5/Regress/regress-455758-02.js +++ b/js/src/tests/js1_5/Regress/regress-455758-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-455758-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 455758; var summary = 'Do not crash: divide by zero'; diff --git a/js/src/tests/js1_5/Regress/regress-455775.js b/js/src/tests/js1_5/Regress/regress-455775.js index 9118e5a7d9de..feec23a75732 100644 --- a/js/src/tests/js1_5/Regress/regress-455775.js +++ b/js/src/tests/js1_5/Regress/regress-455775.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-455775.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 455775; var summary = 'Do not assert: cx->fp->flags & JSFRAME_EVAL'; diff --git a/js/src/tests/js1_5/Regress/regress-456470.js b/js/src/tests/js1_5/Regress/regress-456470.js index 08b682e0c3c0..e3b7d7dce516 100644 --- a/js/src/tests/js1_5/Regress/regress-456470.js +++ b/js/src/tests/js1_5/Regress/regress-456470.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-456470.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 456470; var summary = 'TM: Make sure JSOP_DEFLOCALFUN pushes the right function object.'; diff --git a/js/src/tests/js1_5/Regress/regress-456477-01.js b/js/src/tests/js1_5/Regress/regress-456477-01.js index d88d5b8f0d0c..ebde6b88b559 100644 --- a/js/src/tests/js1_5/Regress/regress-456477-01.js +++ b/js/src/tests/js1_5/Regress/regress-456477-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-456477-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 456477; var summary = 'Do not assert with JIT: (m != JSVAL_INT) || isInt32(*vp)" with (0/0)%(-1)'; diff --git a/js/src/tests/js1_5/Regress/regress-456477-02.js b/js/src/tests/js1_5/Regress/regress-456477-02.js index e16b53f34619..fd42b1a84f94 100644 --- a/js/src/tests/js1_5/Regress/regress-456477-02.js +++ b/js/src/tests/js1_5/Regress/regress-456477-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-456477-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 456477; var summary = 'Do not assert with JIT: (m != JSVAL_INT) || isInt32(*vp)" with (0/0)%(-1)'; diff --git a/js/src/tests/js1_5/Regress/regress-456494.js b/js/src/tests/js1_5/Regress/regress-456494.js index f91bec5e9d0c..f75367120f4f 100644 --- a/js/src/tests/js1_5/Regress/regress-456494.js +++ b/js/src/tests/js1_5/Regress/regress-456494.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-456494.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 456494; var summary = 'Do not crash with apply and argc > nargs'; diff --git a/js/src/tests/js1_5/Regress/regress-456540-01.js b/js/src/tests/js1_5/Regress/regress-456540-01.js index 342a31e705cd..b7095d75c8ee 100644 --- a/js/src/tests/js1_5/Regress/regress-456540-01.js +++ b/js/src/tests/js1_5/Regress/regress-456540-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-456540-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 456540; var summary = 'Do not assert with JIT: (m != JSVAL_INT) || isInt32(*vp)" with ((-1) % ""'; diff --git a/js/src/tests/js1_5/Regress/regress-456540-02.js b/js/src/tests/js1_5/Regress/regress-456540-02.js index 8f68d9afccc8..a08cf040204b 100644 --- a/js/src/tests/js1_5/Regress/regress-456540-02.js +++ b/js/src/tests/js1_5/Regress/regress-456540-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-456540-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 456540; var summary = 'Do not assert with JIT: (m != JSVAL_INT) || isInt32(*vp)" with ((-1) % ""'; diff --git a/js/src/tests/js1_5/Regress/regress-457065-03.js b/js/src/tests/js1_5/Regress/regress-457065-03.js index 6eb7041bb6ab..6ad0ead1649d 100644 --- a/js/src/tests/js1_5/Regress/regress-457065-03.js +++ b/js/src/tests/js1_5/Regress/regress-457065-03.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-457065-03.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 457065; var summary = 'Do not assert: !fp->callee || fp->thisp == JSVAL_TO_OBJECT(fp->argv[-1])'; diff --git a/js/src/tests/js1_5/Regress/regress-457456.js b/js/src/tests/js1_5/Regress/regress-457456.js index 402970598904..b8951913abf2 100644 --- a/js/src/tests/js1_5/Regress/regress-457456.js +++ b/js/src/tests/js1_5/Regress/regress-457456.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-457456.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 457456; var summary = 'Do not assert with JIT: cond->isCond()'; diff --git a/js/src/tests/js1_5/Regress/regress-457778.js b/js/src/tests/js1_5/Regress/regress-457778.js index b252f6405cde..874cc7b3c997 100644 --- a/js/src/tests/js1_5/Regress/regress-457778.js +++ b/js/src/tests/js1_5/Regress/regress-457778.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-457778.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 457778; var summary = 'Do not assert with JIT: cond->isCond()'; diff --git a/js/src/tests/js1_5/Regress/regress-458851.js b/js/src/tests/js1_5/Regress/regress-458851.js index 42cfb386ef20..536618b1e459 100644 --- a/js/src/tests/js1_5/Regress/regress-458851.js +++ b/js/src/tests/js1_5/Regress/regress-458851.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-458851.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 458851; var summary = 'TM: for-in loops should not skip every other value sometimes'; diff --git a/js/src/tests/js1_5/Regress/regress-459085.js b/js/src/tests/js1_5/Regress/regress-459085.js index 2b23f0973c45..b6d9060ccbb6 100644 --- a/js/src/tests/js1_5/Regress/regress-459085.js +++ b/js/src/tests/js1_5/Regress/regress-459085.js @@ -5,7 +5,6 @@ * Contributor: Jason Orendorff */ -var gTestfile = 'regress-459085.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 459085; var summary = 'Do not assert with JIT: Should not move data from GPR to XMM'; diff --git a/js/src/tests/js1_5/Regress/regress-459628.js b/js/src/tests/js1_5/Regress/regress-459628.js index ce6c78eb7bd5..4c7c7a824330 100644 --- a/js/src/tests/js1_5/Regress/regress-459628.js +++ b/js/src/tests/js1_5/Regress/regress-459628.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-459628.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 459628; var summary = 'Do not assert: JSVAL_IS_VOID(STOBJ_GET_SLOT(obj, map->freeslot))'; diff --git a/js/src/tests/js1_5/Regress/regress-459990.js b/js/src/tests/js1_5/Regress/regress-459990.js index 4aec1df59d09..99db9eac81db 100644 --- a/js/src/tests/js1_5/Regress/regress-459990.js +++ b/js/src/tests/js1_5/Regress/regress-459990.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-459990.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 459990; var summary = 'Do not crash with if (true && a && b) { }'; diff --git a/js/src/tests/js1_5/Regress/regress-460024.js b/js/src/tests/js1_5/Regress/regress-460024.js index b192a8ab9b1d..f6bef58c87b1 100644 --- a/js/src/tests/js1_5/Regress/regress-460024.js +++ b/js/src/tests/js1_5/Regress/regress-460024.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-460024.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 460024; var summary = 'Regression from bug 451154'; diff --git a/js/src/tests/js1_5/Regress/regress-460117.js b/js/src/tests/js1_5/Regress/regress-460117.js index f806a73c2527..7cc79721e258 100644 --- a/js/src/tests/js1_5/Regress/regress-460117.js +++ b/js/src/tests/js1_5/Regress/regress-460117.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-460117.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 460117; var summary = 'TM: hasOwnProperty with JIT'; diff --git a/js/src/tests/js1_5/Regress/regress-460886-01.js b/js/src/tests/js1_5/Regress/regress-460886-01.js index ce0614f9e80b..8d6e263eccf1 100755 --- a/js/src/tests/js1_5/Regress/regress-460886-01.js +++ b/js/src/tests/js1_5/Regress/regress-460886-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-460886-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 460886; var summary = 'Do not asssert: end >= begin'; diff --git a/js/src/tests/js1_5/Regress/regress-460886-02.js b/js/src/tests/js1_5/Regress/regress-460886-02.js index 249d079dba3d..67d036ca18c7 100755 --- a/js/src/tests/js1_5/Regress/regress-460886-02.js +++ b/js/src/tests/js1_5/Regress/regress-460886-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-460886-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 460886; var summary = 'Do not crash @ js_NewStringCopy'; diff --git a/js/src/tests/js1_5/Regress/regress-461307.js b/js/src/tests/js1_5/Regress/regress-461307.js index c6d36abe6642..819fc6ac8b67 100644 --- a/js/src/tests/js1_5/Regress/regress-461307.js +++ b/js/src/tests/js1_5/Regress/regress-461307.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-461307.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 461307; var summary = 'Do not crash @ QuoteString'; diff --git a/js/src/tests/js1_5/Regress/regress-461723.js b/js/src/tests/js1_5/Regress/regress-461723.js index 2abc09f673d7..c824bc3fbff9 100644 --- a/js/src/tests/js1_5/Regress/regress-461723.js +++ b/js/src/tests/js1_5/Regress/regress-461723.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-461723.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 461723; var summary = 'Do not assert: (m != JSVAL_INT) || isInt32(*vp)'; diff --git a/js/src/tests/js1_5/Regress/regress-462292.js b/js/src/tests/js1_5/Regress/regress-462292.js index f2cb38e9e30c..cd9df9757c03 100644 --- a/js/src/tests/js1_5/Regress/regress-462292.js +++ b/js/src/tests/js1_5/Regress/regress-462292.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-462292.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 462292; var summary = 'Do not assert: pn->pn_op == JSOP_CALL || pn->pn_op == JSOP_EVAL'; diff --git a/js/src/tests/js1_5/Regress/regress-462879.js b/js/src/tests/js1_5/Regress/regress-462879.js index d12dbdcf6988..da848f9f4558 100644 --- a/js/src/tests/js1_5/Regress/regress-462879.js +++ b/js/src/tests/js1_5/Regress/regress-462879.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-462879.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 462879; var summary = 'Do not assert: UPVAR_FRAME_SKIP(uva->vector[i]) == 1'; diff --git a/js/src/tests/js1_5/Regress/regress-462989.js b/js/src/tests/js1_5/Regress/regress-462989.js index 2ce528608641..6d1f2b4bf4e7 100644 --- a/js/src/tests/js1_5/Regress/regress-462989.js +++ b/js/src/tests/js1_5/Regress/regress-462989.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-462989.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 462989; var summary = 'Do not assert: need a way to EOT now, since this is trace end'; diff --git a/js/src/tests/js1_5/Regress/regress-463259.js b/js/src/tests/js1_5/Regress/regress-463259.js index 971b8684e793..d6f914bd01a7 100644 --- a/js/src/tests/js1_5/Regress/regress-463259.js +++ b/js/src/tests/js1_5/Regress/regress-463259.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-463259.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 463259; var summary = 'Do not assert: VALUE_IS_FUNCTION(cx, fval)'; diff --git a/js/src/tests/js1_5/Regress/regress-463782.js b/js/src/tests/js1_5/Regress/regress-463782.js index 0a2aa7071c66..e79aa563e4de 100644 --- a/js/src/tests/js1_5/Regress/regress-463782.js +++ b/js/src/tests/js1_5/Regress/regress-463782.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-463782.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 463782; var summary = 'Do not assert: "need a way to EOT now, since this is trace end": 0'; diff --git a/js/src/tests/js1_5/Regress/regress-464334.js b/js/src/tests/js1_5/Regress/regress-464334.js index b73b62dcd5da..06b611411857 100644 --- a/js/src/tests/js1_5/Regress/regress-464334.js +++ b/js/src/tests/js1_5/Regress/regress-464334.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-464334.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 464334; var summary = 'Do not assert: (size_t) (fp->regs->sp - fp->slots) <= fp->script->nslots'; diff --git a/js/src/tests/js1_5/Regress/regress-464862.js b/js/src/tests/js1_5/Regress/regress-464862.js index a7b19f59bd36..7547c83ca492 100644 --- a/js/src/tests/js1_5/Regress/regress-464862.js +++ b/js/src/tests/js1_5/Regress/regress-464862.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-464862.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 464862; var summary = 'Do not assert: ( int32_t(delta) == uint8_t(delta) )'; diff --git a/js/src/tests/js1_5/Regress/regress-465013.js b/js/src/tests/js1_5/Regress/regress-465013.js index aee4ffa7fae9..f26168b319ba 100644 --- a/js/src/tests/js1_5/Regress/regress-465013.js +++ b/js/src/tests/js1_5/Regress/regress-465013.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-465013.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 465013; var summary = ''; diff --git a/js/src/tests/js1_5/Regress/regress-465132.js b/js/src/tests/js1_5/Regress/regress-465132.js index 778812657b55..2aab7f3f297c 100644 --- a/js/src/tests/js1_5/Regress/regress-465132.js +++ b/js/src/tests/js1_5/Regress/regress-465132.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-465132.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 465132; var summary = 'TM: Mathematical constants should be constant'; diff --git a/js/src/tests/js1_5/Regress/regress-465133.js b/js/src/tests/js1_5/Regress/regress-465133.js index f7c5d133a619..d0b67eb67a1b 100644 --- a/js/src/tests/js1_5/Regress/regress-465133.js +++ b/js/src/tests/js1_5/Regress/regress-465133.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-465133.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 465133; var summary = '{} < {}'; diff --git a/js/src/tests/js1_5/Regress/regress-465135.js b/js/src/tests/js1_5/Regress/regress-465135.js index 93cc3ec114e0..3965c8403414 100644 --- a/js/src/tests/js1_5/Regress/regress-465135.js +++ b/js/src/tests/js1_5/Regress/regress-465135.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-465135.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 465135; var summary = 'true << true'; diff --git a/js/src/tests/js1_5/Regress/regress-465136.js b/js/src/tests/js1_5/Regress/regress-465136.js index 4b3cab6a6de5..4f25f7b6ea79 100644 --- a/js/src/tests/js1_5/Regress/regress-465136.js +++ b/js/src/tests/js1_5/Regress/regress-465136.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-465136.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 465136; var summary = 'false == ""'; diff --git a/js/src/tests/js1_5/Regress/regress-465137.js b/js/src/tests/js1_5/Regress/regress-465137.js index 271c6616b179..0b2b6a60f174 100644 --- a/js/src/tests/js1_5/Regress/regress-465137.js +++ b/js/src/tests/js1_5/Regress/regress-465137.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-465137.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 465137; var summary = '!NaN is not false'; diff --git a/js/src/tests/js1_5/Regress/regress-465262.js b/js/src/tests/js1_5/Regress/regress-465262.js index b8aebaf3f141..9a3158f469ef 100644 --- a/js/src/tests/js1_5/Regress/regress-465262.js +++ b/js/src/tests/js1_5/Regress/regress-465262.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-465262.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 465262; var summary = 'truthiness of (3 > null)'; diff --git a/js/src/tests/js1_5/Regress/regress-465272.js b/js/src/tests/js1_5/Regress/regress-465272.js index 61884b1fa21e..8b49a080f2c2 100644 --- a/js/src/tests/js1_5/Regress/regress-465272.js +++ b/js/src/tests/js1_5/Regress/regress-465272.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-465272.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 465272; var summary = 'subtraction'; diff --git a/js/src/tests/js1_5/Regress/regress-465347.js b/js/src/tests/js1_5/Regress/regress-465347.js index 7d6c92376680..2dfbf39276f5 100644 --- a/js/src/tests/js1_5/Regress/regress-465347.js +++ b/js/src/tests/js1_5/Regress/regress-465347.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-465347.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 465347; var summary = 'Test integer to id in js_Int32ToId'; diff --git a/js/src/tests/js1_5/Regress/regress-465366.js b/js/src/tests/js1_5/Regress/regress-465366.js index aab502daf661..d2f5c96887e6 100644 --- a/js/src/tests/js1_5/Regress/regress-465366.js +++ b/js/src/tests/js1_5/Regress/regress-465366.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-465366.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 465366; var summary = 'TM: JIT: error with multiplicative loop'; diff --git a/js/src/tests/js1_5/Regress/regress-466262.js b/js/src/tests/js1_5/Regress/regress-466262.js index 3f43c14830b6..9cb44f905533 100644 --- a/js/src/tests/js1_5/Regress/regress-466262.js +++ b/js/src/tests/js1_5/Regress/regress-466262.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-466262.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 466262; var summary = 'Do not assert: f == f->root'; diff --git a/js/src/tests/js1_5/Regress/regress-466747.js b/js/src/tests/js1_5/Regress/regress-466747.js index 9a18bbf51249..758f1c790977 100644 --- a/js/src/tests/js1_5/Regress/regress-466747.js +++ b/js/src/tests/js1_5/Regress/regress-466747.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-466747.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 466747; var summary = 'TM: Do not assert: fp->slots + fp->script->nfixed + ' + diff --git a/js/src/tests/js1_5/Regress/regress-469044.js b/js/src/tests/js1_5/Regress/regress-469044.js index 38d847b2e05f..ae0e7195e14a 100644 --- a/js/src/tests/js1_5/Regress/regress-469044.js +++ b/js/src/tests/js1_5/Regress/regress-469044.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-469044.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 469044; var summary = 'type unstable globals'; diff --git a/js/src/tests/js1_5/Regress/regress-470061.js b/js/src/tests/js1_5/Regress/regress-470061.js index 63dbd7dd9d0d..522a67708304 100644 --- a/js/src/tests/js1_5/Regress/regress-470061.js +++ b/js/src/tests/js1_5/Regress/regress-470061.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-470061.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 470061; var summary = 'TM: Do not assert: cx->fp->regs->pc == f->ip && f->root == f'; diff --git a/js/src/tests/js1_5/Regress/regress-470187-01.js b/js/src/tests/js1_5/Regress/regress-470187-01.js index 46d2afb8adcd..1bdbb90f6307 100644 --- a/js/src/tests/js1_5/Regress/regress-470187-01.js +++ b/js/src/tests/js1_5/Regress/regress-470187-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-470187-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 470187; var summary = 'Do not assert: entry->kpc == (jsbytecode*) atoms[index]'; diff --git a/js/src/tests/js1_5/Regress/regress-470187-02.js b/js/src/tests/js1_5/Regress/regress-470187-02.js index 8469a27d62ed..354580b95647 100644 --- a/js/src/tests/js1_5/Regress/regress-470187-02.js +++ b/js/src/tests/js1_5/Regress/regress-470187-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-470187-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 470187; var summary = 'Do not assert: ATOM_IS_STRING(atom)'; diff --git a/js/src/tests/js1_5/Regress/regress-470758-01.js b/js/src/tests/js1_5/Regress/regress-470758-01.js index 21833f5f04a2..c179f9fbe152 100644 --- a/js/src/tests/js1_5/Regress/regress-470758-01.js +++ b/js/src/tests/js1_5/Regress/regress-470758-01.js @@ -5,7 +5,6 @@ * Contributor: Blake Kaplan */ -var gTestfile = 'regress-470758-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 470758; var summary = 'Do not crash with eval upvars'; diff --git a/js/src/tests/js1_5/Regress/regress-470758-02.js b/js/src/tests/js1_5/Regress/regress-470758-02.js index 8c0e15363520..0fa2edae888c 100644 --- a/js/src/tests/js1_5/Regress/regress-470758-02.js +++ b/js/src/tests/js1_5/Regress/regress-470758-02.js @@ -5,7 +5,6 @@ * Contributor: Blake Kaplan */ -var gTestfile = 'regress-470758-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 470758; var summary = 'Promote evald initializer into upvar'; diff --git a/js/src/tests/js1_5/Regress/regress-472533.js b/js/src/tests/js1_5/Regress/regress-472533.js index 2296922be89e..0d7aaa4dd53c 100755 --- a/js/src/tests/js1_5/Regress/regress-472533.js +++ b/js/src/tests/js1_5/Regress/regress-472533.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-472533.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 472533; var summary = 'Do not crash with loop, replace, regexp'; diff --git a/js/src/tests/js1_5/Regress/regress-475645-01.js b/js/src/tests/js1_5/Regress/regress-475645-01.js index db3a3c998867..40d61594d776 100644 --- a/js/src/tests/js1_5/Regress/regress-475645-01.js +++ b/js/src/tests/js1_5/Regress/regress-475645-01.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-475645-01.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 475645; var summary = 'Do not crash @ nanojit::LIns::isop'; diff --git a/js/src/tests/js1_5/Regress/regress-475645-02.js b/js/src/tests/js1_5/Regress/regress-475645-02.js index 5ed9d6d9cdb1..684e36e76938 100644 --- a/js/src/tests/js1_5/Regress/regress-475645-02.js +++ b/js/src/tests/js1_5/Regress/regress-475645-02.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-475645-02.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 475645; var summary = 'Do not crash @ nanojit::LIns::isop'; diff --git a/js/src/tests/js1_5/Regress/regress-476049.js b/js/src/tests/js1_5/Regress/regress-476049.js index 144d8a02206b..b42a8a76f696 100644 --- a/js/src/tests/js1_5/Regress/regress-476049.js +++ b/js/src/tests/js1_5/Regress/regress-476049.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-476049.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 476049; var summary = 'JSOP_DEFVAR enables gvar optimization for non-permanent properties'; diff --git a/js/src/tests/js1_5/Regress/regress-476192.js b/js/src/tests/js1_5/Regress/regress-476192.js index e1609994ad84..66eeae521682 100644 --- a/js/src/tests/js1_5/Regress/regress-476192.js +++ b/js/src/tests/js1_5/Regress/regress-476192.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-476192.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 476192; var summary = 'TM: Do not assert: JSVAL_TAG(v) == JSVAL_STRING'; diff --git a/js/src/tests/js1_5/Regress/regress-477733.js b/js/src/tests/js1_5/Regress/regress-477733.js index dc56f7cc252d..d8d2a01b07d2 100644 --- a/js/src/tests/js1_5/Regress/regress-477733.js +++ b/js/src/tests/js1_5/Regress/regress-477733.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-477733.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 477733; var summary = 'TM: Do not assert: !(fp->flags & JSFRAME_POP_BLOCKS)'; diff --git a/js/src/tests/js1_5/Regress/regress-477758.js b/js/src/tests/js1_5/Regress/regress-477758.js index ebf78c337363..11bfc1267240 100644 --- a/js/src/tests/js1_5/Regress/regress-477758.js +++ b/js/src/tests/js1_5/Regress/regress-477758.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-477758.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 477758; var summary = 'TM: RegExp source'; diff --git a/js/src/tests/js1_5/Regress/regress-478314.js b/js/src/tests/js1_5/Regress/regress-478314.js index f0bb2c0ee713..36c039dc0289 100644 --- a/js/src/tests/js1_5/Regress/regress-478314.js +++ b/js/src/tests/js1_5/Regress/regress-478314.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-478314.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 478314; var summary = 'Do not assert: Assertion failed: "need a way to EOT now, since this is trace end": 0'; diff --git a/js/src/tests/js1_5/Regress/regress-479353.js b/js/src/tests/js1_5/Regress/regress-479353.js index 1a3fa74b4c3c..e1a5aecc3fc5 100644 --- a/js/src/tests/js1_5/Regress/regress-479353.js +++ b/js/src/tests/js1_5/Regress/regress-479353.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-479353.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 479353; var summary = 'Do not assert: (uint32)(index_) < atoms_->length'; diff --git a/js/src/tests/js1_5/Regress/regress-480147.js b/js/src/tests/js1_5/Regress/regress-480147.js index d8749295c448..e2bb1a4fb059 100644 --- a/js/src/tests/js1_5/Regress/regress-480147.js +++ b/js/src/tests/js1_5/Regress/regress-480147.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-480147.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 480147; var summary = 'TM: Do not assert: cx->bailExit'; diff --git a/js/src/tests/js1_5/Regress/regress-480244.js b/js/src/tests/js1_5/Regress/regress-480244.js index 16d484f0878d..ec888a58abde 100644 --- a/js/src/tests/js1_5/Regress/regress-480244.js +++ b/js/src/tests/js1_5/Regress/regress-480244.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-480244.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 480244; var summary = 'Do not assert: isInt32(*p)'; diff --git a/js/src/tests/js1_5/Regress/regress-481436.js b/js/src/tests/js1_5/Regress/regress-481436.js index 91c5164667c5..8d50414253cd 100755 --- a/js/src/tests/js1_5/Regress/regress-481436.js +++ b/js/src/tests/js1_5/Regress/regress-481436.js @@ -36,7 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-481436.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 481436; var summary = 'TM: Do not crash @ FlushNativeStackFrame/JS_XDRNewMem'; diff --git a/js/src/tests/js1_5/Regress/regress-482421.js b/js/src/tests/js1_5/Regress/regress-482421.js index b70e9c06ba60..a605f1b1c98d 100644 --- a/js/src/tests/js1_5/Regress/regress-482421.js +++ b/js/src/tests/js1_5/Regress/regress-482421.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-482421.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 482421; var summary = 'TM: Do not assert: vp >= StackBase(fp)'; diff --git a/js/src/tests/js1_5/Regress/regress-482783.js b/js/src/tests/js1_5/Regress/regress-482783.js index 6bf739d2cc60..8e1534c247b8 100755 --- a/js/src/tests/js1_5/Regress/regress-482783.js +++ b/js/src/tests/js1_5/Regress/regress-482783.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-482783.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 482783; var summary = 'TM: Do not crash @ js_ConcatStrings'; diff --git a/js/src/tests/js1_5/Regress/regress-483103.js b/js/src/tests/js1_5/Regress/regress-483103.js index e56bceb013d4..7d5753a56101 100644 --- a/js/src/tests/js1_5/Regress/regress-483103.js +++ b/js/src/tests/js1_5/Regress/regress-483103.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-483103.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 483103; var summary = 'TM: Do not assert: p->isQuad()'; diff --git a/js/src/tests/js1_5/Regress/regress-501124.js b/js/src/tests/js1_5/Regress/regress-501124.js index c8dac3d4ea25..61f1cd1d7494 100755 --- a/js/src/tests/js1_5/Regress/regress-501124.js +++ b/js/src/tests/js1_5/Regress/regress-501124.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-501124.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 501124; var summary = 'Crypotographic login routines'; diff --git a/js/src/tests/js1_5/Regress/regress-503860.js b/js/src/tests/js1_5/Regress/regress-503860.js index 2ae44e8e6279..48257ebca36f 100644 --- a/js/src/tests/js1_5/Regress/regress-503860.js +++ b/js/src/tests/js1_5/Regress/regress-503860.js @@ -5,7 +5,6 @@ * Contributor: Jason Orendorff */ -var gTestfile = 'regress-503860.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 503860; var summary = "Don't shadow a readonly or setter proto-property"; diff --git a/js/src/tests/js1_5/Regress/regress-504078.js b/js/src/tests/js1_5/Regress/regress-504078.js index ffdeafc97ae7..e0a5a97e9506 100644 --- a/js/src/tests/js1_5/Regress/regress-504078.js +++ b/js/src/tests/js1_5/Regress/regress-504078.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-504078.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 504078; var summary = 'Iterations over global object'; diff --git a/js/src/tests/js1_5/Regress/regress-506567.js b/js/src/tests/js1_5/Regress/regress-506567.js index 097fce0cd588..25e14aa1adf4 100644 --- a/js/src/tests/js1_5/Regress/regress-506567.js +++ b/js/src/tests/js1_5/Regress/regress-506567.js @@ -35,7 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -var gTestfile = 'regress-506567.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 506567; var summary = 'Do not crash with watched variables'; diff --git a/js/src/tests/js1_5/Regress/regress-511859.js b/js/src/tests/js1_5/Regress/regress-511859.js index e1b09a3d3e48..143dc74b9919 100644 --- a/js/src/tests/js1_5/Regress/regress-511859.js +++ b/js/src/tests/js1_5/Regress/regress-511859.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-511859.js'; var UBound = 0; var BUGNUMBER = 511859; var summary = 'Utf8ToOneUcs4Char in jsstr.cpp ,overlong UTF-8 seqence detection problem'; diff --git a/js/src/tests/js1_5/Regress/regress-57043.js b/js/src/tests/js1_5/Regress/regress-57043.js index b365b2bc7514..9eae290b1d27 100644 --- a/js/src/tests/js1_5/Regress/regress-57043.js +++ b/js/src/tests/js1_5/Regress/regress-57043.js @@ -53,7 +53,6 @@ * obj['-1'] = 'Hello' */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-57043.js'; var BUGNUMBER = 57043; var summary = 'Indexing object properties by signed numerical literals -' var statprefix = 'Adding a property to test object with an index of '; diff --git a/js/src/tests/js1_5/Regress/regress-58116.js b/js/src/tests/js1_5/Regress/regress-58116.js index 36b829788e87..495300de5009 100644 --- a/js/src/tests/js1_5/Regress/regress-58116.js +++ b/js/src/tests/js1_5/Regress/regress-58116.js @@ -5,7 +5,6 @@ * Contributor: Bob Clary */ -var gTestfile = 'regress-58116.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 58116; var summary = 'Compute Daylight savings time correctly regardless of year'; diff --git a/js/src/tests/js1_5/Regress/regress-68498-001.js b/js/src/tests/js1_5/Regress/regress-68498-001.js index bdfbedb45abb..633fde01855d 100644 --- a/js/src/tests/js1_5/Regress/regress-68498-001.js +++ b/js/src/tests/js1_5/Regress/regress-68498-001.js @@ -50,7 +50,6 @@ * DontDelete property of the global object" */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-68498-001.js'; var BUGNUMBER = 68498; var summary ='Testing that variable statement outside any eval creates' + ' a DontDelete property of the global object'; diff --git a/js/src/tests/js1_5/Regress/regress-68498-002.js b/js/src/tests/js1_5/Regress/regress-68498-002.js index 14deea13d0de..18e49c010fb8 100644 --- a/js/src/tests/js1_5/Regress/regress-68498-002.js +++ b/js/src/tests/js1_5/Regress/regress-68498-002.js @@ -49,7 +49,6 @@ * "Demonstrate the creation of a Deletable local variable using eval" */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-68498-002.js'; var BUGNUMBER = 68498; var summary = 'Creating a Deletable local variable using eval'; var statprefix = '; currently at expect['; diff --git a/js/src/tests/js1_5/Regress/regress-68498-003.js b/js/src/tests/js1_5/Regress/regress-68498-003.js index c916d13b2860..74b14bae0221 100644 --- a/js/src/tests/js1_5/Regress/regress-68498-003.js +++ b/js/src/tests/js1_5/Regress/regress-68498-003.js @@ -50,7 +50,6 @@ * str using obj as the scope chain and variable object." */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-68498-003.js'; var BUGNUMBER = 68498; var summary = 'Testing calling obj.eval(str)'; var statprefix = '; currently at expect['; diff --git a/js/src/tests/js1_5/Regress/regress-68498-004.js b/js/src/tests/js1_5/Regress/regress-68498-004.js index 214895e59e0e..0f7ad710d648 100644 --- a/js/src/tests/js1_5/Regress/regress-68498-004.js +++ b/js/src/tests/js1_5/Regress/regress-68498-004.js @@ -54,7 +54,6 @@ * relevant to the effect of parsing the FunctionDeclaration." */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-68498-004.js'; var BUGNUMBER = 68498; var summary = 'Testing self.eval(str) inside a function'; var statprefix = '; currently at expect['; diff --git a/js/src/tests/js1_5/Regress/regress-69607.js b/js/src/tests/js1_5/Regress/regress-69607.js index 3ed9379e8950..8c48ca19aa96 100644 --- a/js/src/tests/js1_5/Regress/regress-69607.js +++ b/js/src/tests/js1_5/Regress/regress-69607.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-69607.js'; var BUGNUMBER = 69607; var summary = "Testing that we don't crash on trivial JavaScript"; var var1; diff --git a/js/src/tests/js1_5/Regress/regress-71107.js b/js/src/tests/js1_5/Regress/regress-71107.js index c1473dfaf0b7..aff10dfc7020 100644 --- a/js/src/tests/js1_5/Regress/regress-71107.js +++ b/js/src/tests/js1_5/Regress/regress-71107.js @@ -44,7 +44,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-71107.js'; var BUGNUMBER = 71107; var summary = 'Propagate heavyweightness back up the function-nesting chain.'; diff --git a/js/src/tests/js1_5/Regress/regress-76054.js b/js/src/tests/js1_5/Regress/regress-76054.js index 0676c7677f8b..7572d0b4607a 100644 --- a/js/src/tests/js1_5/Regress/regress-76054.js +++ b/js/src/tests/js1_5/Regress/regress-76054.js @@ -46,7 +46,6 @@ * All String HTML methods should be LOWER case - */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-76054.js'; var UBound = 0; var BUGNUMBER = 76054; var summary = 'Testing that String HTML methods produce all lower-case'; diff --git a/js/src/tests/js1_5/Regress/regress-80981.js b/js/src/tests/js1_5/Regress/regress-80981.js index 7d743566458a..dbc493b1d98d 100644 --- a/js/src/tests/js1_5/Regress/regress-80981.js +++ b/js/src/tests/js1_5/Regress/regress-80981.js @@ -57,7 +57,6 @@ * */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-80981.js'; var i2 = 3011; var n = new Array (i2); var err_num = 0; diff --git a/js/src/tests/js1_5/Regress/regress-82306.js b/js/src/tests/js1_5/Regress/regress-82306.js index b042ffb989ea..7f3176358540 100644 --- a/js/src/tests/js1_5/Regress/regress-82306.js +++ b/js/src/tests/js1_5/Regress/regress-82306.js @@ -46,7 +46,6 @@ * by Mike Epstein */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-82306.js'; var BUGNUMBER = 82306; var summary = "Testing we don't crash on encodeURI()"; var URI = ''; diff --git a/js/src/tests/js1_5/Regress/regress-89443.js b/js/src/tests/js1_5/Regress/regress-89443.js index 559f78f62913..f2c74b966e99 100644 --- a/js/src/tests/js1_5/Regress/regress-89443.js +++ b/js/src/tests/js1_5/Regress/regress-89443.js @@ -45,7 +45,6 @@ * Just seeing if this script will compile without stack overflow. */ //----------------------------------------------------------------------------- -var gTestfile = 'regress-89443.js'; var BUGNUMBER = 89443; var summary = 'Testing this script will compile without stack overflow'; diff --git a/js/src/tests/js1_5/Regress/regress-89474.js b/js/src/tests/js1_5/Regress/regress-89474.js index d8d9c7608a96..8632ae46d64a 100644 --- a/js/src/tests/js1_5/Regress/regress-89474.js +++ b/js/src/tests/js1_5/Regress/regress-89474.js @@ -47,7 +47,6 @@ * by Darren DeRidder */ -var gTestfile = 'template.js'; //----------------------------------------------------------------------------- var BUGNUMBER = 532774; var summary = 'js typed arrays (webgl arrays)'; diff --git a/js/src/tests/js1_8_5/regress/regress-533876.js b/js/src/tests/js1_8_5/regress/regress-533876.js index 7feddd2effb5..e44bc8a4f26f 100644 --- a/js/src/tests/js1_8_5/regress/regress-533876.js +++ b/js/src/tests/js1_8_5/regress/regress-533876.js @@ -3,7 +3,6 @@ * http://creativecommons.org/licenses/publicdomain/ * Contributors: Gary Kwong and Jason Orendorff */ -gTestfile = 'regress-533876'; var savedEval = eval; var x = [0]; diff --git a/js/src/tests/js1_8_5/regress/regress-541455.js b/js/src/tests/js1_8_5/regress/regress-541455.js index 05604887b764..7ee3a40155b2 100644 --- a/js/src/tests/js1_8_5/regress/regress-541455.js +++ b/js/src/tests/js1_8_5/regress/regress-541455.js @@ -3,7 +3,6 @@ * http://creativecommons.org/licenses/publicdomain/ * Contributors: Gary Kwong and Jason Orendorff */ -gTestfile = 'regress-541455'; function f(x) { return eval('"mumble"; x + 42'); } diff --git a/js/src/tests/js1_8_5/regress/regress-546615.js b/js/src/tests/js1_8_5/regress/regress-546615.js index 622f126873bb..98f036b5b5da 100644 --- a/js/src/tests/js1_8_5/regress/regress-546615.js +++ b/js/src/tests/js1_8_5/regress/regress-546615.js @@ -3,7 +3,6 @@ * http://creativecommons.org/licenses/publicdomain/ * Contributors: Gary Kwong and Jason Orendorff */ -gTestfile = 'regress-546615'; try { + +var x, f; +for (var i = 0; i < 100; i++) { + f = function() {}; + f.foo; + x = f.length; +} diff --git a/js/src/trace-test/tests/bug579740.js b/js/src/trace-test/tests/bug579740.js new file mode 100644 index 000000000000..83ee967bfd86 --- /dev/null +++ b/js/src/trace-test/tests/bug579740.js @@ -0,0 +1,7 @@ + +for (a = 0; a < 4; a++) { + new Math.round(0).t +} + +/* Don't assert. */ + diff --git a/js/src/xpconnect/src/XPCCrossOriginWrapper.cpp b/js/src/xpconnect/src/XPCCrossOriginWrapper.cpp index 8b7de253ed7e..9efcd5646514 100644 --- a/js/src/xpconnect/src/XPCCrossOriginWrapper.cpp +++ b/js/src/xpconnect/src/XPCCrossOriginWrapper.cpp @@ -412,6 +412,8 @@ WrapObject(JSContext *cx, JSObject *parent, jsval *vp, XPCWrappedNative* wn) return JS_TRUE; } + CheckWindow(wn); + // The parent must be the inner global object for its scope. parent = JS_GetGlobalForObject(cx, parent); OBJ_TO_INNER_OBJECT(cx, parent); diff --git a/js/src/xpconnect/src/XPCNativeWrapper.cpp b/js/src/xpconnect/src/XPCNativeWrapper.cpp index e71dd94f2585..92450005998a 100644 --- a/js/src/xpconnect/src/XPCNativeWrapper.cpp +++ b/js/src/xpconnect/src/XPCNativeWrapper.cpp @@ -1069,6 +1069,8 @@ JSObject * XPCNativeWrapper::GetNewOrUsed(JSContext *cx, XPCWrappedNative *wrapper, JSObject *scope, nsIPrincipal *aObjectPrincipal) { + CheckWindow(wrapper); + if (aObjectPrincipal) { nsIScriptSecurityManager *ssm = GetSecurityManager(); diff --git a/js/src/xpconnect/src/XPCSafeJSObjectWrapper.cpp b/js/src/xpconnect/src/XPCSafeJSObjectWrapper.cpp index ab4431295c30..fddf46e95828 100644 --- a/js/src/xpconnect/src/XPCSafeJSObjectWrapper.cpp +++ b/js/src/xpconnect/src/XPCSafeJSObjectWrapper.cpp @@ -324,6 +324,12 @@ WrapObject(JSContext *cx, JSObject *scope, jsval v, jsval *vp) return ThrowException(NS_ERROR_FAILURE, cx); } + XPCWrappedNative *wn = + XPCWrappedNative::GetWrappedNativeOfJSObject(cx, objToWrap); + if (wn) { + CheckWindow(wn); + } + JSObject *wrapperObj = JS_NewObjectWithGivenProto(cx, js::Jsvalify(&SJOWClass), nsnull, scope); diff --git a/js/src/xpconnect/src/XPCWrapper.cpp b/js/src/xpconnect/src/XPCWrapper.cpp index 975e3eb52a0a..235659390b53 100644 --- a/js/src/xpconnect/src/XPCWrapper.cpp +++ b/js/src/xpconnect/src/XPCWrapper.cpp @@ -42,6 +42,7 @@ #include "XPCWrapper.h" #include "XPCNativeWrapper.h" +#include "nsPIDOMWindow.h" namespace XPCWrapper { @@ -189,6 +190,35 @@ static js::Class IteratorClass = { } }; +void +CheckWindow(XPCWrappedNative *wn) +{ + JSClass *clasp = wn->GetFlatJSObject()->getJSClass(); + + // Censor objects that can't be windows. + switch (clasp->name[0]) { + case 'C': // ChromeWindow? + if (clasp->name[1] != 'h') { + return; + } + + break; + case 'M': // ModalContentWindow + break; + case 'W': // Window + break; + default: + return; + } + + nsCOMPtr pwin(do_QueryWrappedNative(wn)); + if (!pwin || pwin->IsInnerWindow()) { + return; + } + + pwin->EnsureInnerWindow(); +} + JSBool RewrapObject(JSContext *cx, JSObject *scope, JSObject *obj, WrapperType hint, jsval *vp) diff --git a/js/src/xpconnect/src/XPCWrapper.h b/js/src/xpconnect/src/XPCWrapper.h index c8a5ab3589d6..f45d52192a47 100644 --- a/js/src/xpconnect/src/XPCWrapper.h +++ b/js/src/xpconnect/src/XPCWrapper.h @@ -444,6 +444,13 @@ WrapFunction(JSContext *cx, JSObject *wrapperObj, JSObject *funobj, jsval *v, : XPCCrossOriginWrapper::WrapFunction(cx, wrapperObj, funobj, v); } +/** + * Given a JSObject that might represent a Window object, ensures that the + * window object has an inner window. + */ +void +CheckWindow(XPCWrappedNative *wn); + /** * Given a potentially-wrapped object, creates a wrapper for it. */ diff --git a/js/src/xpconnect/src/xpcconvert.cpp b/js/src/xpconnect/src/xpcconvert.cpp index f4091e298784..038ededc0630 100644 --- a/js/src/xpconnect/src/xpcconvert.cpp +++ b/js/src/xpconnect/src/xpcconvert.cpp @@ -330,9 +330,12 @@ XPCConvert::NativeData2JS(XPCLazyCallContext& lccx, jsval* d, const void* s, break; if(!p->IsVoid()) { - jsval str = XPCStringConvert::ReadableToJSVal(cx, *p); + nsStringBuffer* buf; + jsval str = XPCStringConvert::ReadableToJSVal(cx, *p, &buf); if(JSVAL_IS_NULL(str)) return JS_FALSE; + if(buf) + buf->AddRef(); *d = str; } diff --git a/js/src/xpconnect/src/xpcjsruntime.cpp b/js/src/xpconnect/src/xpcjsruntime.cpp index 04ef222cb2e1..997afbb1e8e9 100644 --- a/js/src/xpconnect/src/xpcjsruntime.cpp +++ b/js/src/xpconnect/src/xpcjsruntime.cpp @@ -498,6 +498,15 @@ JSBool XPCJSRuntime::GCCallback(JSContext *cx, JSGCStatus status) { return JS_FALSE; } + + // We seem to sometime lose the unrooted global flag. Restore it + // here. FIXME: bug 584495. + JSContext *iter = nsnull, *acx; + + while((acx = JS_ContextIterator(cx->runtime, &iter))) { + if (!JS_HAS_OPTION(acx, JSOPTION_UNROOTED_GLOBAL)) + JS_ToggleOptions(acx, JSOPTION_UNROOTED_GLOBAL); + } break; } case JSGC_MARK_END: diff --git a/js/src/xpconnect/src/xpcprivate.h b/js/src/xpconnect/src/xpcprivate.h index b08e77767b4d..b8bb9a16180e 100644 --- a/js/src/xpconnect/src/xpcprivate.h +++ b/js/src/xpconnect/src/xpcprivate.h @@ -113,6 +113,7 @@ #include "nsBaseHashtable.h" #include "nsHashKeys.h" #include "nsWrapperCache.h" +#include "nsStringBuffer.h" #include "nsIXPCScriptNotify.h" // used to notify: ScriptEvaluated @@ -3226,9 +3227,11 @@ class XPCStringConvert { public: + // If the string shares the readable's buffer, that buffer will + // get assigned to *sharedBuffer. Otherwise null will be + // assigned. static jsval ReadableToJSVal(JSContext *cx, const nsAString &readable, - PRBool dontAddrefShared = PR_FALSE, - PRBool* sharedBuffer = nsnull); + nsStringBuffer** sharedBuffer); static XPCReadableJSStringWrapper *JSStringToReadable(XPCCallContext& ccx, JSString *str); diff --git a/js/src/xpconnect/src/xpcquickstubs.cpp b/js/src/xpconnect/src/xpcquickstubs.cpp index da8f37639331..fe2e61445369 100644 --- a/js/src/xpconnect/src/xpcquickstubs.cpp +++ b/js/src/xpconnect/src/xpcquickstubs.cpp @@ -1071,13 +1071,12 @@ xpc_qsStringToJsval(JSContext *cx, nsString &str, jsval *rval) return JS_TRUE; } - PRBool isShared = PR_FALSE; - jsval jsstr = - XPCStringConvert::ReadableToJSVal(cx, str, PR_TRUE, &isShared); + nsStringBuffer* sharedBuffer; + jsval jsstr = XPCStringConvert::ReadableToJSVal(cx, str, &sharedBuffer); if (JSVAL_IS_NULL(jsstr)) return JS_FALSE; *rval = jsstr; - if (isShared) + if (sharedBuffer) { // The string was shared but ReadableToJSVal didn't addref it. // Move the ownership from str to jsstr. @@ -1096,13 +1095,12 @@ xpc_qsStringToJsstring(JSContext *cx, nsString &str, JSString **rval) return JS_TRUE; } - PRBool isShared = PR_FALSE; - jsval jsstr = - XPCStringConvert::ReadableToJSVal(cx, str, PR_TRUE, &isShared); + nsStringBuffer* sharedBuffer; + jsval jsstr = XPCStringConvert::ReadableToJSVal(cx, str, &sharedBuffer); if(JSVAL_IS_NULL(jsstr)) return JS_FALSE; *rval = JSVAL_TO_STRING(jsstr); - if (isShared) + if (sharedBuffer) { // The string was shared but ReadableToJSVal didn't addref it. // Move the ownership from str to jsstr. diff --git a/js/src/xpconnect/src/xpcstring.cpp b/js/src/xpconnect/src/xpcstring.cpp index 0643a5658f43..12bd938afec5 100644 --- a/js/src/xpconnect/src/xpcstring.cpp +++ b/js/src/xpconnect/src/xpcstring.cpp @@ -78,14 +78,10 @@ XPCStringConvert::ShutdownDOMStringFinalizer() jsval XPCStringConvert::ReadableToJSVal(JSContext *cx, const nsAString &readable, - PRBool dontAddrefShared, - PRBool* sharedBuffer) + nsStringBuffer** sharedBuffer) { JSString *str; - if (sharedBuffer) - { - *sharedBuffer = PR_FALSE; - } + *sharedBuffer = nsnull; PRUint32 length = readable.Length(); @@ -114,14 +110,7 @@ XPCStringConvert::ReadableToJSVal(JSContext *cx, if (str) { - if (sharedBuffer) - { - *sharedBuffer = PR_TRUE; - } - if (!dontAddrefShared) - { - buf->AddRef(); - } + *sharedBuffer = buf; } } else diff --git a/js/src/xpconnect/src/xpcwrappedjs.cpp b/js/src/xpconnect/src/xpcwrappedjs.cpp index c25ce29947f2..96b17cd4ab2a 100644 --- a/js/src/xpconnect/src/xpcwrappedjs.cpp +++ b/js/src/xpconnect/src/xpcwrappedjs.cpp @@ -620,9 +620,12 @@ nsXPCWrappedJS::GetProperty(const nsAString & name, nsIVariant **_retval) if(!ccx.IsValid()) return NS_ERROR_UNEXPECTED; - jsval jsstr = XPCStringConvert::ReadableToJSVal(ccx, name); + nsStringBuffer* buf; + jsval jsstr = XPCStringConvert::ReadableToJSVal(ccx, name, &buf); if(JSVAL_IS_NULL(jsstr)) return NS_ERROR_OUT_OF_MEMORY; + if(buf) + buf->AddRef(); return nsXPCWrappedJSClass:: GetNamedPropertyAsVariant(ccx, mJSObj, jsstr, _retval); diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp index 1bda957fbf8a..aa9419f86353 100644 --- a/layout/base/nsCaret.cpp +++ b/layout/base/nsCaret.cpp @@ -178,6 +178,7 @@ nsCaret::nsCaret() #endif , mLastContentOffset(0) , mLastHint(nsFrameSelection::HINTLEFT) +, mLastFrameOffset(0) { } @@ -300,6 +301,7 @@ void nsCaret::Terminate() mPresShell = nsnull; mLastContent = nsnull; + mLastFrame = nsnull; } //----------------------------------------------------------------------------- @@ -503,8 +505,8 @@ nsIFrame * nsCaret::GetCaretFrame(PRInt32 *aOffset) if (!mDrawn) return nsnull; - // Recompute the frame that we're supposed to draw in to guarantee that - // we're not going to try to draw into a stale (dead) frame. + // Recompute the frame that we're supposed to draw in if the cached frame + // is stale (dead). PRInt32 offset; nsIFrame *frame = nsnull; nsresult rv = GetCaretFrameForNodeOffset(mLastContent, mLastContentOffset, @@ -740,6 +742,16 @@ nsCaret::GetCaretFrameForNodeOffset(nsIContent* aContentNode, nsIFrame** aReturnFrame, PRInt32* aReturnOffset) { + // Try to see if we can use our cached frame + if (mLastFrame.IsAlive() && + mLastContent == aContentNode && + mLastContentOffset == aOffset && + mLastHint == aFrameHint && + mLastBidiLevel == aBidiLevel) { + *aReturnFrame = mLastFrame; + *aReturnOffset = mLastFrameOffset; + return NS_OK; + } //get frame selection and find out what frame to use... nsCOMPtr presShell = do_QueryReferent(mPresShell); @@ -900,6 +912,8 @@ nsCaret::GetCaretFrameForNodeOffset(nsIContent* aContentNode, } *aReturnFrame = theFrame; *aReturnOffset = theFrameOffset; + mLastFrame = theFrame; + mLastFrameOffset = theFrameOffset; return NS_OK; } diff --git a/layout/base/nsCaret.h b/layout/base/nsCaret.h index 74346d819861..2f43cff5dcb6 100644 --- a/layout/base/nsCaret.h +++ b/layout/base/nsCaret.h @@ -293,8 +293,11 @@ protected: // actually drawn (anon
in text control) PRInt32 mLastContentOffset; // the offset for the last request - nsFrameSelection::HINT mLastHint; // the hint associated with the last request, see also - // mLastBidiLevel below + nsFrameSelection::HINT mLastHint; // the hint associated with the last request, see also + // mLastBidiLevel above + + nsWeakFrame mLastFrame; // the last frame on which the caret has been drawn. + PRInt32 mLastFrameOffset; // the frame offset for the last caret position }; diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index ffac31607fbe..e57c68deaf92 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -4789,6 +4789,7 @@ PresShell::FlushPendingNotifications(mozFlushType aType) // Process pending restyles, since any flush of the presshell wants // up-to-date style data. if (!mIsDestroying) { + mViewManager->FlushDelayedResize(PR_FALSE); mPresContext->FlushPendingMediaFeatureValuesChanged(); // Flush any pending update of the user font set, since that could @@ -4835,7 +4836,7 @@ PresShell::FlushPendingNotifications(mozFlushType aType) if (aType >= (mSuppressInterruptibleReflows ? Flush_Layout : Flush_InterruptibleLayout) && !mIsDestroying) { mFrameConstructor->RecalcQuotesAndCounters(); - mViewManager->FlushDelayedResize(); + mViewManager->FlushDelayedResize(PR_TRUE); if (ProcessReflowCommands(aType < Flush_Layout) && mContentToScrollTo) { // We didn't get interrupted. Go ahead and scroll to our content DoScrollContentIntoView(mContentToScrollTo, mContentScrollVPosition, @@ -4860,12 +4861,6 @@ PresShell::FlushPendingNotifications(mozFlushType aType) // immediately updateFlags = NS_VMREFRESH_IMMEDIATE; } - else if (aType < Flush_InterruptibleLayout) { - // Not flushing reflows, so do deferred invalidates. This will keep us - // from possibly flushing out reflows due to invalidates being processed - // at the end of this view batch. - updateFlags = NS_VMREFRESH_DEFERRED; - } batch.EndUpdateViewBatch(updateFlags); } } diff --git a/layout/generic/nsVideoFrame.cpp b/layout/generic/nsVideoFrame.cpp index 7e220f9752d5..94c634200923 100644 --- a/layout/generic/nsVideoFrame.cpp +++ b/layout/generic/nsVideoFrame.cpp @@ -187,6 +187,14 @@ nsVideoFrame::BuildLayer(nsDisplayListBuilder* aBuilder, return nsnull; nsRefPtr container = element->GetImageContainer(); + // If we have a container with a different layer manager, try to hand + // off the container to the new one. + if (container && container->Manager() != aManager) { + // we don't care about the return type here -- if the set didn't take, it'll + // be handled when we next check the manager + container->SetLayerManager(aManager); + } + // If we have a container with the right layer manager already, we don't // need to do anything here. Otherwise we need to set up a temporary // ImageContainer, capture the video data and store it in the temp @@ -203,6 +211,10 @@ nsVideoFrame::BuildLayer(nsDisplayListBuilder* aBuilder, // Get video from the existing container. It was created for a // different layer manager, so we do fallback through cairo. imageSurface = container->GetCurrentAsSurface(&cairoData.mSize); + if (!imageSurface) { + // we couldn't do fallback, so we've got nothing to do here + return nsnull; + } cairoData.mSurface = imageSurface; } else { // We're probably printing. diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list index c400b775f565..e39261d96ffd 100644 --- a/layout/reftests/svg/reftest.list +++ b/layout/reftests/svg/reftest.list @@ -149,6 +149,7 @@ fails == inline-in-xul-basic-01.xul pass.svg random-if(gtk2Widget) == text-font-weight-01.svg text-font-weight-01-ref.svg # bug 386713 == switch-01.svg pass.svg == text-gradient-01.svg text-gradient-01-ref.svg +== text-gradient-02.svg text-gradient-02-ref.svg == text-in-link-01.svg text-in-link-01-ref.svg == text-in-link-02.svg text-in-link-02-ref.svg == text-in-link-03.svg text-in-link-03-ref.svg diff --git a/layout/reftests/svg/text-gradient-02-ref.svg b/layout/reftests/svg/text-gradient-02-ref.svg new file mode 100644 index 000000000000..38f78b520e8f --- /dev/null +++ b/layout/reftests/svg/text-gradient-02-ref.svg @@ -0,0 +1,22 @@ + + + +Reference for gradient on text + + + + + + + + + + + + + FooBar + + diff --git a/layout/reftests/svg/text-gradient-02.svg b/layout/reftests/svg/text-gradient-02.svg new file mode 100644 index 000000000000..70a71102a544 --- /dev/null +++ b/layout/reftests/svg/text-gradient-02.svg @@ -0,0 +1,23 @@ + + + +Testcase for gradient on text + + + + + + + + + + + + + Foo + Bar + + diff --git a/layout/svg/base/src/nsSVGContainerFrame.cpp b/layout/svg/base/src/nsSVGContainerFrame.cpp index a72a182183cd..f92d20d32f6e 100644 --- a/layout/svg/base/src/nsSVGContainerFrame.cpp +++ b/layout/svg/base/src/nsSVGContainerFrame.cpp @@ -270,13 +270,10 @@ nsSVGDisplayContainerFrame::GetBBoxContribution(const gfxMatrix &aToBBoxUserspac nsISVGChildFrame* svgKid = do_QueryFrame(kid); if (svgKid) { gfxMatrix transform = aToBBoxUserspace; - // nsSVGGlyphFrame's mContent is a nsTextNode! - if (kid->GetType() != nsGkAtoms::svgGlyphFrame) { - nsIContent *content = kid->GetContent(); - if (content->IsSVG()) { - transform = static_cast(content)-> - PrependLocalTransformTo(aToBBoxUserspace); - } + nsIContent *content = kid->GetContent(); + if (content->IsSVG() && !content->IsNodeOfType(nsINode::eTEXT)) { + transform = static_cast(content)-> + PrependLocalTransformTo(aToBBoxUserspace); } bboxUnion = bboxUnion.Union(svgKid->GetBBoxContribution(transform)); } diff --git a/layout/svg/base/src/nsSVGGeometryFrame.cpp b/layout/svg/base/src/nsSVGGeometryFrame.cpp index faed7435099b..fab303edc355 100644 --- a/layout/svg/base/src/nsSVGGeometryFrame.cpp +++ b/layout/svg/base/src/nsSVGGeometryFrame.cpp @@ -88,7 +88,7 @@ float nsSVGGeometryFrame::GetStrokeWidth() { nsSVGElement *ctx = static_cast - (GetType() == nsGkAtoms::svgGlyphFrame ? + (mContent->IsNodeOfType(nsINode::eTEXT) ? mContent->GetParent() : mContent); return @@ -101,7 +101,7 @@ nsresult nsSVGGeometryFrame::GetStrokeDashArray(gfxFloat **aDashes, PRUint32 *aCount) { nsSVGElement *ctx = static_cast - (GetType() == nsGkAtoms::svgGlyphFrame ? + (mContent->IsNodeOfType(nsINode::eTEXT) ? mContent->GetParent() : mContent); *aDashes = nsnull; *aCount = 0; @@ -147,7 +147,7 @@ float nsSVGGeometryFrame::GetStrokeDashoffset() { nsSVGElement *ctx = static_cast - (GetType() == nsGkAtoms::svgGlyphFrame ? + (mContent->IsNodeOfType(nsINode::eTEXT) ? mContent->GetParent() : mContent); return diff --git a/layout/svg/base/src/nsSVGGradientFrame.cpp b/layout/svg/base/src/nsSVGGradientFrame.cpp index 18367346fd91..a652e6d04e93 100644 --- a/layout/svg/base/src/nsSVGGradientFrame.cpp +++ b/layout/svg/base/src/nsSVGGradientFrame.cpp @@ -164,9 +164,7 @@ nsSVGGradientFrame::GetGradientTransform(nsIFrame *aSource, "Unknown gradientUnits type"); // objectBoundingBox is the default anyway - nsIFrame *frame = aSource->GetContent()->IsNodeOfType(nsINode::eTEXT) ? - aSource->GetParent() : aSource; - gfxRect bbox = aOverrideBounds ? *aOverrideBounds : nsSVGUtils::GetBBox(frame); + gfxRect bbox = aOverrideBounds ? *aOverrideBounds : nsSVGUtils::GetBBox(aSource); bboxMatrix = gfxMatrix(bbox.Width(), 0, 0, bbox.Height(), bbox.X(), bbox.Y()); } diff --git a/layout/svg/base/src/nsSVGPatternFrame.cpp b/layout/svg/base/src/nsSVGPatternFrame.cpp index af759101c40c..ceb9da10f5a3 100644 --- a/layout/svg/base/src/nsSVGPatternFrame.cpp +++ b/layout/svg/base/src/nsSVGPatternFrame.cpp @@ -614,17 +614,7 @@ nsSVGPatternFrame::GetTargetGeometry(gfxMatrix *aCTM, nsIFrame *aTarget, const gfxRect *aOverrideBounds) { - // If we are attempting to paint a pattern for text, then the content will be - // the #text, so we actually want the parent, which should be the - // or element. - if (aTarget->GetContent()->IsNodeOfType(nsINode::eTEXT)) { - *aBBox = nsSVGUtils::GetBBox(aTarget->GetParent()); - } else { - *aBBox = nsSVGUtils::GetBBox(aTarget); - } - if (aOverrideBounds) { - *aBBox = *aOverrideBounds; - } + *aBBox = aOverrideBounds ? *aOverrideBounds : nsSVGUtils::GetBBox(aTarget); // Sanity check PRUint16 type = GetPatternUnits(); diff --git a/layout/svg/base/src/nsSVGUtils.cpp b/layout/svg/base/src/nsSVGUtils.cpp index 955513c10b9b..b9a86e7e779c 100644 --- a/layout/svg/base/src/nsSVGUtils.cpp +++ b/layout/svg/base/src/nsSVGUtils.cpp @@ -67,6 +67,7 @@ #include "nsSVGClipPathFrame.h" #include "nsSVGMaskFrame.h" #include "nsSVGContainerFrame.h" +#include "nsSVGTextContainerFrame.h" #include "nsSVGLength2.h" #include "nsGenericElement.h" #include "nsSVGGraphicElement.h" @@ -1357,9 +1358,23 @@ nsSVGUtils::ClipToGfxRect(nsIntRect* aRect, const gfxRect& aGfxRect) gfxRect nsSVGUtils::GetBBox(nsIFrame *aFrame) { + if (aFrame->GetContent()->IsNodeOfType(nsINode::eTEXT)) { + aFrame = aFrame->GetParent(); + } gfxRect bbox; nsISVGChildFrame *svg = do_QueryFrame(aFrame); if (svg) { + // It is possible to apply a gradient, pattern, clipping path, mask or + // filter to text. When one of these facilities is applied to text + // the bounding box is the entire ‘text’ element in all + // cases. + nsSVGTextContainerFrame* metrics = do_QueryFrame(aFrame); + if (metrics) { + while (aFrame->GetType() != nsGkAtoms::svgTextFrame) { + aFrame = aFrame->GetParent(); + } + svg = do_QueryFrame(aFrame); + } bbox = svg->GetBBoxContribution(gfxMatrix()); } else { bbox = nsSVGIntegrationUtils::GetSVGBBoxForNonSVGFrame(aFrame); diff --git a/layout/tools/reftest/reftest.js b/layout/tools/reftest/reftest.js index 1cbb46dd2c07..eca75f481b14 100644 --- a/layout/tools/reftest/reftest.js +++ b/layout/tools/reftest/reftest.js @@ -851,8 +851,17 @@ function OnDocumentLoad(event) .getInterface(CI.nsIDOMWindowUtils); function FlushRendering() { + function flushWindow(win) { + try { + win.document.documentElement.getBoundingClientRect(); + } catch (e) {} + for (var i = 0; i < win.frames.length; ++i) { + flushWindow(win.frames[i]); + } + } + // Flush pending restyles and reflows - contentRootElement.getBoundingClientRect(); + flushWindow(contentRootElement.ownerDocument.defaultView); // Flush out invalidation utils.processUpdates(); } diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp index ff0792d76ea1..ad94f6a187f4 100644 --- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp +++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp @@ -143,6 +143,7 @@ nsTreeBodyFrame::nsTreeBodyFrame(nsIPresShell* aPresShell, nsStyleContext* aCont :nsLeafBoxFrame(aPresShell, aContext), mSlots(nsnull), mTopRowIndex(0), + mPageLength(0), mHorzPosition(0), mHorzWidth(0), mAdjustWidth(0), diff --git a/layout/xul/base/src/tree/src/nsTreeBoxObject.cpp b/layout/xul/base/src/tree/src/nsTreeBoxObject.cpp index d49f60128342..50955f5a23be 100644 --- a/layout/xul/base/src/tree/src/nsTreeBoxObject.cpp +++ b/layout/xul/base/src/tree/src/nsTreeBoxObject.cpp @@ -114,15 +114,31 @@ static void FindBodyElement(nsIContent* aParent, nsIContent** aResult) } nsTreeBodyFrame* -nsTreeBoxObject::GetTreeBody() +nsTreeBoxObject::GetTreeBody(bool aFlushLayout) { + // Make sure our frames are up to date, and layout as needed. We + // have to do this before checking for our cached mTreeBody, since + // it might go away on style flush, and in any case if aFlushLayout + // is true we need to make sure to flush no matter what. + // XXXbz except that flushing style when we were not asked to flush + // layout here breaks things. See bug 585123. + nsIFrame* frame; + if (aFlushLayout) { + frame = GetFrame(aFlushLayout); + if (!frame) + return nsnull; + } + if (mTreeBody) { + // Have one cached already. return mTreeBody; } - nsIFrame* frame = GetFrame(PR_FALSE); - if (!frame) - return nsnull; + if (!aFlushLayout) { + frame = GetFrame(aFlushLayout); + if (!frame) + return nsnull; + } // Iterate over our content model children looking for the body. nsCOMPtr content; @@ -324,7 +340,7 @@ nsTreeBoxObject::EnsureCellIsVisible(PRInt32 aRow, nsITreeColumn* aCol) NS_IMETHODIMP nsTreeBoxObject::ScrollToRow(PRInt32 aRow) { - nsTreeBodyFrame* body = GetTreeBody(); + nsTreeBodyFrame* body = GetTreeBody(true); if (body) return body->ScrollToRow(aRow); return NS_OK; diff --git a/layout/xul/base/src/tree/src/nsTreeBoxObject.h b/layout/xul/base/src/tree/src/nsTreeBoxObject.h index 7d7612ba3df0..971ecb0fe011 100644 --- a/layout/xul/base/src/tree/src/nsTreeBoxObject.h +++ b/layout/xul/base/src/tree/src/nsTreeBoxObject.h @@ -57,7 +57,7 @@ public: nsTreeBoxObject(); ~nsTreeBoxObject(); - nsTreeBodyFrame* GetTreeBody(); + nsTreeBodyFrame* GetTreeBody(bool aFlushLayout = false); nsTreeBodyFrame* GetCachedTreeBody() { return mTreeBody; } //NS_PIBOXOBJECT interfaces diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js index 2114bc3cd723..69c9368053f0 100644 --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js @@ -3128,7 +3128,7 @@ pref("image.mem.min_discard_timeout_ms", 10000); // WebGL prefs pref("webgl.enabled_for_all_sites", false); -pref("webgl.shader_validator", false); +pref("webgl.shader_validator", true); pref("webgl.software_render", false); pref("webgl.osmesalib", ""); diff --git a/netwerk/base/src/nsAsyncRedirectVerifyHelper.cpp b/netwerk/base/src/nsAsyncRedirectVerifyHelper.cpp index b46578872746..d95d98eda4b3 100644 --- a/netwerk/base/src/nsAsyncRedirectVerifyHelper.cpp +++ b/netwerk/base/src/nsAsyncRedirectVerifyHelper.cpp @@ -200,7 +200,7 @@ nsAsyncRedirectVerifyHelper::ExplicitCallback(nsresult result) if (!callback || !mCallbackThread) { LOG(("nsAsyncRedirectVerifyHelper::ExplicitCallback() " - "callback=%p mCallbackThread=%p", callback, mCallbackThread)); + "callback=%p mCallbackThread=%p", callback.get(), mCallbackThread.get())); return; } @@ -289,4 +289,4 @@ nsAsyncRedirectVerifyHelper::IsOldChannelCanceled() } return false; -} \ No newline at end of file +} diff --git a/netwerk/cookie/nsCookieService.cpp b/netwerk/cookie/nsCookieService.cpp index b5a8fb789bba..ed105a3991ad 100644 --- a/netwerk/cookie/nsCookieService.cpp +++ b/netwerk/cookie/nsCookieService.cpp @@ -39,6 +39,12 @@ * * ***** END LICENSE BLOCK ***** */ + +#ifdef MOZ_LOGGING +// this next define has to appear before the include of prlog.h +#define FORCE_PR_LOG // Allow logging in the release build +#endif + #ifdef MOZ_IPC #include "mozilla/net/CookieServiceChild.h" #include "mozilla/net/NeckoCommon.h" @@ -204,8 +210,6 @@ struct nsEnumerationData // set NSPR_LOG_MODULES=cookie:4 -- shows accepted and rejected cookies // set NSPR_LOG_FILE=cookie.log // -// this next define has to appear before the include of prlog.h -#define FORCE_PR_LOG // Allow logging in the release build #include "prlog.h" #endif diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp index 64f8d2494954..3334a0cf996e 100644 --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp @@ -1708,8 +1708,10 @@ nsNSSComponent::InitializeNSS(PRBool showWarningBox) SSL_OptionSetDefault(SSL_ENABLE_RENEGOTIATION, enabled ? SSL_RENEGOTIATE_UNRESTRICTED : SSL_RENEGOTIATE_REQUIRES_XTN); +#ifdef SSL_ENABLE_FALSE_START // Requires NSS 3.12.8 mPrefBranch->GetBoolPref("security.ssl.enable_false_start", &enabled); SSL_OptionSetDefault(SSL_ENABLE_FALSE_START, enabled); +#endif // Disable any ciphers that NSS might have enabled by default for (PRUint16 i = 0; i < SSL_NumImplementedCiphers; ++i) @@ -2238,9 +2240,11 @@ nsNSSComponent::Observe(nsISupports *aSubject, const char *aTopic, PRInt32 warnLevel = 1; mPrefBranch->GetIntPref("security.ssl.warn_missing_rfc5746", &warnLevel); nsSSLIOLayerHelpers::setWarnLevelMissingRFC5746(warnLevel); +#ifdef SSL_ENABLE_FALSE_START // Requires NSS 3.12.8 } else if (prefName.Equals("security.ssl.enable_false_start")) { mPrefBranch->GetBoolPref("security.ssl.enable_false_start", &enabled); SSL_OptionSetDefault(SSL_ENABLE_FALSE_START, enabled); +#endif } else if (prefName.Equals("security.OCSP.enabled") || prefName.Equals("security.OCSP.require")) { setOCSPOptions(mPrefBranch); diff --git a/storage/public/mozIStorageStatement.idl b/storage/public/mozIStorageStatement.idl index f74eacbec9d4..4af59ac2441c 100644 --- a/storage/public/mozIStorageStatement.idl +++ b/storage/public/mozIStorageStatement.idl @@ -264,44 +264,61 @@ interface mozIStorageStatement : mozIStorageBaseStatement { */ inline PRInt32 AsInt32(PRUint32 idx) { - PRInt32 v; - GetInt32(idx, &v); + PRInt32 v = 0; + nsresult rv = GetInt32(idx, &v); + NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv) || IsNull(idx), + "Getting value failed, wrong column index?"); return v; } inline PRInt64 AsInt64(PRUint32 idx) { - PRInt64 v; - GetInt64(idx, &v); + PRInt64 v = 0; + nsresult rv = GetInt64(idx, &v); + NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv) || IsNull(idx), + "Getting value failed, wrong column index?"); return v; } inline double AsDouble(PRUint32 idx) { - double v; - GetDouble(idx, &v); + double v = 0.0; + nsresult rv = GetDouble(idx, &v); + NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv) || IsNull(idx), + "Getting value failed, wrong column index?"); return v; } inline const char* AsSharedUTF8String(PRUint32 idx, PRUint32 *len) { const char *str = nsnull; - GetSharedUTF8String(idx, len, &str); + *len = 0; + nsresult rv = GetSharedUTF8String(idx, len, &str); + NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv) || IsNull(idx), + "Getting value failed, wrong column index?"); return str; } inline const PRUnichar* AsSharedWString(PRUint32 idx, PRUint32 *len) { const PRUnichar *str = nsnull; - GetSharedString(idx, len, &str); + *len = 0; + nsresult rv = GetSharedString(idx, len, &str); + NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv) || IsNull(idx), + "Getting value failed, wrong column index?"); return str; } inline const PRUint8* AsSharedBlob(PRUint32 idx, PRUint32 *len) { const PRUint8 *blob = nsnull; - GetSharedBlob(idx, len, &blob); + *len = 0; + nsresult rv = GetSharedBlob(idx, len, &blob); + NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv) || IsNull(idx), + "Getting value failed, wrong column index?"); return blob; } inline PRBool IsNull(PRUint32 idx) { PRBool b = PR_FALSE; - GetIsNull(idx, &b); + nsresult rv = GetIsNull(idx, &b); + NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv), + "Getting value failed, wrong column index?"); return b; } diff --git a/storage/public/mozIStorageValueArray.idl b/storage/public/mozIStorageValueArray.idl index c43b9466465a..69f3bf85fe0d 100644 --- a/storage/public/mozIStorageValueArray.idl +++ b/storage/public/mozIStorageValueArray.idl @@ -110,44 +110,61 @@ interface mozIStorageValueArray : nsISupports { */ inline PRInt32 AsInt32(PRUint32 idx) { - PRInt32 v; - GetInt32(idx, &v); + PRInt32 v = 0; + nsresult rv = GetInt32(idx, &v); + NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv) || IsNull(idx), + "Getting value failed, wrong column index?"); return v; } inline PRInt64 AsInt64(PRUint32 idx) { - PRInt64 v; - GetInt64(idx, &v); + PRInt64 v = 0; + nsresult rv = GetInt64(idx, &v); + NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv) || IsNull(idx), + "Getting value failed, wrong column index?"); return v; } inline double AsDouble(PRUint32 idx) { - double v; - GetDouble(idx, &v); + double v = 0.0; + nsresult rv = GetDouble(idx, &v); + NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv) || IsNull(idx), + "Getting value failed, wrong column index?"); return v; } inline const char* AsSharedUTF8String(PRUint32 idx, PRUint32 *len) { const char *str = nsnull; - GetSharedUTF8String(idx, len, &str); + *len = 0; + nsresult rv = GetSharedUTF8String(idx, len, &str); + NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv) || IsNull(idx), + "Getting value failed, wrong column index?"); return str; } inline const PRUnichar* AsSharedWString(PRUint32 idx, PRUint32 *len) { const PRUnichar *str = nsnull; - GetSharedString(idx, len, &str); + *len = 0; + nsresult rv = GetSharedString(idx, len, &str); + NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv) || IsNull(idx), + "Getting value failed, wrong column index?"); return str; } inline const PRUint8* AsSharedBlob(PRUint32 idx, PRUint32 *len) { const PRUint8 *blob = nsnull; - GetSharedBlob(idx, len, &blob); + *len = 0; + nsresult rv = GetSharedBlob(idx, len, &blob); + NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv) || IsNull(idx), + "Getting value failed, wrong column index?"); return blob; } inline PRBool IsNull(PRUint32 idx) { PRBool b = PR_FALSE; - GetIsNull(idx, &b); + nsresult rv = GetIsNull(idx, &b); + NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv), + "Getting value failed, wrong column index?"); return b; } diff --git a/storage/test/Makefile.in b/storage/test/Makefile.in index 194b97abc05d..389102e6cb50 100644 --- a/storage/test/Makefile.in +++ b/storage/test/Makefile.in @@ -56,6 +56,7 @@ CPP_UNIT_TESTS = \ test_true_async.cpp \ test_unlock_notify.cpp \ test_service_init_background_thread.cpp \ + test_AsXXX_helpers.cpp \ $(NULL) ifdef MOZ_DEBUG diff --git a/storage/test/storage_test_harness.h b/storage/test/storage_test_harness.h index 571da9774e0e..a54c6b56b08d 100644 --- a/storage/test/storage_test_harness.h +++ b/storage/test/storage_test_harness.h @@ -43,6 +43,14 @@ #include "nsDirectoryServiceDefs.h" #include "mozIStorageService.h" #include "mozIStorageConnection.h" +#include "mozIStorageStatementCallback.h" +#include "mozIStorageCompletionCallback.h" +#include "mozIStorageBindingParamsArray.h" +#include "mozIStorageBindingParams.h" +#include "mozIStorageAsyncStatement.h" +#include "mozIStorageStatement.h" +#include "mozIStoragePendingStatement.h" +#include "nsThreadUtils.h" static int gTotalTests = 0; static int gPassedTests = 0; @@ -109,3 +117,73 @@ getDatabase() do_check_success(rv); return conn.forget(); } + + +class AsyncStatementSpinner : public mozIStorageStatementCallback + , public mozIStorageCompletionCallback +{ +public: + NS_DECL_ISUPPORTS + NS_DECL_MOZISTORAGESTATEMENTCALLBACK + NS_DECL_MOZISTORAGECOMPLETIONCALLBACK + + AsyncStatementSpinner(); + + void SpinUntilCompleted(); + + PRUint16 completionReason; + +protected: + ~AsyncStatementSpinner() {} + volatile bool mCompleted; +}; + +NS_IMPL_ISUPPORTS2(AsyncStatementSpinner, + mozIStorageStatementCallback, + mozIStorageCompletionCallback) + +AsyncStatementSpinner::AsyncStatementSpinner() +: completionReason(0) +, mCompleted(false) +{ +} + +NS_IMETHODIMP +AsyncStatementSpinner::HandleResult(mozIStorageResultSet *aResultSet) +{ + return NS_OK; +} + +NS_IMETHODIMP +AsyncStatementSpinner::HandleError(mozIStorageError *aError) +{ + return NS_OK; +} + +NS_IMETHODIMP +AsyncStatementSpinner::HandleCompletion(PRUint16 aReason) +{ + completionReason = aReason; + mCompleted = true; + return NS_OK; +} + +NS_IMETHODIMP +AsyncStatementSpinner::Complete() +{ + mCompleted = true; + return NS_OK; +} + +void AsyncStatementSpinner::SpinUntilCompleted() +{ + nsCOMPtr thread(::do_GetCurrentThread()); + nsresult rv = NS_OK; + PRBool processed = PR_TRUE; + while (!mCompleted && NS_SUCCEEDED(rv)) { + rv = thread->ProcessNextEvent(true, &processed); + } +} + +#define NS_DECL_ASYNCSTATEMENTSPINNER \ + NS_IMETHOD HandleResult(mozIStorageResultSet *aResultSet); diff --git a/storage/test/test_AsXXX_helpers.cpp b/storage/test/test_AsXXX_helpers.cpp new file mode 100644 index 000000000000..897dac93c0b8 --- /dev/null +++ b/storage/test/test_AsXXX_helpers.cpp @@ -0,0 +1,123 @@ +/* + *Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ + */ + +#include "storage_test_harness.h" +#include "mozIStorageRow.h" +#include "mozIStorageResultSet.h" + +/** + * This file tests AsXXX (AsInt32, AsInt64, ...) helpers. + */ + +//////////////////////////////////////////////////////////////////////////////// +//// Event Loop Spinning + +class Spinner : public AsyncStatementSpinner +{ +public: + NS_DECL_ISUPPORTS + NS_DECL_ASYNCSTATEMENTSPINNER + Spinner() {} +}; + +NS_IMPL_ISUPPORTS_INHERITED0(Spinner, + AsyncStatementSpinner) + +NS_IMETHODIMP +Spinner::HandleResult(mozIStorageResultSet *aResultSet) +{ + nsCOMPtr row; + do_check_true(NS_SUCCEEDED(aResultSet->GetNextRow(getter_AddRefs(row))) && row); + + do_check_eq(row->AsInt32(0), 0); + do_check_eq(row->AsInt64(0), 0); + do_check_eq(row->AsDouble(0), 0.0); + + PRUint32 len = 100; + do_check_eq(row->AsSharedUTF8String(0, &len), nsnull); + do_check_eq(len, 0); + len = 100; + do_check_eq(row->AsSharedWString(0, &len), nsnull); + do_check_eq(len, 0); + len = 100; + do_check_eq(row->AsSharedBlob(0, &len), nsnull); + do_check_eq(len, 0); + + do_check_eq(row->IsNull(0), PR_TRUE); + return NS_OK; +} + +void +test_NULLFallback() +{ + nsCOMPtr db(getMemoryDatabase()); + + nsCOMPtr stmt; + (void)db->CreateStatement(NS_LITERAL_CSTRING( + "SELECT NULL" + ), getter_AddRefs(stmt)); + + nsCOMPtr valueArray = do_QueryInterface(stmt); + do_check_true(valueArray); + + PRBool hasMore; + do_check_true(NS_SUCCEEDED(stmt->ExecuteStep(&hasMore)) && hasMore); + + do_check_eq(stmt->AsInt32(0), 0); + do_check_eq(stmt->AsInt64(0), 0); + do_check_eq(stmt->AsDouble(0), 0.0); + PRUint32 len = 100; + do_check_eq(stmt->AsSharedUTF8String(0, &len), nsnull); + do_check_eq(len, 0); + len = 100; + do_check_eq(stmt->AsSharedWString(0, &len), nsnull); + do_check_eq(len, 0); + len = 100; + do_check_eq(stmt->AsSharedBlob(0, &len), nsnull); + do_check_eq(len, 0); + do_check_eq(stmt->IsNull(0), PR_TRUE); + + do_check_eq(valueArray->AsInt32(0), 0); + do_check_eq(valueArray->AsInt64(0), 0); + do_check_eq(valueArray->AsDouble(0), 0.0); + len = 100; + do_check_eq(valueArray->AsSharedUTF8String(0, &len), nsnull); + do_check_eq(len, 0); + len = 100; + do_check_eq(valueArray->AsSharedWString(0, &len), nsnull); + do_check_eq(len, 0); + len = 100; + do_check_eq(valueArray->AsSharedBlob(0, &len), nsnull); + do_check_eq(len, 0); + do_check_eq(valueArray->IsNull(0), PR_TRUE); +} + +void +test_asyncNULLFallback() +{ + nsCOMPtr db(getMemoryDatabase()); + + nsCOMPtr stmt; + (void)db->CreateStatement(NS_LITERAL_CSTRING( + "SELECT NULL" + ), getter_AddRefs(stmt)); + + nsRefPtr asyncSpin(new Spinner()); + nsCOMPtr pendingStmt; + do_check_true(NS_SUCCEEDED(stmt->ExecuteAsync(asyncSpin, getter_AddRefs(pendingStmt)))); + do_check_true(pendingStmt); + asyncSpin->SpinUntilCompleted(); + +} + +void (*gTests[])(void) = { + test_NULLFallback +, test_asyncNULLFallback +}; + +const char *file = __FILE__; +#define TEST_NAME "AsXXX helpers" +#define TEST_FILE file +#include "storage_test_harness_tail.h" diff --git a/storage/test/test_true_async.cpp b/storage/test/test_true_async.cpp index ddb52c9930e7..f05018a4b177 100644 --- a/storage/test/test_true_async.cpp +++ b/storage/test/test_true_async.cpp @@ -38,22 +38,12 @@ #include "storage_test_harness.h" #include "prthread.h" -#include "nsIThread.h" -#include "nsThreadUtils.h" #include "nsIEventTarget.h" #include "sqlite3.h" #include "mozilla/Monitor.h" -#include "mozIStorageStatementCallback.h" -#include "mozIStorageCompletionCallback.h" -#include "mozIStorageBindingParamsArray.h" -#include "mozIStorageBindingParams.h" -#include "mozIStorageAsyncStatement.h" -#include "mozIStorageStatement.h" -#include "mozIStoragePendingStatement.h" - using mozilla::Monitor; using mozilla::MonitorAutoEnter; @@ -135,75 +125,6 @@ void watch_for_mutex_use_on_this_thread() } -//////////////////////////////////////////////////////////////////////////////// -//// Event Loop Spinning - -class AsyncStatementSpinner : public mozIStorageStatementCallback, - public mozIStorageCompletionCallback -{ -public: - NS_DECL_ISUPPORTS - NS_DECL_MOZISTORAGESTATEMENTCALLBACK - NS_DECL_MOZISTORAGECOMPLETIONCALLBACK - - AsyncStatementSpinner(); - - void SpinUntilCompleted(); - - PRUint16 completionReason; - -private: - ~AsyncStatementSpinner() {} - volatile bool mCompleted; -}; - -NS_IMPL_ISUPPORTS2(AsyncStatementSpinner, - mozIStorageStatementCallback, - mozIStorageCompletionCallback) - -AsyncStatementSpinner::AsyncStatementSpinner() -: completionReason(0) -, mCompleted(false) -{ -} - -NS_IMETHODIMP -AsyncStatementSpinner::HandleResult(mozIStorageResultSet *aResultSet) -{ - return NS_OK; -} - -NS_IMETHODIMP -AsyncStatementSpinner::HandleError(mozIStorageError *aError) -{ - return NS_OK; -} - -NS_IMETHODIMP -AsyncStatementSpinner::HandleCompletion(PRUint16 aReason) -{ - completionReason = aReason; - mCompleted = true; - return NS_OK; -} - -NS_IMETHODIMP -AsyncStatementSpinner::Complete() -{ - mCompleted = true; - return NS_OK; -} - -void AsyncStatementSpinner::SpinUntilCompleted() -{ - nsCOMPtr thread(::do_GetCurrentThread()); - nsresult rv = NS_OK; - PRBool processed = PR_TRUE; - while (!mCompleted && NS_SUCCEEDED(rv)) { - rv = thread->ProcessNextEvent(true, &processed); - } -} - //////////////////////////////////////////////////////////////////////////////// //// Thread Wedgers diff --git a/testing/mochitest/tests/SimpleTest/SimpleTest.js b/testing/mochitest/tests/SimpleTest/SimpleTest.js index 51a86b696993..c72448d94b30 100644 --- a/testing/mochitest/tests/SimpleTest/SimpleTest.js +++ b/testing/mochitest/tests/SimpleTest/SimpleTest.js @@ -298,13 +298,18 @@ SimpleTest.waitForFocus = function (callback, targetWindow, expectBlankPage) { fm.getFocusedElementForWindow(targetWindow, true, childTargetWindow); childTargetWindow = childTargetWindow.value; + function info(msg) { + if (SimpleTest._logEnabled) + SimpleTest._logResult({result: true, name: msg}, "TEST-INFO"); + } + function debugFocusLog(prefix) { netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); var baseWindow = targetWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor) .getInterface(Components.interfaces.nsIWebNavigation) .QueryInterface(Components.interfaces.nsIBaseWindow); - SimpleTest.ok(true, prefix + " -- loaded: " + targetWindow.document.readyState + + info(prefix + " -- loaded: " + targetWindow.document.readyState + " active window: " + (fm.activeWindow ? "(" + fm.activeWindow + ") " + fm.activeWindow.location : "") + " focused window: " + @@ -355,7 +360,7 @@ SimpleTest.waitForFocus = function (callback, targetWindow, expectBlankPage) { (expectBlankPage == (targetWindow.location == "about:blank")) && targetWindow.document.readyState == "complete"; if (!SimpleTest.waitForFocus_loaded) { - SimpleTest.ok(true, "must wait for load"); + info("must wait for load"); targetWindow.addEventListener("load", waitForEvent, true); } @@ -369,12 +374,12 @@ SimpleTest.waitForFocus = function (callback, targetWindow, expectBlankPage) { // If this is a child frame, ensure that the frame is focused. SimpleTest.waitForFocus_focused = (focusedChildWindow == childTargetWindow); if (SimpleTest.waitForFocus_focused) { - SimpleTest.ok(true, "already focused"); + info("already focused"); // If the frame is already focused and loaded, call the callback directly. maybeRunTests(); } else { - SimpleTest.ok(true, "must wait for focus"); + info("must wait for focus"); childTargetWindow.addEventListener("focus", waitForEvent, true); childTargetWindow.focus(); } diff --git a/toolkit/components/ctypes/ctypes.cpp b/toolkit/components/ctypes/ctypes.cpp index d6b8102c25f0..0a02deb3cb54 100644 --- a/toolkit/components/ctypes/ctypes.cpp +++ b/toolkit/components/ctypes/ctypes.cpp @@ -113,7 +113,10 @@ Module::Call(nsIXPConnectWrappedNative* wrapper, jsval* vp, PRBool* _retval) { - JSObject* global = JS_GetGlobalObject(cx); + JSObject* global = JS_GetGlobalForScopeChain(cx); + if (!global) + return NS_ERROR_NOT_AVAILABLE; + *_retval = InitAndSealCTypesClass(cx, global); return NS_OK; } diff --git a/toolkit/components/ctypes/tests/Makefile.in b/toolkit/components/ctypes/tests/Makefile.in index 43d6e329edca..09e88d6b5b1b 100644 --- a/toolkit/components/ctypes/tests/Makefile.in +++ b/toolkit/components/ctypes/tests/Makefile.in @@ -57,7 +57,7 @@ LOCAL_INCLUDES = \ EXTRA_DSO_LDOPTS += \ $(XPCOM_STANDALONE_GLUE_LDOPTS) \ - -L$(LIBXUL_DIST)/lib $(MOZALLOC_LIB) \ + $(MOZALLOC_LIB) \ $(NSPR_LIBS) \ $(NULL) diff --git a/toolkit/components/ctypes/tests/jsctypes-test.cpp b/toolkit/components/ctypes/tests/jsctypes-test.cpp index 728edb47edfc..da5a82e2ecec 100644 --- a/toolkit/components/ctypes/tests/jsctypes-test.cpp +++ b/toolkit/components/ctypes/tests/jsctypes-test.cpp @@ -75,39 +75,39 @@ test_void_t_cdecl() return; } -#define DEFINE_TYPE(name, type, ffiType) \ +#define FUNCTION_TESTS(name, type, ffiType, suffix) \ type ABI \ -get_##name##_cdecl() \ +get_##name##_##suffix() \ { \ return ValueTraits::literal(); \ } \ \ type ABI \ -set_##name##_cdecl(type x) \ +set_##name##_##suffix(type x) \ { \ return x; \ } \ \ type ABI \ -sum_##name##_cdecl(type x, type y) \ +sum_##name##_##suffix(type x, type y) \ { \ return ValueTraits::sum(x, y); \ } \ \ type ABI \ -sum_alignb_##name##_cdecl(char a, type x, char b, type y, char c) \ +sum_alignb_##name##_##suffix(char a, type x, char b, type y, char c) \ { \ return ValueTraits::sum(x, y); \ } \ \ type ABI \ -sum_alignf_##name##_cdecl(float a, type x, float b, type y, float c) \ +sum_alignf_##name##_##suffix(float a, type x, float b, type y, float c) \ { \ return ValueTraits::sum(x, y); \ } \ \ type ABI \ -sum_many_##name##_cdecl( \ +sum_many_##name##_##suffix( \ type a, type b, type c, type d, type e, type f, type g, type h, type i, \ type j, type k, type l, type m, type n, type o, type p, type q, type r) \ { \ @@ -116,6 +116,7 @@ sum_many_##name##_cdecl( \ } #define ABI /* cdecl */ +#define DEFINE_TYPE(x, y, z) FUNCTION_TESTS(x, y, z, cdecl) #include "typedefs.h" #undef ABI @@ -129,6 +130,7 @@ test_void_t_stdcall() } #define ABI NS_STDCALL +#define DEFINE_TYPE(x, y, z) FUNCTION_TESTS(x, y, z, stdcall) #include "typedefs.h" #undef ABI diff --git a/toolkit/components/ctypes/tests/unit/test_jsctypes.js.in b/toolkit/components/ctypes/tests/unit/test_jsctypes.js.in index 0d34040c5369..3f31a2e9eec4 100644 --- a/toolkit/components/ctypes/tests/unit/test_jsctypes.js.in +++ b/toolkit/components/ctypes/tests/unit/test_jsctypes.js.in @@ -653,11 +653,18 @@ function run_UInt64_tests() { function run_basic_abi_tests(library, t, name, toprimitive, get_test, set_tests, sum_tests, sum_many_tests) { // Test the function call ABI for calls involving the type. - run_single_abi_tests(library, ctypes.default_abi, t, name + "_cdecl", + function declare_fn_cdecl(fn_t, prefix) { + return library.declare(prefix + name + "_cdecl", fn_t); + } + run_single_abi_tests(declare_fn_cdecl, ctypes.default_abi, t, toprimitive, get_test, set_tests, sum_tests, sum_many_tests); -#ifdef _WIN32 -#ifndef _WIN64 - run_single_abi_tests(library, ctypes.stdcall_abi, t, name + "_stdcall", + +#ifdef WIN32 +#ifndef HAVE_64BIT_OS + function declare_fn_stdcall(fn_t, prefix) { + return library.declare(prefix + name + "_stdcall", fn_t); + } + run_single_abi_tests(declare_fn_stdcall, ctypes.stdcall_abi, t, toprimitive, get_test, set_tests, sum_tests, sum_many_tests); #endif #endif @@ -667,23 +674,28 @@ function run_basic_abi_tests(library, t, name, toprimitive, check_struct_stats(library, t); } -function run_single_abi_tests(library, abi, t, name, toprimitive, +function run_single_abi_tests(decl, abi, t, toprimitive, get_test, set_tests, sum_tests, sum_many_tests) { - let getter = library.declare("get_" + name, abi, t); + let getter_t = ctypes.FunctionType(abi, t).ptr; + let getter = decl(getter_t, "get_"); do_check_eq(toprimitive(getter()), get_test); - let setter = library.declare("set_" + name, ctypes.default_abi, t, t); + let setter_t = ctypes.FunctionType(abi, t, [t]).ptr; + let setter = decl(setter_t, "set_"); for each (let i in set_tests) do_check_eq(toprimitive(setter(i)), i); - let sum = library.declare("sum_" + name, ctypes.default_abi, t, t, t); + let sum_t = ctypes.FunctionType(abi, t, [t, t]).ptr; + let sum = decl(sum_t, "sum_"); for each (let a in sum_tests) do_check_eq(toprimitive(sum(a[0], a[1])), a[2]); - let sum_alignb = library.declare("sum_alignb_" + name, ctypes.default_abi, t, - ctypes.char, t, ctypes.char, t, ctypes.char); - let sum_alignf = library.declare("sum_alignf_" + name, ctypes.default_abi, t, - ctypes.float, t, ctypes.float, t, ctypes.float); + let sum_alignb_t = ctypes.FunctionType(abi, t, + [ctypes.char, t, ctypes.char, t, ctypes.char]).ptr; + let sum_alignb = decl(sum_alignb_t, "sum_alignb_"); + let sum_alignf_t = ctypes.FunctionType(abi, t, + [ctypes.float, t, ctypes.float, t, ctypes.float]).ptr; + let sum_alignf = decl(sum_alignf_t, "sum_alignf_"); for each (let a in sum_tests) { do_check_eq(toprimitive(sum_alignb(0, a[0], 0, a[1], 0)), a[2]); do_check_eq(toprimitive(sum_alignb(1, a[0], 1, a[1], 1)), a[2]); @@ -691,13 +703,14 @@ function run_single_abi_tests(library, abi, t, name, toprimitive, do_check_eq(toprimitive(sum_alignf(1, a[0], 1, a[1], 1)), a[2]); } - let sum_many = library.declare("sum_many_" + name, ctypes.default_abi, t, - t, t, t, t, t, t, t, t, t, t, t, t, t, t, t, t, t, t); + let sum_many_t = ctypes.FunctionType(abi, t, + [t, t, t, t, t, t, t, t, t, t, t, t, t, t, t, t, t, t]).ptr; + let sum_many = decl(sum_many_t, "sum_many_"); for each (let a in sum_many_tests) - do_check_eq(toprimitive( - sum_many(a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], - a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15], - a[16], a[17])), a[18]); + do_check_eq( + toprimitive(sum_many(a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], + a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15], + a[16], a[17])), a[18]); } function check_struct_stats(library, t) { @@ -1824,11 +1837,11 @@ function run_FunctionType_tests() { ctypes.char.ptr.array().ptr).ptr.ptr.array(8).array(); do_check_eq(f3_t.name, "char*(*(**[][8])())[]"); -#ifdef _WIN32 -#ifndef _WIN64 +#ifdef WIN32 +#ifndef HAVE_64BIT_OS f3_t = ctypes.FunctionType(ctypes.stdcall_abi, - ctypes.char.ptr.array().ptr).ptr.array(8).array(); - do_check_eq(f3_t.ptr.name, "char*(__stdcall *(**[][8])())[]"); + ctypes.char.ptr.array().ptr).ptr.ptr.array(8).array(); + do_check_eq(f3_t.name, "char*(*(__stdcall **[][8])())[]"); #endif #endif @@ -2016,8 +2029,8 @@ function run_void_tests(library) { library.declare("test_void_t_cdecl", ctypes.default_abi, ctypes.void_t, ctypes.void_t); }, Error); -#ifdef _WIN32 -#ifndef _WIN64 +#ifdef WIN32 +#ifndef HAVE_64BIT_OS test_void_t = library.declare("test_void_t_stdcall", ctypes.stdcall_abi, ctypes.void_t); do_check_eq(test_void_t(), undefined); #endif @@ -2170,8 +2183,8 @@ function run_function_tests(library) function run_closure_tests(library) { run_single_closure_tests(library, ctypes.default_abi, "cdecl"); -#ifdef _WIN32 -#ifndef _WIN64 +#ifdef WIN32 +#ifndef HAVE_64BIT_OS run_single_closure_tests(library, ctypes.stdcall_abi, "stdcall"); #endif #endif @@ -2233,8 +2246,8 @@ function run_variadic_tests(library) { ctypes.FunctionType(ctypes.default_abi, ctypes.bool, ["..."]); }, Error); -#ifdef _WIN32 -#ifndef _WIN64 +#ifdef WIN32 +#ifndef HAVE_64BIT_OS do_check_throws(function() { ctypes.FunctionType(ctypes.stdcall_abi, ctypes.bool, [ctypes.bool, "..."]); diff --git a/toolkit/components/places/src/AsyncFaviconHelpers.cpp b/toolkit/components/places/src/AsyncFaviconHelpers.cpp index f670c5a323af..661f2eab01a6 100644 --- a/toolkit/components/places/src/AsyncFaviconHelpers.cpp +++ b/toolkit/components/places/src/AsyncFaviconHelpers.cpp @@ -472,16 +472,23 @@ FetchDatabaseIconStep::HandleResult(mozIStorageResultSet* aResultSet) // is in the query to mimic mDBGetIconInfo. // Indeed in future we could want to retain only one statement. - rv = row->GetInt64(2, &mStepper->mExpiration); - FAVICONSTEP_FAIL_IF_FALSE_RV(NS_SUCCEEDED(rv), rv); + PRBool isNull; + rv = row->GetIsNull(2, &isNull); + if (!isNull) { + rv = row->GetInt64(2, &mStepper->mExpiration); + FAVICONSTEP_FAIL_IF_FALSE_RV(NS_SUCCEEDED(rv), rv); + } - PRUint8* data; - PRUint32 dataLen = 0; - rv = row->GetBlob(3, &dataLen, &data); - FAVICONSTEP_FAIL_IF_FALSE_RV(NS_SUCCEEDED(rv), rv); - mStepper->mData.Adopt(TO_CHARBUFFER(data), dataLen); - rv = row->GetUTF8String(4, mStepper->mMimeType); - FAVICONSTEP_FAIL_IF_FALSE_RV(NS_SUCCEEDED(rv), rv); + rv = row->GetIsNull(3, &isNull); + if (!isNull) { + PRUint8* data; + PRUint32 dataLen = 0; + rv = row->GetBlob(3, &dataLen, &data); + FAVICONSTEP_FAIL_IF_FALSE_RV(NS_SUCCEEDED(rv), rv); + mStepper->mData.Adopt(TO_CHARBUFFER(data), dataLen); + rv = row->GetUTF8String(4, mStepper->mMimeType); + FAVICONSTEP_FAIL_IF_FALSE_RV(NS_SUCCEEDED(rv), rv); + } PRInt32 isRevisit; rv = row->GetInt32(5, &isRevisit); diff --git a/toolkit/components/places/src/nsNavHistory.cpp b/toolkit/components/places/src/nsNavHistory.cpp index e6a88ecce60d..8bedf32fed2c 100644 --- a/toolkit/components/places/src/nsNavHistory.cpp +++ b/toolkit/components/places/src/nsNavHistory.cpp @@ -310,22 +310,45 @@ protected: nsNavHistory& mNavHistory; }; -class PlacesEvent : public nsRunnable { - public: - PlacesEvent(const char* aTopic) { - mTopic = aTopic; + +class PlacesEvent : public nsRunnable +{ +public: + PlacesEvent(const char* aTopic) + : mTopic(aTopic) + , mDoubleEnqueue(false) + { } - NS_IMETHOD Run() { - nsCOMPtr observerService = - do_GetService(NS_OBSERVERSERVICE_CONTRACTID); - if (observerService) - (void)observerService->NotifyObservers(nsnull, mTopic, nsnull); + PlacesEvent(const char* aTopic, + bool aDoubleEnqueue) + : mTopic(aTopic) + , mDoubleEnqueue(aDoubleEnqueue) + { + } + NS_IMETHODIMP Run() + { + Notify(); return NS_OK; } - protected: + +protected: + void Notify() + { + if (mDoubleEnqueue) { + mDoubleEnqueue = false; + (void)NS_DispatchToMainThread(this); + } + else { + nsCOMPtr obs = mozilla::services::GetObserverService(); + if (obs) + (void)obs->NotifyObservers(nsnull, mTopic, nsnull); + } + } + const char* mTopic; + bool mDoubleEnqueue; }; } // anonymouse namespace @@ -5691,9 +5714,12 @@ nsNavHistory::Observe(nsISupports *aSubject, const char *aTopic, "Unable to shutdown Places: message dispatch failed."); // Once everybody has been notified, proceed with the real shutdown. + // Note: PlacesEvent contains special code to double enqueue this + // notification because we must ensure any enqueued work from observers + // is complete before going on. (void)os->AddObserver(this, TOPIC_PLACES_TEARDOWN, PR_FALSE); nsRefPtr teardownEvent = - new PlacesEvent(TOPIC_PLACES_TEARDOWN); + new PlacesEvent(TOPIC_PLACES_TEARDOWN, true); rv = NS_DispatchToMainThread(teardownEvent); NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Unable to shutdown Places: message dispatch failed."); diff --git a/toolkit/components/places/src/nsPlacesAutoComplete.js b/toolkit/components/places/src/nsPlacesAutoComplete.js index 0b697ef6aa35..3d73eadd5419 100644 --- a/toolkit/components/places/src/nsPlacesAutoComplete.js +++ b/toolkit/components/places/src/nsPlacesAutoComplete.js @@ -497,7 +497,8 @@ nsPlacesAutoComplete.prototype = { handleError: function PAC_handleError(aError) { - Components.utils.reportError("Places AutoComplete: " + aError); + Cu.reportError("Places AutoComplete: An async statement encountered an " + + "error: " + aError.result + ", '" + aError.message + "'"); }, handleCompletion: function PAC_handleCompletion(aReason) diff --git a/toolkit/components/remote/Makefile.in b/toolkit/components/remote/Makefile.in index 4ad715edf745..6f48e4143cb5 100644 --- a/toolkit/components/remote/Makefile.in +++ b/toolkit/components/remote/Makefile.in @@ -54,6 +54,7 @@ LIBXUL_LIBRARY = 1 XPIDLSRCS = nsIRemoteService.idl +CPPSRCS += nsXRemoteService.cpp ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT))) CPPSRCS += nsGTKRemoteService.cpp endif diff --git a/toolkit/components/remote/nsGTKRemoteService.cpp b/toolkit/components/remote/nsGTKRemoteService.cpp index aad9b35a173f..9ef880d6df0b 100644 --- a/toolkit/components/remote/nsGTKRemoteService.cpp +++ b/toolkit/components/remote/nsGTKRemoteService.cpp @@ -24,6 +24,7 @@ * Contributor(s): * Christopher Blizzard * Benjamin Smedberg + * Miika Jarvinen * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -41,8 +42,6 @@ #include "nsGTKRemoteService.h" -#include // for XA_STRING -#include #include #include #include @@ -51,8 +50,6 @@ #include "nsIDocShell.h" #include "nsPIDOMWindow.h" #include "mozilla/ModuleUtils.h" -#include "nsILocalFile.h" -#include "nsIObserverService.h" #include "nsIServiceManager.h" #include "nsIWeakReference.h" #include "nsIWidget.h" @@ -60,36 +57,8 @@ #include "nsAppShellCID.h" #include "nsCOMPtr.h" -#include "nsString.h" -#include "prprf.h" -#include "prenv.h" -#include "nsCRT.h" -#ifdef MOZ_WIDGET_GTK2 #include "nsGTKToolkit.h" -#endif - -#include "nsICommandLineRunner.h" -#include "nsXULAppAPI.h" - -#define MOZILLA_VERSION_PROP "_MOZILLA_VERSION" -#define MOZILLA_LOCK_PROP "_MOZILLA_LOCK" -#define MOZILLA_COMMAND_PROP "_MOZILLA_COMMAND" -#define MOZILLA_RESPONSE_PROP "_MOZILLA_RESPONSE" -#define MOZILLA_USER_PROP "_MOZILLA_USER" -#define MOZILLA_PROFILE_PROP "_MOZILLA_PROFILE" -#define MOZILLA_PROGRAM_PROP "_MOZILLA_PROGRAM" -#define MOZILLA_COMMANDLINE_PROP "_MOZILLA_COMMANDLINE" - -#ifdef IS_BIG_ENDIAN -#define TO_LITTLE_ENDIAN32(x) \ - ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \ - (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) -#else -#define TO_LITTLE_ENDIAN32(x) (x) -#endif - -const unsigned char kRemoteVersion[] = "5.1"; NS_IMPL_ISUPPORTS2(nsGTKRemoteService, nsIRemoteService, @@ -99,14 +68,11 @@ NS_IMETHODIMP nsGTKRemoteService::Startup(const char* aAppName, const char* aProfileName) { NS_ASSERTION(aAppName, "Don't pass a null appname!"); + sRemoteImplementation = this; - EnsureAtoms(); if (mServerWindow) return NS_ERROR_ALREADY_INITIALIZED; - mAppName = aAppName; - ToLowerCase(mAppName); - - mProfileName = aProfileName; + XRemoteBaseStartup(aAppName, aProfileName); mServerWindow = gtk_invisible_new(); gtk_widget_realize(mServerWindow); @@ -117,13 +83,6 @@ nsGTKRemoteService::Startup(const char* aAppName, const char* aProfileName) mWindows.EnumerateRead(StartupHandler, this); - nsCOMPtr obs - (do_GetService("@mozilla.org/observer-service;1")); - if (obs) { - obs->AddObserver(this, "xpcom-shutdown", PR_FALSE); - obs->AddObserver(this, "quit-application", PR_FALSE); - } - return NS_OK; } @@ -154,7 +113,6 @@ static nsIWidget* GetMainWidget(nsIDOMWindow* aWindow) return mainWidget; } -#ifdef MOZ_WIDGET_GTK2 static nsGTKToolkit* GetGTKToolkit() { nsCOMPtr svc = do_GetService(NS_APPSHELLSERVICE_CONTRACTID); @@ -172,7 +130,6 @@ static nsGTKToolkit* GetGTKToolkit() return nsnull; return static_cast(toolkit); } -#endif NS_IMETHODIMP nsGTKRemoteService::RegisterWindow(nsIDOMWindow* aWindow) @@ -222,58 +179,14 @@ nsGTKRemoteService::Shutdown() return NS_OK; } -NS_IMETHODIMP -nsGTKRemoteService::Observe(nsISupports* aSubject, - const char *aTopic, - const PRUnichar *aData) -{ - // This can be xpcom-shutdown or quit-application, but it's the same either - // way. - Shutdown(); - return NS_OK; -} - -// Minimize the roundtrips to the X server by getting all the atoms at once -static char *XAtomNames[] = { - MOZILLA_VERSION_PROP, - MOZILLA_LOCK_PROP, - MOZILLA_COMMAND_PROP, - MOZILLA_RESPONSE_PROP, - MOZILLA_USER_PROP, - MOZILLA_PROFILE_PROP, - MOZILLA_PROGRAM_PROP, - MOZILLA_COMMANDLINE_PROP -}; -static Atom XAtoms[NS_ARRAY_LENGTH(XAtomNames)]; - -void -nsGTKRemoteService::EnsureAtoms(void) -{ - if (sMozVersionAtom) - return; - - XInternAtoms(GDK_DISPLAY(), XAtomNames, NS_ARRAY_LENGTH(XAtomNames), - False, XAtoms); - int i = 0; - sMozVersionAtom = XAtoms[i++]; - sMozLockAtom = XAtoms[i++]; - sMozCommandAtom = XAtoms[i++]; - sMozResponseAtom = XAtoms[i++]; - sMozUserAtom = XAtoms[i++]; - sMozProfileAtom = XAtoms[i++]; - sMozProgramAtom = XAtoms[i++]; - sMozCommandLineAtom = XAtoms[i++]; -} - // Set desktop startup ID to the passed ID, if there is one, so that any created // windows get created with the right window manager metadata, and any windows // that get new tabs and are activated also get the right WM metadata. // If there is no desktop startup ID, then use the X event's timestamp // for _NET_ACTIVE_WINDOW when the window gets focused or shown. -static void -SetDesktopStartupIDOrTimestamp(const nsACString& aDesktopStartupID, - PRUint32 aTimestamp) { -#ifdef MOZ_WIDGET_GTK2 +void +nsGTKRemoteService::SetDesktopStartupIDOrTimestamp(const nsACString& aDesktopStartupID, + PRUint32 aTimestamp) { nsGTKToolkit* toolkit = GetGTKToolkit(); if (!toolkit) return; @@ -282,321 +195,38 @@ SetDesktopStartupIDOrTimestamp(const nsACString& aDesktopStartupID, } else { toolkit->SetFocusTimestamp(aTimestamp); } -#endif } -static PRBool -FindExtensionParameterInCommand(const char* aParameterName, - const nsACString& aCommand, - char aSeparator, - nsACString* aValue) -{ - nsCAutoString searchFor; - searchFor.Append(aSeparator); - searchFor.Append(aParameterName); - searchFor.Append('='); - - nsACString::const_iterator start, end; - aCommand.BeginReading(start); - aCommand.EndReading(end); - if (!FindInReadable(searchFor, start, end)) - return PR_FALSE; - - nsACString::const_iterator charStart, charEnd; - charStart = end; - aCommand.EndReading(charEnd); - nsACString::const_iterator idStart = charStart, idEnd; - if (FindCharInReadable(aSeparator, charStart, charEnd)) { - idEnd = charStart; - } else { - idEnd = charEnd; - } - *aValue = nsDependentCSubstring(idStart, idEnd); - return PR_TRUE; -} - -const char* -nsGTKRemoteService::HandleCommand(char* aCommand, nsIDOMWindow* aWindow, - PRUint32 aTimestamp) -{ - nsresult rv; - - nsCOMPtr cmdline - (do_CreateInstance("@mozilla.org/toolkit/command-line;1", &rv)); - if (NS_FAILED(rv)) - return "509 internal error"; - - // 1) Make sure that it looks remotely valid with parens - // 2) Treat ping() immediately and specially - - nsCAutoString command(aCommand); - PRInt32 p1, p2; - p1 = command.FindChar('('); - p2 = command.FindChar(')'); - - if (p1 == kNotFound || p2 == kNotFound || p1 == 0 || p2 < p1) { - return "500 command not parseable"; - } - - command.Truncate(p1); - command.Trim(" ", PR_TRUE, PR_TRUE); - ToLowerCase(command); - - if (!command.EqualsLiteral("ping")) { - nsCAutoString desktopStartupID; - nsDependentCString cmd(aCommand); - FindExtensionParameterInCommand("DESKTOP_STARTUP_ID", - cmd, '\n', - &desktopStartupID); - - char* argv[3] = {"dummyappname", "-remote", aCommand}; - rv = cmdline->Init(3, argv, nsnull, nsICommandLine::STATE_REMOTE_EXPLICIT); - if (NS_FAILED(rv)) - return "509 internal error"; - - if (aWindow) - cmdline->SetWindowContext(aWindow); - - SetDesktopStartupIDOrTimestamp(desktopStartupID, aTimestamp); - - rv = cmdline->Run(); - if (NS_ERROR_ABORT == rv) - return "500 command not parseable"; - if (NS_FAILED(rv)) - return "509 internal error"; - } - - return "200 executed command"; -} - -const char* -nsGTKRemoteService::HandleCommandLine(char* aBuffer, nsIDOMWindow* aWindow, - PRUint32 aTimestamp) -{ - nsresult rv; - - nsCOMPtr cmdline - (do_CreateInstance("@mozilla.org/toolkit/command-line;1", &rv)); - if (NS_FAILED(rv)) - return "509 internal error"; - - // the commandline property is constructed as an array of PRInt32 - // followed by a series of null-terminated strings: - // - // [argc][offsetargv0][offsetargv1...]\0\0argv[1]...\0 - // (offset is from the beginning of the buffer) - - PRInt32 argc = TO_LITTLE_ENDIAN32(*reinterpret_cast(aBuffer)); - char *wd = aBuffer + ((argc + 1) * sizeof(PRInt32)); - - nsCOMPtr lf; - rv = NS_NewNativeLocalFile(nsDependentCString(wd), PR_TRUE, - getter_AddRefs(lf)); - if (NS_FAILED(rv)) - return "509 internal error"; - - nsCAutoString desktopStartupID; - - char **argv = (char**) malloc(sizeof(char*) * argc); - if (!argv) return "509 internal error"; - - PRInt32 *offset = reinterpret_cast(aBuffer) + 1; - - for (int i = 0; i < argc; ++i) { - argv[i] = aBuffer + TO_LITTLE_ENDIAN32(offset[i]); - - if (i == 0) { - nsDependentCString cmd(argv[0]); - FindExtensionParameterInCommand("DESKTOP_STARTUP_ID", - cmd, ' ', - &desktopStartupID); - } - } - - rv = cmdline->Init(argc, argv, lf, nsICommandLine::STATE_REMOTE_AUTO); - free (argv); - if (NS_FAILED(rv)) { - return "509 internal error"; - } - - if (aWindow) - cmdline->SetWindowContext(aWindow); - - SetDesktopStartupIDOrTimestamp(desktopStartupID, aTimestamp); - - rv = cmdline->Run(); - - if (NS_ERROR_ABORT == rv) - return "500 command not parseable"; - - if (NS_FAILED(rv)) - return "509 internal error"; - - return "200 executed command"; -} void nsGTKRemoteService::HandleCommandsFor(GtkWidget* widget, nsIWeakReference* aWindow) { -#ifdef MOZ_WIDGET_GTK2 g_signal_connect(G_OBJECT(widget), "property_notify_event", G_CALLBACK(HandlePropertyChange), aWindow); -#else // GTK+ - gtk_signal_connect(GTK_OBJECT(widget), "property_notify_event", - GTK_SIGNAL_FUNC(HandlePropertyChange), aWindow); -#endif gtk_widget_add_events(widget, GDK_PROPERTY_CHANGE_MASK); Window window = GDK_WINDOW_XWINDOW(widget->window); + nsXRemoteService::HandleCommandsFor(window); - // set our version - XChangeProperty(GDK_DISPLAY(), window, sMozVersionAtom, XA_STRING, - 8, PropModeReplace, kRemoteVersion, sizeof(kRemoteVersion) - 1); - - // get our username - unsigned char *logname; - logname = (unsigned char*) PR_GetEnv("LOGNAME"); - if (logname) { - // set the property on the window if it's available - XChangeProperty(GDK_DISPLAY(), window, sMozUserAtom, XA_STRING, - 8, PropModeReplace, logname, strlen((char*) logname)); - } - - XChangeProperty(GDK_DISPLAY(), window, sMozProgramAtom, XA_STRING, - 8, PropModeReplace, (unsigned char*) mAppName.get(), mAppName.Length()); - - if (!mProfileName.IsEmpty()) { - XChangeProperty(GDK_DISPLAY(), window, sMozProfileAtom, XA_STRING, - 8, PropModeReplace, (unsigned char*) mProfileName.get(), mProfileName.Length()); - } } -#ifdef MOZ_WIDGET_GTK2 -#define CMP_GATOM_XATOM(gatom,xatom) (gatom == gdk_x11_xatom_to_atom(xatom)) -#else -#define CMP_GATOM_XATOM(gatom,xatom) (gatom == xatom) -#endif - gboolean nsGTKRemoteService::HandlePropertyChange(GtkWidget *aWidget, GdkEventProperty *pevent, - nsIWeakReference* aThis) + nsIWeakReference *aThis) { - nsCOMPtr window (do_QueryReferent(aThis)); + if (pevent->state == GDK_PROPERTY_NEW_VALUE) { + Atom changedAtom = gdk_x11_atom_to_xatom(pevent->atom); - if (pevent->state == GDK_PROPERTY_NEW_VALUE && - CMP_GATOM_XATOM(pevent->atom, sMozCommandAtom)) { - - // We got a new command atom. - int result; - Atom actual_type; - int actual_format; - unsigned long nitems, bytes_after; - char *data = 0; - - result = XGetWindowProperty (GDK_DISPLAY(), - GDK_WINDOW_XWINDOW(pevent->window), - sMozCommandAtom, - 0, /* long_offset */ - (65536 / sizeof (long)), /* long_length */ - True, /* atomic delete after */ - XA_STRING, /* req_type */ - &actual_type, /* actual_type return */ - &actual_format, /* actual_format_return */ - &nitems, /* nitems_return */ - &bytes_after, /* bytes_after_return */ - (unsigned char **)&data); /* prop_return - (we only care - about the first ) */ - - // Failed to get property off the window? - if (result != Success) - return FALSE; - - // Failed to get the data off the window or it was the wrong type? - if (!data || !TO_LITTLE_ENDIAN32(*reinterpret_cast(data))) - return FALSE; - - // cool, we got the property data. - const char *response = HandleCommand(data, window, pevent->time); - - // put the property onto the window as the response - XChangeProperty (GDK_DISPLAY(), GDK_WINDOW_XWINDOW(pevent->window), - sMozResponseAtom, XA_STRING, - 8, PropModeReplace, (const unsigned char *)response, strlen (response)); - XFree(data); - return TRUE; + return HandleNewProperty(GDK_WINDOW_XWINDOW(pevent->window), + GDK_DISPLAY(), + pevent->time, changedAtom, aThis); } - - if (pevent->state == GDK_PROPERTY_NEW_VALUE && - CMP_GATOM_XATOM(pevent->atom, sMozCommandLineAtom)) { - - // We got a new commandline atom. - int result; - Atom actual_type; - int actual_format; - unsigned long nitems, bytes_after; - char *data = 0; - - result = XGetWindowProperty (GDK_DISPLAY(), - GDK_WINDOW_XWINDOW(pevent->window), - sMozCommandLineAtom, - 0, /* long_offset */ - (65536 / sizeof (long)), /* long_length */ - True, /* atomic delete after */ - XA_STRING, /* req_type */ - &actual_type, /* actual_type return */ - &actual_format, /* actual_format_return */ - &nitems, /* nitems_return */ - &bytes_after, /* bytes_after_return */ - (unsigned char **)&data); /* prop_return - (we only care - about the first ) */ - - // Failed to get property off the window? - if (result != Success) - return FALSE; - - // Failed to get the data off the window or it was the wrong type? - if (!data || !TO_LITTLE_ENDIAN32(*reinterpret_cast(data))) - return FALSE; - - // cool, we got the property data. - const char *response = HandleCommandLine(data, window, pevent->time); - - // put the property onto the window as the response - XChangeProperty (GDK_DISPLAY(), GDK_WINDOW_XWINDOW(pevent->window), - sMozResponseAtom, XA_STRING, - 8, PropModeReplace, (const unsigned char *)response, strlen (response)); - XFree(data); - return TRUE; - } - - if (pevent->state == GDK_PROPERTY_NEW_VALUE && - CMP_GATOM_XATOM(pevent->atom, sMozResponseAtom)) { - // client accepted the response. party on wayne. - return TRUE; - } - - if (pevent->state == GDK_PROPERTY_NEW_VALUE && - CMP_GATOM_XATOM(pevent->atom, sMozLockAtom)) { - // someone locked the window - return TRUE; - } - return FALSE; } -Atom nsGTKRemoteService::sMozVersionAtom; -Atom nsGTKRemoteService::sMozLockAtom; -Atom nsGTKRemoteService::sMozCommandAtom; -Atom nsGTKRemoteService::sMozResponseAtom; -Atom nsGTKRemoteService::sMozUserAtom; -Atom nsGTKRemoteService::sMozProfileAtom; -Atom nsGTKRemoteService::sMozProgramAtom; -Atom nsGTKRemoteService::sMozCommandLineAtom; // {C0773E90-5799-4eff-AD03-3EBCD85624AC} #define NS_REMOTESERVICE_CID \ diff --git a/toolkit/components/remote/nsGTKRemoteService.h b/toolkit/components/remote/nsGTKRemoteService.h index 4b26d1e3d068..b30d34508a77 100644 --- a/toolkit/components/remote/nsGTKRemoteService.h +++ b/toolkit/components/remote/nsGTKRemoteService.h @@ -42,29 +42,20 @@ #ifndef __nsGTKRemoteService_h__ #define __nsGTKRemoteService_h__ -#include "nsIRemoteService.h" - -#include "nsIObserver.h" - #include #include #include -#include "nsString.h" #include "nsInterfaceHashtable.h" +#include "nsXRemoteService.h" -class nsIDOMWindow; -class nsIWeakReference; -class nsIWidget; - -class nsGTKRemoteService : public nsIRemoteService, - public nsIObserver +class nsGTKRemoteService : public nsXRemoteService { public: // We will be a static singleton, so don't use the ordinary methods. NS_DECL_ISUPPORTS NS_DECL_NSIREMOTESERVICE - NS_DECL_NSIOBSERVER + nsGTKRemoteService() : mServerWindow(NULL) { } @@ -75,34 +66,22 @@ private: void HandleCommandsFor(GtkWidget* aWidget, nsIWeakReference* aWindow); - static void EnsureAtoms(); + static PLDHashOperator StartupHandler(const void* aKey, nsIWeakReference* aData, void* aClosure); - static const char* HandleCommand(char* aCommand, nsIDOMWindow* aWindow, - PRUint32 aTimestamp); - - static const char* HandleCommandLine(char* aBuffer, nsIDOMWindow* aWindow, - PRUint32 aTimestamp); static gboolean HandlePropertyChange(GtkWidget *widget, GdkEventProperty *event, nsIWeakReference* aThis); - GtkWidget* mServerWindow; - nsCString mAppName; - nsCString mProfileName; - nsInterfaceHashtable mWindows; - static Atom sMozVersionAtom; - static Atom sMozLockAtom; - static Atom sMozCommandAtom; - static Atom sMozResponseAtom; - static Atom sMozUserAtom; - static Atom sMozProfileAtom; - static Atom sMozProgramAtom; - static Atom sMozCommandLineAtom; + virtual void SetDesktopStartupIDOrTimestamp(const nsACString& aDesktopStartupID, + PRUint32 aTimestamp); + + nsInterfaceHashtable mWindows; + GtkWidget* mServerWindow; }; #endif // __nsGTKRemoteService_h__ diff --git a/toolkit/components/remote/nsQtRemoteService.cpp b/toolkit/components/remote/nsQtRemoteService.cpp index b0010db8b301..587faa888fb6 100644 --- a/toolkit/components/remote/nsQtRemoteService.cpp +++ b/toolkit/components/remote/nsQtRemoteService.cpp @@ -24,6 +24,7 @@ * Contributor(s): * Christopher Blizzard * Benjamin Smedberg + * Miika Jarvinen * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -38,85 +39,78 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ - +#include +#include #include "nsQtRemoteService.h" -#include // for XA_STRING -#include - -#include "nsIBaseWindow.h" -#include "nsIDocShell.h" -#include "nsPIDOMWindow.h" #include "mozilla/ModuleUtils.h" -#include "nsILocalFile.h" -#include "nsIObserverService.h" #include "nsIServiceManager.h" -#include "nsIWeakReference.h" -#include "nsIWidget.h" #include "nsIAppShellService.h" -#include "nsAppShellCID.h" #include "nsCOMPtr.h" -#include "nsString.h" -#include "prprf.h" -#include "prenv.h" -#include "nsCRT.h" -#ifdef MOZ_WIDGET_GTK2 -//#include "nsGTKToolkit.h" -#endif +/** + Helper class which is used to receive notification about property changes +*/ +class MozQRemoteEventHandlerWidget: public QWidget { +public: + /** + Constructor + @param aRemoteService remote service, which is notified about atom change + */ + MozQRemoteEventHandlerWidget(nsQtRemoteService &aRemoteService); -#include "nsICommandLineRunner.h" -#include "nsXULAppAPI.h" +protected: + /** + Event filter, which receives all XEvents + @return false which continues event handling + */ + bool x11Event(XEvent *); -#define MOZILLA_VERSION_PROP "_MOZILLA_VERSION" -#define MOZILLA_LOCK_PROP "_MOZILLA_LOCK" -#define MOZILLA_COMMAND_PROP "_MOZILLA_COMMAND" -#define MOZILLA_RESPONSE_PROP "_MOZILLA_RESPONSE" -#define MOZILLA_USER_PROP "_MOZILLA_USER" -#define MOZILLA_PROFILE_PROP "_MOZILLA_PROFILE" -#define MOZILLA_PROGRAM_PROP "_MOZILLA_PROGRAM" -#define MOZILLA_COMMANDLINE_PROP "_MOZILLA_COMMANDLINE" +private: + /** + Service which is notified about property change + */ + nsQtRemoteService &mRemoteService; +}; -#ifdef IS_BIG_ENDIAN -#define TO_LITTLE_ENDIAN32(x) \ - ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \ - (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) -#else -#define TO_LITTLE_ENDIAN32(x) (x) -#endif +MozQRemoteEventHandlerWidget::MozQRemoteEventHandlerWidget(nsQtRemoteService &aRemoteService) + :mRemoteService(aRemoteService) +{ +} -const unsigned char kRemoteVersion[] = "5.1"; +bool +MozQRemoteEventHandlerWidget::x11Event(XEvent *aEvt) +{ + if (aEvt->type == PropertyNotify && aEvt->xproperty.state == PropertyNewValue) + mRemoteService.PropertyNotifyEvent(aEvt); + + return false; +} NS_IMPL_ISUPPORTS2(nsQtRemoteService, nsIRemoteService, nsIObserver) +nsQtRemoteService::nsQtRemoteService(): +mServerWindow(0) +{ +} + NS_IMETHODIMP nsQtRemoteService::Startup(const char* aAppName, const char* aProfileName) { - return NS_ERROR_NOT_IMPLEMENTED; -} + if (mServerWindow) return NS_ERROR_ALREADY_INITIALIZED; + NS_ASSERTION(aAppName, "Don't pass a null appname!"); -// #ifdef MOZ_WIDGET_GTK2 -// static nsGTKToolkit* GetGTKToolkit() -// { -// nsCOMPtr svc = do_GetService(NS_APPSHELLSERVICE_CONTRACTID); -// if (!svc) -// return nsnull; -// nsCOMPtr window; -// svc->GetHiddenDOMWindow(getter_AddRefs(window)); -// if (!window) -// return nsnull; -// nsIWidget* widget = GetMainWidget(window); -// if (!widget) -// return nsnull; -// nsIToolkit* toolkit = widget->GetToolkit(); -// if (!toolkit) -// return nsnull; -// return static_cast(toolkit); -// } -// #endif + XRemoteBaseStartup(aAppName,aProfileName); + + //Create window, which is not shown. + mServerWindow = new MozQRemoteEventHandlerWidget(*this); + + HandleCommandsFor(mServerWindow->winId()); + return NS_OK; +} NS_IMETHODIMP nsQtRemoteService::RegisterWindow(nsIDOMWindow* aWindow) @@ -127,15 +121,29 @@ nsQtRemoteService::RegisterWindow(nsIDOMWindow* aWindow) NS_IMETHODIMP nsQtRemoteService::Shutdown() { - return NS_ERROR_NOT_IMPLEMENTED; + if (!mServerWindow) + return NS_ERROR_NOT_INITIALIZED; + + delete mServerWindow; + mServerWindow = nsnull; + + return NS_OK; } -NS_IMETHODIMP -nsQtRemoteService::Observe(nsISupports* aSubject, - const char *aTopic, - const PRUnichar *aData) +void +nsQtRemoteService::PropertyNotifyEvent(XEvent *aEvt) +{ + HandleNewProperty(aEvt->xproperty.window, + QX11Info::display(), + aEvt->xproperty.time, + aEvt->xproperty.atom, + 0); +} + +void +nsQtRemoteService::SetDesktopStartupIDOrTimestamp(const nsACString& aDesktopStartupID, + PRUint32 aTimestamp) { - return NS_OK; } // {C0773E90-5799-4eff-AD03-3EBCD85624AC} diff --git a/toolkit/components/remote/nsQtRemoteService.h b/toolkit/components/remote/nsQtRemoteService.h index add18f6fae5a..91c4e7254fd5 100644 --- a/toolkit/components/remote/nsQtRemoteService.h +++ b/toolkit/components/remote/nsQtRemoteService.h @@ -24,6 +24,7 @@ * Contributor(s): * Christopher Blizzard * Benjamin Smedberg + * Miika Jarvinen * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -42,30 +43,30 @@ #ifndef __nsQtRemoteService_h__ #define __nsQtRemoteService_h__ -#include "nsIRemoteService.h" +#include "nsXRemoteService.h" +#include -#include "nsIObserver.h" +class RemoteEventHandlerWidget; -#include "nsString.h" -#include "nsInterfaceHashtable.h" - -class nsIDOMWindow; -class nsIWeakReference; -class nsIWidget; - -class nsQtRemoteService : public nsIRemoteService, - public nsIObserver +class nsQtRemoteService : public nsXRemoteService { public: // We will be a static singleton, so don't use the ordinary methods. NS_DECL_ISUPPORTS - NS_DECL_NSIREMOTESERVICE - NS_DECL_NSIOBSERVER + NS_DECL_NSIREMOTESERVICE - nsQtRemoteService() { }; + nsQtRemoteService(); private: ~nsQtRemoteService() { }; + + virtual void SetDesktopStartupIDOrTimestamp(const nsACString& aDesktopStartupID, + PRUint32 aTimestamp); + + void PropertyNotifyEvent(XEvent *evt); + friend class MozQRemoteEventHandlerWidget; + + QWidget *mServerWindow; }; #endif // __nsQtRemoteService_h__ diff --git a/toolkit/components/remote/nsXRemoteService.cpp b/toolkit/components/remote/nsXRemoteService.cpp new file mode 100644 index 000000000000..5a44129c1bc4 --- /dev/null +++ b/toolkit/components/remote/nsXRemoteService.cpp @@ -0,0 +1,419 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim:expandtab:shiftwidth=2:tabstop=8: + */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is + * Christopher Blizzard. + * Portions created by the Initial Developer are Copyright (C) 2001 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Christopher Blizzard + * Benjamin Smedberg + * Miika Jarvinen + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsXRemoteService.h" +#include "nsIObserverService.h" +#include "nsCOMPtr.h" +#include "nsIServiceManager.h" +#include "nsICommandLineRunner.h" +#include "nsICommandLine.h" + +#include "nsIBaseWindow.h" +#include "nsIDocShell.h" +#include "nsILocalFile.h" +#include "nsIServiceManager.h" +#include "nsIWeakReference.h" +#include "nsIWidget.h" +#include "nsIAppShellService.h" +#include "nsAppShellCID.h" +#include "nsPIDOMWindow.h" +#include "mozilla/X11Util.h" + +#include "nsCOMPtr.h" +#include "nsString.h" +#include "prprf.h" +#include "prenv.h" +#include "nsCRT.h" + +#include "nsXULAppAPI.h" + +#include +#include + + +#define MOZILLA_VERSION_PROP "_MOZILLA_VERSION" +#define MOZILLA_LOCK_PROP "_MOZILLA_LOCK" +#define MOZILLA_COMMAND_PROP "_MOZILLA_COMMAND" +#define MOZILLA_RESPONSE_PROP "_MOZILLA_RESPONSE" +#define MOZILLA_USER_PROP "_MOZILLA_USER" +#define MOZILLA_PROFILE_PROP "_MOZILLA_PROFILE" +#define MOZILLA_PROGRAM_PROP "_MOZILLA_PROGRAM" +#define MOZILLA_COMMANDLINE_PROP "_MOZILLA_COMMANDLINE" + +const unsigned char kRemoteVersion[] = "5.1"; + +#ifdef IS_BIG_ENDIAN +#define TO_LITTLE_ENDIAN32(x) \ + ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \ + (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) +#else +#define TO_LITTLE_ENDIAN32(x) (x) +#endif + +// Minimize the roundtrips to the X server by getting all the atoms at once +static char *XAtomNames[] = { + MOZILLA_VERSION_PROP, + MOZILLA_LOCK_PROP, + MOZILLA_COMMAND_PROP, + MOZILLA_RESPONSE_PROP, + MOZILLA_USER_PROP, + MOZILLA_PROFILE_PROP, + MOZILLA_PROGRAM_PROP, + MOZILLA_COMMANDLINE_PROP +}; +static Atom XAtoms[NS_ARRAY_LENGTH(XAtomNames)]; + +Atom nsXRemoteService::sMozVersionAtom; +Atom nsXRemoteService::sMozLockAtom; +Atom nsXRemoteService::sMozCommandAtom; +Atom nsXRemoteService::sMozResponseAtom; +Atom nsXRemoteService::sMozUserAtom; +Atom nsXRemoteService::sMozProfileAtom; +Atom nsXRemoteService::sMozProgramAtom; +Atom nsXRemoteService::sMozCommandLineAtom; + +nsXRemoteService * nsXRemoteService::sRemoteImplementation = 0; + + +static PRBool +FindExtensionParameterInCommand(const char* aParameterName, + const nsACString& aCommand, + char aSeparator, + nsACString* aValue) +{ + nsCAutoString searchFor; + searchFor.Append(aSeparator); + searchFor.Append(aParameterName); + searchFor.Append('='); + + nsACString::const_iterator start, end; + aCommand.BeginReading(start); + aCommand.EndReading(end); + if (!FindInReadable(searchFor, start, end)) + return PR_FALSE; + + nsACString::const_iterator charStart, charEnd; + charStart = end; + aCommand.EndReading(charEnd); + nsACString::const_iterator idStart = charStart, idEnd; + if (FindCharInReadable(aSeparator, charStart, charEnd)) { + idEnd = charStart; + } else { + idEnd = charEnd; + } + *aValue = nsDependentCSubstring(idStart, idEnd); + return PR_TRUE; +} + + +nsXRemoteService::nsXRemoteService() +{ +} + +void +nsXRemoteService::XRemoteBaseStartup(const char *aAppName, const char *aProfileName) +{ + EnsureAtoms(); + + mAppName = aAppName; + ToLowerCase(mAppName); + + mProfileName = aProfileName; + + nsCOMPtr obs(do_GetService("@mozilla.org/observer-service;1")); + if (obs) { + obs->AddObserver(this, "xpcom-shutdown", PR_FALSE); + obs->AddObserver(this, "quit-application", PR_FALSE); + } +} + +void +nsXRemoteService::HandleCommandsFor(Window aWindowId) +{ + // set our version + XChangeProperty(mozilla::DefaultXDisplay(), aWindowId, sMozVersionAtom, XA_STRING, + 8, PropModeReplace, kRemoteVersion, sizeof(kRemoteVersion) - 1); + + // get our username + unsigned char *logname; + logname = (unsigned char*) PR_GetEnv("LOGNAME"); + if (logname) { + // set the property on the window if it's available + XChangeProperty(mozilla::DefaultXDisplay(), aWindowId, sMozUserAtom, XA_STRING, + 8, PropModeReplace, logname, strlen((char*) logname)); + } + + XChangeProperty(mozilla::DefaultXDisplay(), aWindowId, sMozProgramAtom, XA_STRING, + 8, PropModeReplace, (unsigned char*) mAppName.get(), mAppName.Length()); + + if (!mProfileName.IsEmpty()) { + XChangeProperty(mozilla::DefaultXDisplay(), + aWindowId, sMozProfileAtom, XA_STRING, + 8, PropModeReplace, + (unsigned char*) mProfileName.get(), mProfileName.Length()); + } + +} + +NS_IMETHODIMP +nsXRemoteService::Observe(nsISupports* aSubject, + const char *aTopic, + const PRUnichar *aData) +{ + // This can be xpcom-shutdown or quit-application, but it's the same either + // way. + Shutdown(); + return NS_OK; +} + +PRBool +nsXRemoteService::HandleNewProperty(XID aWindowId, Display* aDisplay, + Time aEventTime, + Atom aChangedAtom, + nsIWeakReference* aDomWindow) +{ + + nsCOMPtr window (do_QueryReferent(aDomWindow)); + + if (aChangedAtom == sMozCommandAtom || aChangedAtom == sMozCommandLineAtom) { + // We got a new command atom. + int result; + Atom actual_type; + int actual_format; + unsigned long nitems, bytes_after; + char *data = 0; + + result = XGetWindowProperty (aDisplay, + aWindowId, + aChangedAtom, + 0, /* long_offset */ + (65536 / sizeof (long)), /* long_length */ + True, /* atomic delete after */ + XA_STRING, /* req_type */ + &actual_type, /* actual_type return */ + &actual_format, /* actual_format_return */ + &nitems, /* nitems_return */ + &bytes_after, /* bytes_after_return */ + (unsigned char **)&data); /* prop_return + (we only care + about the first ) */ + + // Failed to get property off the window? + if (result != Success) + return PR_FALSE; + + // Failed to get the data off the window or it was the wrong type? + if (!data || !TO_LITTLE_ENDIAN32(*reinterpret_cast(data))) + return PR_FALSE; + + // cool, we got the property data. + const char *response = NULL; + if (aChangedAtom == sMozCommandAtom) + response = HandleCommand(data, window, aEventTime); + else if (aChangedAtom == sMozCommandLineAtom) + response = HandleCommandLine(data, window, aEventTime); + + // put the property onto the window as the response + XChangeProperty (aDisplay, aWindowId, + sMozResponseAtom, XA_STRING, + 8, PropModeReplace, + (const unsigned char *)response, + strlen (response)); + XFree(data); + return PR_TRUE; + } + + else if (aChangedAtom == sMozResponseAtom) { + // client accepted the response. party on wayne. + return PR_TRUE; + } + + else if (aChangedAtom == sMozLockAtom) { + // someone locked the window + return PR_TRUE; + } + + return PR_FALSE; +} + +const char* +nsXRemoteService::HandleCommand(char* aCommand, nsIDOMWindow* aWindow, + PRUint32 aTimestamp) +{ + nsresult rv; + + nsCOMPtr cmdline + (do_CreateInstance("@mozilla.org/toolkit/command-line;1", &rv)); + if (NS_FAILED(rv)) + return "509 internal error"; + + // 1) Make sure that it looks remotely valid with parens + // 2) Treat ping() immediately and specially + + nsCAutoString command(aCommand); + PRInt32 p1, p2; + p1 = command.FindChar('('); + p2 = command.FindChar(')'); + + if (p1 == kNotFound || p2 == kNotFound || p1 == 0 || p2 < p1) { + return "500 command not parseable"; + } + + command.Truncate(p1); + command.Trim(" ", PR_TRUE, PR_TRUE); + ToLowerCase(command); + + if (!command.EqualsLiteral("ping")) { + nsCAutoString desktopStartupID; + nsDependentCString cmd(aCommand); + FindExtensionParameterInCommand("DESKTOP_STARTUP_ID", + cmd, '\n', + &desktopStartupID); + + char* argv[3] = {"dummyappname", "-remote", aCommand}; + rv = cmdline->Init(3, argv, nsnull, nsICommandLine::STATE_REMOTE_EXPLICIT); + if (NS_FAILED(rv)) + return "509 internal error"; + + if (aWindow) + cmdline->SetWindowContext(aWindow); + + if (sRemoteImplementation) + sRemoteImplementation->SetDesktopStartupIDOrTimestamp(desktopStartupID, aTimestamp); + + rv = cmdline->Run(); + if (NS_ERROR_ABORT == rv) + return "500 command not parseable"; + if (NS_FAILED(rv)) + return "509 internal error"; + } + + return "200 executed command"; +} + +const char* +nsXRemoteService::HandleCommandLine(char* aBuffer, nsIDOMWindow* aWindow, + PRUint32 aTimestamp) +{ + nsresult rv; + + nsCOMPtr cmdline + (do_CreateInstance("@mozilla.org/toolkit/command-line;1", &rv)); + if (NS_FAILED(rv)) + return "509 internal error"; + + // the commandline property is constructed as an array of PRInt32 + // followed by a series of null-terminated strings: + // + // [argc][offsetargv0][offsetargv1...]\0\0argv[1]...\0 + // (offset is from the beginning of the buffer) + + PRInt32 argc = TO_LITTLE_ENDIAN32(*reinterpret_cast(aBuffer)); + char *wd = aBuffer + ((argc + 1) * sizeof(PRInt32)); + + nsCOMPtr lf; + rv = NS_NewNativeLocalFile(nsDependentCString(wd), PR_TRUE, + getter_AddRefs(lf)); + if (NS_FAILED(rv)) + return "509 internal error"; + + nsCAutoString desktopStartupID; + + char **argv = (char**) malloc(sizeof(char*) * argc); + if (!argv) return "509 internal error"; + + PRInt32 *offset = reinterpret_cast(aBuffer) + 1; + + for (int i = 0; i < argc; ++i) { + argv[i] = aBuffer + TO_LITTLE_ENDIAN32(offset[i]); + + if (i == 0) { + nsDependentCString cmd(argv[0]); + FindExtensionParameterInCommand("DESKTOP_STARTUP_ID", + cmd, ' ', + &desktopStartupID); + } + } + + rv = cmdline->Init(argc, argv, lf, nsICommandLine::STATE_REMOTE_AUTO); + + free (argv); + if (NS_FAILED(rv)) { + return "509 internal error"; + } + + if (aWindow) + cmdline->SetWindowContext(aWindow); + + if (sRemoteImplementation) + sRemoteImplementation->SetDesktopStartupIDOrTimestamp(desktopStartupID, aTimestamp); + + rv = cmdline->Run(); + + if (NS_ERROR_ABORT == rv) + return "500 command not parseable"; + + if (NS_FAILED(rv)) + return "509 internal error"; + + return "200 executed command"; +} + +void +nsXRemoteService::EnsureAtoms(void) +{ + if (sMozVersionAtom) + return; + + XInternAtoms(mozilla::DefaultXDisplay(), XAtomNames, NS_ARRAY_LENGTH(XAtomNames), + False, XAtoms); + + int i = 0; + sMozVersionAtom = XAtoms[i++]; + sMozLockAtom = XAtoms[i++]; + sMozCommandAtom = XAtoms[i++]; + sMozResponseAtom = XAtoms[i++]; + sMozUserAtom = XAtoms[i++]; + sMozProfileAtom = XAtoms[i++]; + sMozProgramAtom = XAtoms[i++]; + sMozCommandLineAtom = XAtoms[i++]; +} diff --git a/toolkit/components/remote/nsXRemoteService.h b/toolkit/components/remote/nsXRemoteService.h new file mode 100644 index 000000000000..8dce680a4650 --- /dev/null +++ b/toolkit/components/remote/nsXRemoteService.h @@ -0,0 +1,101 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim:expandtab:shiftwidth=2:tabstop=8: + */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is + * Christopher Blizzard. + * Portions created by the Initial Developer are Copyright (C) 2001 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Christopher Blizzard + * Benjamin Smedberg + * Miika Jarvinen + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef NSXREMOTESERVICE_H +#define NSXREMOTESERVICE_H + +#include "nsString.h" + +#include "nsIRemoteService.h" +#include "nsIObserver.h" +#include +#include + +class nsIDOMWindow; +class nsIWeakReference; + +/** + Base class for GTK/Qt remote service +*/ +class nsXRemoteService : public nsIRemoteService, + public nsIObserver +{ +public: + NS_DECL_NSIOBSERVER + + +protected: + nsXRemoteService(); + + static PRBool HandleNewProperty(Window aWindowId,Display* aDisplay, + Time aEventTime, Atom aChangedAtom, + nsIWeakReference* aDomWindow); + + void XRemoteBaseStartup(const char *aAppName, const char *aProfileName); + + void HandleCommandsFor(Window aWindowId); + static nsXRemoteService *sRemoteImplementation; +private: + void EnsureAtoms(); + static const char* HandleCommand(char* aCommand, nsIDOMWindow* aWindow, + PRUint32 aTimestamp); + + static const char* HandleCommandLine(char* aBuffer, nsIDOMWindow* aWindow, + PRUint32 aTimestamp); + + virtual void SetDesktopStartupIDOrTimestamp(const nsACString& aDesktopStartupID, + PRUint32 aTimestamp) = 0; + + nsCString mAppName; + nsCString mProfileName; + + static Atom sMozVersionAtom; + static Atom sMozLockAtom; + static Atom sMozCommandAtom; + static Atom sMozResponseAtom; + static Atom sMozUserAtom; + static Atom sMozProfileAtom; + static Atom sMozProgramAtom; + static Atom sMozCommandLineAtom; +}; + +#endif // NSXREMOTESERVICE_H diff --git a/toolkit/library/nsDllMain.cpp b/toolkit/library/nsDllMain.cpp index 5f677aeb33e3..5380854bcde4 100644 --- a/toolkit/library/nsDllMain.cpp +++ b/toolkit/library/nsDllMain.cpp @@ -40,10 +40,6 @@ #include #include "nsToolkit.h" -#ifdef MOZ_ENABLE_LIBXUL -#include "../xre/nsWindowsDllBlocklist.cpp" -#endif - #if defined(__GNUC__) // If DllMain gets name mangled, it won't be seen. extern "C" { @@ -60,9 +56,6 @@ BOOL APIENTRY DllMain( { switch( reason ) { case DLL_PROCESS_ATTACH: -#ifdef MOZ_ENABLE_LIBXUL - SetupDllBlocklist(); -#endif nsToolkit::Startup((HINSTANCE)hModule); break; diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js index 74996e596d21..94347db62c5f 100644 --- a/toolkit/mozapps/extensions/content/extensions.js +++ b/toolkit/mozapps/extensions/content/extensions.js @@ -1218,8 +1218,8 @@ var gSearchView = { return score; aStr = aStr.trim().toLocaleLowerCase(); - var haystack = aStr.split(/\W+/); - var needles = aQuery.split(/\W+/); + var haystack = aStr.split(/\s+/); + var needles = aQuery.split(/\s+/); for (let n = 0; n < needles.length; n++) { for (let h = 0; h < haystack.length; h++) { diff --git a/toolkit/mozapps/extensions/test/browser/Makefile.in b/toolkit/mozapps/extensions/test/browser/Makefile.in index 7439d4b3bc2e..222a950a17cd 100644 --- a/toolkit/mozapps/extensions/test/browser/Makefile.in +++ b/toolkit/mozapps/extensions/test/browser/Makefile.in @@ -47,6 +47,7 @@ include $(DEPTH)/config/autoconf.mk _TEST_FILES = \ head.js \ + browser_bug557943.js \ browser_bug562890.js \ browser_bug562899.js \ browser_bug562992.js \ diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug557943.js b/toolkit/mozapps/extensions/test/browser/browser_bug557943.js new file mode 100644 index 000000000000..590f7a848394 --- /dev/null +++ b/toolkit/mozapps/extensions/test/browser/browser_bug557943.js @@ -0,0 +1,77 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ + */ + +// Bug 557943 - Searching for addons can result in wrong results + +var gManagerWindow; + +function test() { + waitForExplicitFinish(); + + gProvider = new MockProvider(); + + gProvider.createAddons([{ + id: "addon1@tests.mozilla.org", + name: "Microsoft .NET Framework Assistant", + description: "", + version: "6.66" + }, { + id: "addon2@tests.mozilla.org", + name: "AwesomeNet Addon", + description: "" + }, { + id: "addon3@tests.mozilla.org", + name: "Dictionnaire MySpell en Francais (réforme 1990)", + description: "" + }]); + + open_manager(null, function(aWindow) { + gManagerWindow = aWindow; + run_next_test(); + }); +} + +function end_test() { + close_manager(gManagerWindow, function() { + finish(); + }); +} + + +function perform_search(aQuery, aCallback) { + var searchBox = gManagerWindow.document.getElementById("header-search"); + searchBox.value = aQuery; + + EventUtils.synthesizeMouse(searchBox, 2, 2, { }, gManagerWindow); + EventUtils.synthesizeKey("VK_RETURN", { }, gManagerWindow); + wait_for_view_load(gManagerWindow, function() { + var list = gManagerWindow.document.getElementById("search-list"); + var rows = list.getElementsByTagName("richlistitem"); + aCallback(rows); + }); +} + + +add_test(function() { + perform_search(".net", function(aRows) { + is(aRows.length, 1, "Should only get one result"); + is(aRows[0].mAddon.id, "addon1@tests.mozilla.org", "Should get expected addon as only result"); + run_next_test(); + }); +}); + +add_test(function() { + perform_search("réf", function(aRows) { + is(aRows.length, 1, "Should only get one result"); + is(aRows[0].mAddon.id, "addon3@tests.mozilla.org", "Should get expected addon as only result"); + run_next_test(); + }); +}); + +add_test(function() { + perform_search("javascript:void()", function(aRows) { + is(aRows.length, 0, "Should not get any results"); + run_next_test(); + }); +}); diff --git a/toolkit/mozapps/extensions/test/browser/browser_searching.js b/toolkit/mozapps/extensions/test/browser/browser_searching.js index 4f7f8b453aa8..79dc00d2883c 100644 --- a/toolkit/mozapps/extensions/test/browser/browser_searching.js +++ b/toolkit/mozapps/extensions/test/browser/browser_searching.js @@ -20,6 +20,9 @@ var gServer; var gAddonInstalled = false; function test() { + // Turn on searching for this test + Services.prefs.setIntPref(PREF_SEARCH_MAXRESULTS, 15); + waitForExplicitFinish(); gProvider = new MockProvider(); diff --git a/toolkit/mozapps/extensions/test/browser/browser_uninstalling.js b/toolkit/mozapps/extensions/test/browser/browser_uninstalling.js index 97b0b05ec6a6..8d8ae0bdfe7d 100644 --- a/toolkit/mozapps/extensions/test/browser/browser_uninstalling.js +++ b/toolkit/mozapps/extensions/test/browser/browser_uninstalling.js @@ -41,9 +41,6 @@ function test() { operationsRequiringRestart: AddonManager.OP_NEEDS_RESTART_NONE }]); - // Turn off searching - Services.prefs.setIntPref("extensions.getAddons.maxResults", 0); - open_manager(null, function(aWindow) { gManagerWindow = aWindow; gDocument = gManagerWindow.document; diff --git a/toolkit/mozapps/extensions/test/browser/head.js b/toolkit/mozapps/extensions/test/browser/head.js index b4eb15fff7bd..be343f280231 100644 --- a/toolkit/mozapps/extensions/test/browser/head.js +++ b/toolkit/mozapps/extensions/test/browser/head.js @@ -15,14 +15,22 @@ const CHROMEROOT = "chrome://mochikit/content/" + RELATIVE_DIR; const MANAGER_URI = "about:addons"; const INSTALL_URI = "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul"; const PREF_LOGGING_ENABLED = "extensions.logging.enabled"; +const PREF_SEARCH_MAXRESULTS = "extensions.getAddons.maxResults"; var gPendingTests = []; var gTestsRun = 0; // Turn logging on for all tests Services.prefs.setBoolPref(PREF_LOGGING_ENABLED, true); +// Turn off remote results in searches +Services.prefs.setIntPref(PREF_SEARCH_MAXRESULTS, 0); registerCleanupFunction(function() { Services.prefs.clearUserPref(PREF_LOGGING_ENABLED); + try { + Services.prefs.clearUserPref(PREF_SEARCH_MAXRESULTS); + } + catch (e) { + } }); function add_test(test) { diff --git a/toolkit/xre/nsWindowsDllBlocklist.cpp b/toolkit/xre/nsWindowsDllBlocklist.cpp index b37301d26ae6..07b76aea82dc 100644 --- a/toolkit/xre/nsWindowsDllBlocklist.cpp +++ b/toolkit/xre/nsWindowsDllBlocklist.cpp @@ -40,7 +40,6 @@ #include #include -#include #include "nsAutoPtr.h" @@ -58,31 +57,6 @@ // define this for very verbose dll load debug spew #undef DEBUG_very_verbose -// This class takes care of setting and restoring the current directory -// to make sure that the process current directory is not searched when -// loading DLLs. -class CurrentDirectoryGuard { -public: - CurrentDirectoryGuard() { - ::GetCurrentDirectoryW(MAX_PATH, mCwd); - - WCHAR appPath[MAX_PATH] = {L'\0'}; - ::GetModuleFileNameW(NULL, appPath, MAX_PATH); - LPWSTR lastBackslash = wcsrchr(appPath, L'\\'); - if (lastBackslash) { - *lastBackslash = L'\0'; - } - ::SetCurrentDirectoryW(appPath); - } - - ~CurrentDirectoryGuard() { - ::SetCurrentDirectoryW(mCwd); - } - -private: - WCHAR mCwd[MAX_PATH]; -}; - // The signature for LdrLoadDll changed at some point, with the second arg // becoming a PULONG instead of a ULONG. This should only matter on 64-bit // systems, for which there was no support earlier -- on 32-bit systems, @@ -235,14 +209,6 @@ continue_loading: NS_SetHasLoadedNewDLLs(); - // We need to make sure that the OS implementation of LdrLoadDll does not attempt - // to load any DLLs from the current working directory. That's almost never what - // we want, and it can cause us load unexpected DLLs. This guard protects against - // that by setting the current directory to the application's directory before - // LdrLoadDll is called, and restoring it to the original value when that call - // returns. - CurrentDirectoryGuard cwdGuard; - return stub_LdrLoadDll(filePath, flags, moduleFileName, handle); } diff --git a/toolkit/xre/nsWindowsWMain.cpp b/toolkit/xre/nsWindowsWMain.cpp index b466f4f3b72b..7f81c22580df 100644 --- a/toolkit/xre/nsWindowsWMain.cpp +++ b/toolkit/xre/nsWindowsWMain.cpp @@ -8,8 +8,7 @@ #include "nsUTF8Utils.h" -#if defined(_MSC_VER) && defined(_M_IX86) && defined(XRE_WANT_DLL_BLOCKLIST) \ - !defined(MOZ_ENABLE_LIBXUL) +#if defined(_MSC_VER) && defined(_M_IX86) && defined(XRE_WANT_DLL_BLOCKLIST) #include "nsWindowsDllBlocklist.cpp" #else #undef XRE_WANT_DLL_BLOCKLIST diff --git a/view/public/nsIViewManager.h b/view/public/nsIViewManager.h index 39c5e1975b8a..22fa5495d8bd 100644 --- a/view/public/nsIViewManager.h +++ b/view/public/nsIViewManager.h @@ -50,8 +50,8 @@ class nsIDeviceContext; class nsIViewObserver; #define NS_IVIEWMANAGER_IID \ - { 0x9e924719, 0x3c4b, 0x435b, \ - { 0xaf, 0x1e, 0x71, 0x52, 0x04, 0x6d, 0xaa, 0x44 } } + { 0x35c07b12, 0x5d96, 0x49f9, \ + { 0x91, 0xa3, 0x2f, 0xad, 0x3e, 0x84, 0x0c, 0x91 } } class nsIViewManager : public nsISupports { @@ -116,7 +116,7 @@ public: /** * Do any resizes that are pending. */ - NS_IMETHOD FlushDelayedResize() = 0; + NS_IMETHOD FlushDelayedResize(PRBool aDoReflow) = 0; /** * Called to force a redrawing of any dirty areas. diff --git a/view/src/nsViewManager.cpp b/view/src/nsViewManager.cpp index 73a6247d873e..a1463e1a7d66 100644 --- a/view/src/nsViewManager.cpp +++ b/view/src/nsViewManager.cpp @@ -60,6 +60,8 @@ #include "nsContentUtils.h" #include "nsIPluginWidget.h" #include "nsXULPopupManager.h" +#include "nsIPresShell.h" +#include "nsPresContext.h" static NS_DEFINE_IID(kRegionCID, NS_REGION_CID); @@ -333,11 +335,19 @@ NS_IMETHODIMP nsViewManager::SetWindowDimensions(nscoord aWidth, nscoord aHeight return NS_OK; } -NS_IMETHODIMP nsViewManager::FlushDelayedResize() +NS_IMETHODIMP nsViewManager::FlushDelayedResize(PRBool aDoReflow) { if (mDelayedResize != nsSize(NSCOORD_NONE, NSCOORD_NONE)) { - DoSetWindowDimensions(mDelayedResize.width, mDelayedResize.height); - mDelayedResize.SizeTo(NSCOORD_NONE, NSCOORD_NONE); + if (aDoReflow) { + DoSetWindowDimensions(mDelayedResize.width, mDelayedResize.height); + mDelayedResize.SizeTo(NSCOORD_NONE, NSCOORD_NONE); + } else if (mObserver) { + nsCOMPtr shell = do_QueryInterface(mObserver); + nsPresContext* presContext = shell->GetPresContext(); + if (presContext) { + presContext->SetVisibleArea(nsRect(nsPoint(0, 0), mDelayedResize)); + } + } } return NS_OK; } @@ -842,7 +852,7 @@ NS_IMETHODIMP nsViewManager::DispatchEvent(nsGUIEvent *aEvent, : nsnull) { if (vm->mDelayedResize != nsSize(NSCOORD_NONE, NSCOORD_NONE) && IsViewVisible(vm->mRootView)) { - vm->FlushDelayedResize(); + vm->FlushDelayedResize(PR_TRUE); // Paint later. vm->UpdateView(vm->mRootView, NS_VMREFRESH_NO_SYNC); @@ -1612,24 +1622,7 @@ nsViewManager::FlushPendingInvalidates() { NS_ASSERTION(IsRootVM(), "Must be root VM for this to be called!"); NS_ASSERTION(mUpdateBatchCnt == 0, "Must not be in an update batch!"); - // XXXbz this is probably not quite OK yet, if callers can explicitly - // DisableRefresh while we have an event posted. - // NS_ASSERTION(mRefreshEnabled, "How did we get here?"); - // Let all the view observers of all viewmanagers in this tree know that - // we're about to "paint" (this lets them get in their invalidates now so - // we don't go through two invalidate-processing cycles). - NS_ASSERTION(gViewManagers, "Better have a viewmanagers array!"); - - // Disable refresh while we notify our view observers, so that if they do - // view update batches we don't reenter this code and so that we batch - // all of them together. We don't use - // BeginUpdateViewBatch/EndUpdateViewBatch, since that would reenter this - // exact code, but we want the effect of a single big update batch. - ++mUpdateBatchCnt; - CallWillPaintOnObservers(PR_FALSE); - --mUpdateBatchCnt; - if (mHasPendingUpdates) { ProcessPendingUpdates(mRootView, PR_TRUE); mHasPendingUpdates = PR_FALSE; diff --git a/view/src/nsViewManager.h b/view/src/nsViewManager.h index 72302bc1b2de..79e4ece68cea 100644 --- a/view/src/nsViewManager.h +++ b/view/src/nsViewManager.h @@ -111,7 +111,7 @@ public: NS_IMETHOD GetWindowDimensions(nscoord *width, nscoord *height); NS_IMETHOD SetWindowDimensions(nscoord width, nscoord height); - NS_IMETHOD FlushDelayedResize(); + NS_IMETHOD FlushDelayedResize(PRBool aDoReflow); NS_IMETHOD Composite(void); diff --git a/widget/src/gtk2/nsLookAndFeel.cpp b/widget/src/gtk2/nsLookAndFeel.cpp index 47d568da7fd3..4a521cfb6660 100644 --- a/widget/src/gtk2/nsLookAndFeel.cpp +++ b/widget/src/gtk2/nsLookAndFeel.cpp @@ -803,9 +803,16 @@ nsLookAndFeel::InitLookAndFeel() // Some themes have a unified menu bar, and support window dragging on it gboolean supports_menubar_drag = FALSE; - gtk_widget_style_get(menuBar, - "window-dragging", &supports_menubar_drag, - NULL); + GParamSpec *param_spec = + gtk_widget_class_find_style_property(GTK_WIDGET_GET_CLASS(menuBar), + "window-dragging"); + if (param_spec) { + if (g_type_is_a(G_PARAM_SPEC_VALUE_TYPE(param_spec), G_TYPE_BOOLEAN)) { + gtk_widget_style_get(menuBar, + "window-dragging", &supports_menubar_drag, + NULL); + } + } sMenuSupportsDrag = supports_menubar_drag; // GTK's guide to fancy odd row background colors: diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp index eaeab46d6fd7..d37df4fcf47e 100644 --- a/widget/src/gtk2/nsWindow.cpp +++ b/widget/src/gtk2/nsWindow.cpp @@ -704,15 +704,21 @@ nsWindow::Destroy(void) mIsDestroyed = PR_TRUE; mCreated = PR_FALSE; - nsRefPtr gl; - if (GetLayerManager()->GetBackendType() == LayerManager::LAYERS_OPENGL) - { - LayerManagerOGL *manager = static_cast(GetLayerManager()); - gl = manager->gl(); - } - /** Need to clean our LayerManager up while still alive */ - mLayerManager = NULL; + if (mLayerManager) { + nsRefPtr gl = nsnull; + if (mLayerManager->GetBackendType() == LayerManager::LAYERS_OPENGL) { + LayerManagerOGL *ogllm = static_cast(mLayerManager.get()); + gl = ogllm->gl(); + } + + mLayerManager->Destroy(); + + if (gl) { + gl->MarkDestroyed(); + } + } + mLayerManager = nsnull; g_signal_handlers_disconnect_by_func(gtk_settings_get_default(), FuncToGpointer(theme_changed_cb), @@ -789,9 +795,6 @@ nsWindow::Destroy(void) gdk_window_set_user_data(mGdkWindow, NULL); g_object_set_data(G_OBJECT(mGdkWindow), "nsWindow", NULL); - if (gl) { - gl->WindowDestroyed(); - } gdk_window_destroy(mGdkWindow); mGdkWindow = nsnull; } diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp index 5bfa4fd09539..5fd06beabb59 100644 --- a/widget/src/windows/nsWindow.cpp +++ b/widget/src/windows/nsWindow.cpp @@ -665,7 +665,10 @@ NS_METHOD nsWindow::Destroy() * On windows the LayerManagerOGL destructor wants the widget to be around for * cleanup. It also would like to have the HWND intact, so we NULL it here. */ - mLayerManager = NULL; + if (mLayerManager) { + mLayerManager->Destroy(); + } + mLayerManager = nsnull; // The DestroyWindow function destroys the specified window. The function sends WM_DESTROY // and WM_NCDESTROY messages to the window to deactivate it and remove the keyboard focus diff --git a/widget/tests/window_imestate_iframes.html b/widget/tests/window_imestate_iframes.html index c42ce6850207..e715acdb7503 100644 --- a/widget/tests/window_imestate_iframes.html +++ b/widget/tests/window_imestate_iframes.html @@ -167,6 +167,8 @@ function runTests() { observeFocusBlur(aNextFocusedNode, aWillFireFocusEvent, aNextBlurredNode, aWillFireBlurEvent); + // We're relying on layout inside the iframe being up to date, so make it so + iframe.contentDocument.documentElement.getBoundingClientRect(); synthesizeMouse(iframe, 10, 80, { }); var description = "Click test: " + aTestingCaseDescription + ": "; is(fm.focusedElement, !aWillAllNodeLostFocus ? aNextFocusedNode : null, diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in index 489229c2fae8..9421f4c3ada6 100644 --- a/xpcom/build/Makefile.in +++ b/xpcom/build/Makefile.in @@ -161,7 +161,7 @@ DEFINES += \ -DEXPORT_XPTC_API EXTRA_DSO_LDOPTS += \ - -L$(LIBXUL_DIST)/lib $(MOZALLOC_LIB) \ + $(MOZALLOC_LIB) \ $(NSPR_LIBS) \ $(NULL) diff --git a/xpcom/string/public/nsTString.h b/xpcom/string/public/nsTString.h index ea1816f0c055..bbe4a78a9c4c 100644 --- a/xpcom/string/public/nsTString.h +++ b/xpcom/string/public/nsTString.h @@ -446,9 +446,20 @@ class nsTFixedString_CharT : public nsTString_CharT * the length of the string already contained in the buffer */ - NS_COM nsTFixedString_CharT( char_type* data, size_type storageSize ); + nsTFixedString_CharT( char_type* data, size_type storageSize ) + : string_type(data, PRUint32(char_traits::length(data)), F_TERMINATED | F_FIXED | F_CLASS_FIXED) + , mFixedCapacity(storageSize - 1) + , mFixedBuf(data) + {} - NS_COM nsTFixedString_CharT( char_type* data, size_type storageSize, size_type length ); + nsTFixedString_CharT( char_type* data, size_type storageSize, size_type length ) + : string_type(data, length, F_TERMINATED | F_FIXED | F_CLASS_FIXED) + , mFixedCapacity(storageSize - 1) + , mFixedBuf(data) + { + // null-terminate + mFixedBuf[length] = char_type(0); + } // |operator=| does not inherit, so we must define our own self_type& operator=( char_type c ) { Assign(c); return *this; } diff --git a/xpcom/string/public/nsTSubstring.h b/xpcom/string/public/nsTSubstring.h index 816524bb654a..b4d540090f00 100644 --- a/xpcom/string/public/nsTSubstring.h +++ b/xpcom/string/public/nsTSubstring.h @@ -112,7 +112,7 @@ class nsTSubstring_CharT public: // this acts like a virtual destructor - NS_COM NS_CONSTRUCTOR_FASTCALL ~nsTSubstring_CharT(); + ~nsTSubstring_CharT() { Finalize(); } /** * reading iterators @@ -558,7 +558,13 @@ class nsTSubstring_CharT * this is public to support automatic conversion of tuple to string * base type, which helps avoid converting to nsTAString. */ - NS_COM nsTSubstring_CharT(const substring_tuple_type& tuple); + nsTSubstring_CharT(const substring_tuple_type& tuple) + : mData(nsnull), + mLength(0), + mFlags(F_NONE) + { + Assign(tuple); + } /** * allows for direct initialization of a nsTSubstring object. @@ -566,11 +572,18 @@ class nsTSubstring_CharT * NOTE: this constructor is declared public _only_ for convenience * inside the string implementation. */ -#ifdef XP_OS2 /* Workaround for GCC 3.3.x bug. */ - nsTSubstring_CharT( char_type *data, size_type length, PRUint32 flags ) NS_COM; -#else + // XXXbz or can I just include nscore.h and use NS_BUILD_REFCNT_LOGGING? +#if defined(DEBUG) || defined(FORCE_BUILD_REFCNT_LOGGING) +#define XPCOM_STRING_CONSTRUCTOR_OUT_OF_LINE NS_COM nsTSubstring_CharT( char_type *data, size_type length, PRUint32 flags ); -#endif +#else +#undef XPCOM_STRING_CONSTRUCTOR_OUT_OF_LINE + nsTSubstring_CharT( char_type *data, size_type length, PRUint32 flags ) + : mData(data), + mLength(length), + mFlags(flags) {} +#endif /* DEBUG || FORCE_BUILD_REFCNT_LOGGING */ + protected: friend class nsTObsoleteAStringThunk_CharT; @@ -584,22 +597,29 @@ class nsTSubstring_CharT PRUint32 mFlags; // default initialization - NS_COM nsTSubstring_CharT(); + nsTSubstring_CharT() + : mData(char_traits::sEmptyBuffer), + mLength(0), + mFlags(F_TERMINATED) {} // version of constructor that leaves mData and mLength uninitialized explicit - NS_COM nsTSubstring_CharT( PRUint32 flags ); + nsTSubstring_CharT( PRUint32 flags ) + : mFlags(flags) {} // copy-constructor, constructs as dependent on given object // (NOTE: this is for internal use only) - NS_COM nsTSubstring_CharT( const self_type& str ); + nsTSubstring_CharT( const self_type& str ) + : mData(str.mData), + mLength(str.mLength), + mFlags(str.mFlags & (F_TERMINATED | F_VOIDED)) {} /** * this function releases mData and does not change the value of * any of its member variables. in other words, this function acts * like a destructor. */ - void NS_FASTCALL Finalize(); + void NS_COM NS_FASTCALL Finalize(); /** * this function prepares mData to be mutated. diff --git a/xpcom/string/src/nsTString.cpp b/xpcom/string/src/nsTString.cpp index 71e13d1bf34e..0bbf3b54ff2d 100644 --- a/xpcom/string/src/nsTString.cpp +++ b/xpcom/string/src/nsTString.cpp @@ -69,17 +69,3 @@ nsTAdoptingString_CharT::operator=( const self_type& str ) return *this; } -nsTFixedString_CharT::nsTFixedString_CharT( char_type* data, size_type storageSize ) - : string_type(data, PRUint32(char_traits::length(data)), F_TERMINATED | F_FIXED | F_CLASS_FIXED) - , mFixedCapacity(storageSize - 1) - , mFixedBuf(data) -{} - -nsTFixedString_CharT::nsTFixedString_CharT( char_type* data, size_type storageSize, size_type length ) - : string_type(data, length, F_TERMINATED | F_FIXED | F_CLASS_FIXED) - , mFixedCapacity(storageSize - 1) - , mFixedBuf(data) -{ - // null-terminate - mFixedBuf[length] = char_type(0); -} diff --git a/xpcom/string/src/nsTSubstring.cpp b/xpcom/string/src/nsTSubstring.cpp index 03efdfa0e8f5..1c742457e39f 100644 --- a/xpcom/string/src/nsTSubstring.cpp +++ b/xpcom/string/src/nsTSubstring.cpp @@ -36,6 +36,7 @@ * * ***** END LICENSE BLOCK ***** */ +#ifdef XPCOM_STRING_CONSTRUCTOR_OUT_OF_LINE nsTSubstring_CharT::nsTSubstring_CharT( char_type *data, size_type length, PRUint32 flags) : mData(data), @@ -49,27 +50,7 @@ nsTSubstring_CharT::nsTSubstring_CharT( char_type *data, size_type length, #endif } } - -nsTSubstring_CharT::nsTSubstring_CharT(const substring_tuple_type& tuple) - : mData(nsnull), - mLength(0), - mFlags(F_NONE) -{ - Assign(tuple); -} - -nsTSubstring_CharT::nsTSubstring_CharT() -: mData(char_traits::sEmptyBuffer), - mLength(0), - mFlags(F_TERMINATED) {} - -nsTSubstring_CharT::nsTSubstring_CharT( PRUint32 flags ) - : mFlags(flags) {} - -nsTSubstring_CharT::nsTSubstring_CharT( const self_type& str ) - : mData(str.mData), - mLength(str.mLength), - mFlags(str.mFlags & (F_TERMINATED | F_VOIDED)) {} +#endif /* XPCOM_STRING_CONSTRUCTOR_OUT_OF_LINE */ /** * helper function for down-casting a nsTSubstring to a nsTFixedString. @@ -206,11 +187,6 @@ nsTSubstring_CharT::Finalize() // mData, mLength, and mFlags are purposefully left dangling } -nsTSubstring_CharT::~nsTSubstring_CharT() - { - Finalize(); - } - PRBool nsTSubstring_CharT::ReplacePrep( index_type cutStart, size_type cutLen, size_type fragLen ) { diff --git a/xpcom/stub/Makefile.in b/xpcom/stub/Makefile.in index a6d0fd4e4d67..06a9c1a60455 100644 --- a/xpcom/stub/Makefile.in +++ b/xpcom/stub/Makefile.in @@ -92,11 +92,13 @@ DEPENDENT_LIBS_LIST += \ $(LIB_PREFIX)mozjs$(DLL_SUFFIX) \ $(NULL) +ifndef MOZ_NATIVE_SQLITE ifeq ($(OS_TARGET),OS2) DEPENDENT_LIBS_LIST += mozsqlt3.dll else DEPENDENT_LIBS_LIST += $(LIB_PREFIX)mozsqlite3$(DLL_SUFFIX) endif +endif ifeq (bundle,$(MOZ_FS_LAYOUT)) EXTRA_DSO_LDOPTS += $(DIST)/bin/XUL