From ecd95e7eafcd96ac201ca2c2f315aa0db3f6e499 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Wed, 24 Sep 2008 07:16:12 +0200
Subject: [PATCH] Backed out changeset 9841b5e5cf10 Bug 455813 - Windows PGO
 builds fail when --disable-tests is set; r=ted.mielczarek

---
 build/Makefile.in             |  6 ------
 build/pgo/Makefile.in         |  6 ------
 build/pgo/automation.py.in    | 24 ++++++++++--------------
 testing/mochitest/Makefile.in |  6 ------
 4 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/build/Makefile.in b/build/Makefile.in
index 27573c07663..8d161337e00 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -104,12 +104,6 @@ ifeq ($(host_os), cygwin)
 AUTOMATION_PPARGS += -DIS_CYGWIN=1
 endif
 
-ifeq ($(ENABLE_TESTS), 1)
-AUTOMATION_PPARGS += -DIS_TEST_BUILD=1
-else
-AUTOMATION_PPARGS += -DIS_TEST_BUILD=0
-endif
-
 _LEAKTEST_DIR = $(DEPTH)/_leaktest
 
 _LEAKTEST_FILES =    \
diff --git a/build/pgo/Makefile.in b/build/pgo/Makefile.in
index 69d02810a4a..36c147818ec 100644
--- a/build/pgo/Makefile.in
+++ b/build/pgo/Makefile.in
@@ -108,12 +108,6 @@ ifeq ($(host_os), cygwin)
 AUTOMATION_PPARGS += -DIS_CYGWIN=1
 endif
 
-ifeq ($(ENABLE_TESTS), 1)
-AUTOMATION_PPARGS += -DIS_TEST_BUILD=1
-else
-AUTOMATION_PPARGS += -DIS_TEST_BUILD=0
-endif
-
 automation.py: automation.py.in
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
 	$(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $^ > $@
diff --git a/build/pgo/automation.py.in b/build/pgo/automation.py.in
index 70dd3ab756b..203e744a3db 100644
--- a/build/pgo/automation.py.in
+++ b/build/pgo/automation.py.in
@@ -83,7 +83,6 @@ UNIXISH = not IS_WIN32 and not IS_MAC
 
 #expand DEFAULT_APP = "./" + __BROWSER_PATH__
 #expand CERTS_DIR = __CERTS_DIR__
-#expand IS_TEST_BUILD = __IS_TEST_BUILD__
 
 ###########
 # LOGGING #
@@ -444,17 +443,15 @@ def environment(env = None):
 ###############
 
 def runApp(testURL, env, app, profileDir, extraArgs):
-  if (IS_TEST_BUILD):
-    # create certificate database for the profile
-    certificateStatus = fillCertificateDB(profileDir)
-    if certificateStatus != 0:
-      log.info("ERROR FAIL Certificate integration")
-      return certificateStatus
-  
-    # start ssltunnel to provide https:// URLs capability
-    ssltunnel = DIST_BIN + "/ssltunnel" + BIN_SUFFIX
-    ssltunnelProcess = Process(ssltunnel, [os.path.join(CERTS_DIR, "ssltunnel.cfg")], environment())
-    log.info("SSL tunnel pid: %d", ssltunnelProcess.pid)
+  # create certificate database for the profile
+  certificateStatus = fillCertificateDB(profileDir)
+  if certificateStatus != 0:
+    log.info("ERROR FAIL Certificate integration")
+    return certificateStatus
+
+  ssltunnel = DIST_BIN + "/ssltunnel" + BIN_SUFFIX
+  ssltunnelProcess = Process(ssltunnel, [os.path.join(CERTS_DIR, "ssltunnel.cfg")], environment())
+  log.info("SSL tunnel pid: %d", ssltunnelProcess.pid)
   
   "Run the app, returning the time at which it was started."
   # mark the start
@@ -487,7 +484,6 @@ def runApp(testURL, env, app, profileDir, extraArgs):
   if status != 0:
     log.info("ERROR FAIL Exited with code %d during test run", status)
 
-  if (IS_TEST_BUILD):
-    ssltunnelProcess.kill()
+  ssltunnelProcess.kill()
   
   return start
diff --git a/testing/mochitest/Makefile.in b/testing/mochitest/Makefile.in
index 648b0486bc7..47946da67b7 100644
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -120,12 +120,6 @@ ifeq ($(host_os), cygwin)
 TEST_DRIVER_PPARGS += -DIS_CYGWIN=1
 endif
 
-ifeq ($(ENABLE_TESTS), 1)
-AUTOMATION_PPARGS += -DIS_TEST_BUILD=1
-else
-AUTOMATION_PPARGS += -DIS_TEST_BUILD=0
-endif
-
 runtests.py: runtests.py.in
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
 	$(TEST_DRIVER_PPARGS) $(DEFINES) $(ACDEFINES) $^ > $@