Bug 548207 - allow make check to run over remote connection from devicemanager.py; (Dv1a) Tidy up RUN_TEST_PROGRAM conditionals.
authorSerge Gautherie <sgautherie.bz@free.fr>
Wed, 24 Mar 2010 00:24:38 +0100
changeset 39754 88d23abb0c694aa036ef680085439f08ae7b99d5
parent 39753 694082ea95bf2e8778a79fdd4b976f391110df49
child 39755 f882c976f8e1ec8bd5808c4f718b075edf1964e1
push id12385
push usersgautherie.bz@free.fr
push dateTue, 23 Mar 2010 23:25:35 +0000
treeherdermozilla-central@f882c976f8e1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs548207
milestone1.9.3a4pre
Bug 548207 - allow make check to run over remote connection from devicemanager.py; (Dv1a) Tidy up RUN_TEST_PROGRAM conditionals. r=ted.mielczarek.
config/config.mk
js/src/config/config.mk
--- a/config/config.mk
+++ b/config/config.mk
@@ -763,24 +763,24 @@ MAKE_JARS_FLAGS += -c $(LOCALE_SRCDIR)
 ifdef LOCALE_MERGEDIR
 MAKE_JARS_FLAGS += -c $(topsrcdir)/$(relativesrcdir)/en-US
 endif
 endif
 
 ifdef WINCE
 RUN_TEST_PROGRAM = $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-run-test.py
 else
-ifeq (,$(filter WINCE WINNT OS2,$(OS_ARCH)))
+ifeq (OS2,$(OS_ARCH))
+RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd "$(DIST)"
+else
+ifneq (WINNT,$(OS_ARCH))
 RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh
-endif
-
-ifeq ($(OS_ARCH),OS2)
-RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd "$(DIST)"
-endif
-endif
+endif # ! WINNT
+endif # ! OS2
+endif # ! WINCE
 
 #
 # Java macros
 #
 
 # Make sure any compiled classes work with at least JVM 1.4
 JAVAC_FLAGS += -source 1.4
 
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -763,24 +763,24 @@ MAKE_JARS_FLAGS += -c $(LOCALE_SRCDIR)
 ifdef LOCALE_MERGEDIR
 MAKE_JARS_FLAGS += -c $(topsrcdir)/$(relativesrcdir)/en-US
 endif
 endif
 
 ifdef WINCE
 RUN_TEST_PROGRAM = $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-run-test.py
 else
-ifeq (,$(filter WINCE WINNT OS2,$(OS_ARCH)))
+ifeq (OS2,$(OS_ARCH))
+RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd "$(DIST)"
+else
+ifneq (WINNT,$(OS_ARCH))
 RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh
-endif
-
-ifeq ($(OS_ARCH),OS2)
-RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd "$(DIST)"
-endif
-endif
+endif # ! WINNT
+endif # ! OS2
+endif # ! WINCE
 
 #
 # Java macros
 #
 
 # Make sure any compiled classes work with at least JVM 1.4
 JAVAC_FLAGS += -source 1.4