Bug 548207 - allow make check to run over remote connection from devicemanager.py; (Dv1a) Tidy up RUN_TEST_PROGRAM conditionals.

r=ted.mielczarek.
This commit is contained in:
Serge Gautherie 2010-03-24 00:24:38 +01:00
parent c695ba905c
commit 8fddfc7d30
2 changed files with 14 additions and 14 deletions

View File

@ -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

View File

@ -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