Bug 465823: Allow XULRunner apps to use Mochitest in 1.9.1, r=ted, NPOTB
authorMark Finkle <mfinkle@mozilla.com>
Fri, 05 Dec 2008 11:52:25 -0500
changeset 22373 8e208933f5103a2d9be9acdf1f3578f752027663
parent 22372 ec734c3ad8a86daf8c8c0236e74e06d942f04095
child 22374 555e338a03ca69e3ce65e3dea86217801466acd6
push idunknown
push userunknown
push dateunknown
reviewersted, NPOTB
bugs465823
milestone1.9.2a1pre
Bug 465823: Allow XULRunner apps to use Mochitest in 1.9.1, r=ted, NPOTB
build/Makefile.in
build/pgo/Makefile.in
build/pgo/automation.py.in
build/pgo/genpgocert.py.in
testing/mochitest/Makefile.in
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -77,17 +77,17 @@ else
 browser_path = \"$(DIST)/bin/$(PROGRAM)\"
 endif
 endif
 
 _CERTS_DIR = _profile/pgo/certs
 
 AUTOMATION_PPARGS = 	\
 			-DBROWSER_PATH=$(browser_path) \
-			-DXPC_BIN_PATH=\"$(DIST)/bin\" \
+			-DXPC_BIN_PATH=\"$(LIBXUL_DIST)/bin\" \
 			-DBIN_SUFFIX=\"$(BIN_SUFFIX)\" \
 			-DCERTS_DIR=\"../$(_CERTS_DIR)\" \
 			$(NULL)
 
 ifeq ($(OS_ARCH),Darwin)
 AUTOMATION_PPARGS += -DIS_MAC=1
 else
 AUTOMATION_PPARGS += -DIS_MAC=0
--- a/build/pgo/Makefile.in
+++ b/build/pgo/Makefile.in
@@ -81,17 +81,17 @@ browser_path = \"$(DIST)/$(MOZ_APP_DISPL
 endif
 else
 browser_path = \"$(DIST)/bin/$(PROGRAM)\"
 endif
 endif
 
 AUTOMATION_PPARGS = 	\
 			-DBROWSER_PATH=$(browser_path) \
-			-DXPC_BIN_PATH=\"$(DIST)/bin\" \
+			-DXPC_BIN_PATH=\"$(LIBXUL_DIST)/bin\" \
 			-DBIN_SUFFIX=\"$(BIN_SUFFIX)\" \
 			-DCERTS_DIR=\"$(_CERTS_DIR)\" \
 			-DCERTS_SRC_DIR=\"$(_CERTS_SRC_DIR)\" \
 			$(NULL)
 
 ifeq ($(OS_ARCH),Darwin)
 AUTOMATION_PPARGS += -DIS_MAC=1
 else
--- a/build/pgo/automation.py.in
+++ b/build/pgo/automation.py.in
@@ -63,17 +63,17 @@ SCRIPT_DIR = os.path.abspath(os.path.rea
            "Process",
            "initializeProfile",
            "DIST_BIN",
            "DEFAULT_APP",
            "environment",
           ]
 
 # These are generated in mozilla/build/Makefile.in
-#expand DIST_BIN = "./" + __XPC_BIN_PATH__
+#expand DIST_BIN = __XPC_BIN_PATH__
 #expand IS_WIN32 = len("__WIN32__") != 0
 #expand IS_MAC = __IS_MAC__ != 0
 #ifdef IS_CYGWIN
 #expand IS_CYGWIN = __IS_CYGWIN__ == 1
 #else
 IS_CYGWIN = False
 #endif
 #expand IS_CAMINO = __IS_CAMINO__ != 0
--- a/build/pgo/genpgocert.py.in
+++ b/build/pgo/genpgocert.py.in
@@ -37,17 +37,17 @@
 # ***** END LICENSE BLOCK *****
 
 import automation
 import os
 import re
 import shutil
 import sys
 
-#expand DIST_BIN = "./" + __XPC_BIN_PATH__
+#expand DIST_BIN = __XPC_BIN_PATH__
 #expand BIN_SUFFIX = __BIN_SUFFIX__
 #expand CERTS_DIR = __CERTS_DIR__
 #expand CERTS_SRC_DIR = __CERTS_SRC_DIR__
 
 dbFiles = [
   re.compile("^cert[0-9]+\.db$"),
   re.compile("^key[0-9]+\.db$"),
   re.compile("^secmod\.db$")
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -94,17 +94,17 @@ endif
 else
 browser_path = \"../$(DIST)/bin/$(PROGRAM)\"
 endif
 endif
 
 # These go in _tests/ so they need to go up an extra path segement
 TEST_DRIVER_PPARGS = 	\
 			-DBROWSER_PATH=$(browser_path) \
-			-DXPC_BIN_PATH=\"../$(DIST)/bin\" \
+			-DXPC_BIN_PATH=\"$(LIBXUL_DIST)/bin\" \
 			-DBIN_SUFFIX=\"$(BIN_SUFFIX)\" \
 			-DCERTS_DIR=\"../$(_CERTS_DIR)\" \
 			$(NULL)
 
 ifeq ($(OS_ARCH),Darwin)
 TEST_DRIVER_PPARGS += -DIS_MAC=1
 else
 TEST_DRIVER_PPARGS += -DIS_MAC=0