From 8fddfc7d30ea664e628e09fe3676b10bbed48159 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Wed, 24 Mar 2010 00:24:38 +0100
Subject: [PATCH] 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        | 14 +++++++-------
 js/src/config/config.mk | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/config/config.mk b/config/config.mk
index 8374a0d2508..c3f2d65f4a6 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -768,14 +768,14 @@ endif
 ifdef WINCE
 RUN_TEST_PROGRAM = $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-run-test.py
 else
-ifeq (,$(filter WINCE WINNT OS2,$(OS_ARCH)))
-RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh
-endif
-
-ifeq ($(OS_ARCH),OS2)
+ifeq (OS2,$(OS_ARCH))
 RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd "$(DIST)"
-endif
-endif
+else
+ifneq (WINNT,$(OS_ARCH))
+RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh
+endif # ! WINNT
+endif # ! OS2
+endif # ! WINCE
 
 #
 # Java macros
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index 8374a0d2508..c3f2d65f4a6 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -768,14 +768,14 @@ endif
 ifdef WINCE
 RUN_TEST_PROGRAM = $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-run-test.py
 else
-ifeq (,$(filter WINCE WINNT OS2,$(OS_ARCH)))
-RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh
-endif
-
-ifeq ($(OS_ARCH),OS2)
+ifeq (OS2,$(OS_ARCH))
 RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd "$(DIST)"
-endif
-endif
+else
+ifneq (WINNT,$(OS_ARCH))
+RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh
+endif # ! WINNT
+endif # ! OS2
+endif # ! WINCE
 
 #
 # Java macros