diff --git a/caps/tests/mochitest/Makefile.in b/caps/tests/mochitest/Makefile.in index fa748a8c4a4e..9e6bad703543 100644 --- a/caps/tests/mochitest/Makefile.in +++ b/caps/tests/mochitest/Makefile.in @@ -25,10 +25,4 @@ MOCHITEST_CHROME_FILES = test_principal_extendedorigin_appid_appstatus.html \ $(NULL) endif -test_bug292789.html : % : %.in - $(PYTHON) $(topsrcdir)/config/Preprocessor.py \ - $(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $< > $@ - -GARBAGE += test_bug292789.html - include $(topsrcdir)/config/rules.mk diff --git a/caps/tests/mochitest/test_bug292789.html.in b/caps/tests/mochitest/test_bug292789.html similarity index 91% rename from caps/tests/mochitest/test_bug292789.html.in rename to caps/tests/mochitest/test_bug292789.html index b58c70252e0b..d363b6ac9b2b 100644 --- a/caps/tests/mochitest/test_bug292789.html.in +++ b/caps/tests/mochitest/test_bug292789.html @@ -39,11 +39,7 @@ function testScriptSrc(aCallback) { **/ var resjs = document.getElementById("resjs"); resjs.onload = scriptOnload; -#ifdef MOZ_CHROME_FILE_FORMAT_JAR - resjs.src = "jar:resource://gre/chrome/toolkit.jar!/content/mozapps/xpinstall/xpinstallConfirm.js"; -#else resjs.src = "resource://gre/chrome/toolkit/content/mozapps/xpinstall/xpinstallConfirm.js"; -#endif document.getElementById("content").appendChild(resjs); function scriptOnload() { @@ -59,11 +55,7 @@ function testScriptSrc(aCallback) { /** tests **/ var img_global = "chrome://global/skin/icons/Error.png"; var img_mozapps = "chrome://mozapps/skin/passwordmgr/key.png"; -#ifdef MOZ_CHROME_FILE_FORMAT_JAR -var res_mozapps = "jar:resource://gre/chrome/toolkit.jar!/skin/classic/mozapps/passwordmgr/key.png"; -#else var res_mozapps = "resource://gre/chrome/toolkit/skin/classic/mozapps/passwordmgr/key.png"; -#endif var imgTests = [[img_global, "success"], [img_mozapps, "fail"], diff --git a/configure.in b/configure.in index 539a62ce4428..4f1d8d5b6748 100644 --- a/configure.in +++ b/configure.in @@ -7704,8 +7704,6 @@ dnl done during packaging with omnijar. if test "$MOZ_CHROME_FILE_FORMAT" = "omni"; then MOZ_OMNIJAR=1 AC_DEFINE(MOZ_OMNIJAR) -elif test "$MOZ_CHROME_FILE_FORMAT" = "jar"; then - AC_DEFINE(MOZ_CHROME_FILE_FORMAT_JAR) fi MOZ_PACKAGER_FORMAT="$MOZ_CHROME_FILE_FORMAT" if test "$OS_ARCH" = "WINNT" -o "$OS_ARCH" = "OS2" -o "$MOZ_WIDGET_TOOLKIT" = "android"; then