Bug 455813 - Windows PGO builds fail when --disable-tests is set; v2; ted.mielczarek

build/Makefile.in

@@ -104,6 +104,12 @@ 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 =    \

build/pgo/Makefile.in

@@ -108,6 +108,12 @@ 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) $^ > $@

build/pgo/automation.py.in

@@ -83,6 +83,7 @@ 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 #
@@ -443,15 +444,17 @@ def environment(env = None):
 ###############
 
 def runApp(testURL, env, app, profileDir, extraArgs):
-  # 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)
+  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)
   
   "Run the app, returning the time at which it was started."
   # mark the start
@@ -484,6 +487,7 @@ def runApp(testURL, env, app, profileDir, extraArgs):
   if status != 0:
     log.info("ERROR FAIL Exited with code %d during test run", status)
 
-  ssltunnelProcess.kill()
+  if (IS_TEST_BUILD):
+    ssltunnelProcess.kill()
   
   return start

testing/mochitest/Makefile.in

@@ -120,6 +120,12 @@ ifeq ($(host_os), cygwin)
 TEST_DRIVER_PPARGS += -DIS_CYGWIN=1
 endif
 
+ifeq ($(ENABLE_TESTS), 1)
+TEST_DRIVER_PPARGS += -DIS_TEST_BUILD=1
+else
+TEST_DRIVER_PPARGS += -DIS_TEST_BUILD=0
+endif
+
 runtests.py: runtests.py.in
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
 	$(TEST_DRIVER_PPARGS) $(DEFINES) $(ACDEFINES) $^ > $@