follow up to bug 548207, test for WINCE instead of CROSS_COMPILE due to make check failure on OSX
authorBrad Lassey <blassey@mozilla.com>
Wed, 10 Mar 2010 15:35:31 -0500
changeset 39227 ec4a706bfc322ca06ae64e898f31b40d3d60bca2
parent 39226 b7d0174a4d377bf6313b3e37ca54d731dd0bbe29
child 39228 359be6750f9535dd5ac52bc7a019a1993d50dbb5
push idunknown
push userunknown
push dateunknown
bugs548207
milestone1.9.3a3pre
follow up to bug 548207, test for WINCE instead of CROSS_COMPILE due to make check failure on OSX
Makefile.in
config/config.mk
js/src/Makefile.in
js/src/config/config.mk
xpcom/tests/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -80,17 +80,17 @@ include $(topsrcdir)/config/config.mk
 
 GARBAGE_DIRS += dist _javagen _profile _tests staticlib
 DIST_GARBAGE = config.cache config.log config.status config-defs.h \
    dependencies.beos config/autoconf.mk \
    unallmakefiles mozilla-config.h \
    netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \
    $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out
 
-ifdef CROSS_COMPILE
+ifdef WINCE
 check::
 	$(PYTHON) $(topsrcdir)/build/mobile/devicemanager-utils.py copy $(DIST)/bin
 endif
 
 default alldep all:: $(topsrcdir)/configure config.status
 	$(RM) -rf $(DIST)/sdk
 	$(RM) -rf $(DIST)/include
 	$(RM) -rf $(DIST)/private
--- a/config/config.mk
+++ b/config/config.mk
@@ -812,17 +812,17 @@ ifdef LOCALE_MERGEDIR
 MAKE_JARS_FLAGS += -c $(LOCALE_MERGEDIR)/$(subst /locales,,$(relativesrcdir))
 endif
 MAKE_JARS_FLAGS += -c $(LOCALE_SRCDIR)
 ifdef LOCALE_MERGEDIR
 MAKE_JARS_FLAGS += -c $(topsrcdir)/$(relativesrcdir)/en-US
 endif
 endif
 
-ifdef CROSS_COMPILE
+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)
 RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd "$(DIST)"
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -360,17 +360,17 @@ check::
 	$(check-sync-dirs) $(srcdir)/build $(MOZ_SYNC_BUILD_FILES)/build
 
 check-valgrind::
 	$(check-sync-dirs) $(srcdir)/config $(MOZ_SYNC_BUILD_FILES)/config
 	$(check-sync-dirs) $(srcdir)/build $(MOZ_SYNC_BUILD_FILES)/build
 endif
 
 ifdef ENABLE_TRACEJIT
-ifndef CROSS_COMPILE
+ifndef WINCE
 check::
 	$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/trace-test/trace-test.py \
 	        --no-slow --no-progress --tinderbox $(DIST)/bin/js$(BIN_SUFFIX)
 
 check-valgrind::
 	$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/trace-test/trace-test.py \
 	        --valgrind --no-slow --no-progress --tinderbox $(DIST)/bin/js$(BIN_SUFFIX)
 endif
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -812,17 +812,17 @@ ifdef LOCALE_MERGEDIR
 MAKE_JARS_FLAGS += -c $(LOCALE_MERGEDIR)/$(subst /locales,,$(relativesrcdir))
 endif
 MAKE_JARS_FLAGS += -c $(LOCALE_SRCDIR)
 ifdef LOCALE_MERGEDIR
 MAKE_JARS_FLAGS += -c $(topsrcdir)/$(relativesrcdir)/en-US
 endif
 endif
 
-ifdef CROSS_COMPILE
+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)
 RUN_TEST_PROGRAM = $(topsrcdir)/build/os2/test_os2.cmd "$(DIST)"
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -179,17 +179,17 @@ ifeq (,$(filter-out WINNT WINCE os2-emx,
 swapslashes = $(shell echo $(1) | sed -e 's|/|\\|g')
 getnativepath = $(call swapslashes,$(call normalizepath,$(1)))
 else
 getnativepath = $(1)
 endif
 
 abs_srcdir = $(shell cd $(srcdir) && pwd)
 
-ifdef CROSS_COMPILE
+ifdef WINCE
 DM_RM = $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-utils.py delete
 DM_CP = $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-utils.py copy
 
 RM_DIST = $(DM_RM)
 regOrderDir=\\tests\\regorder; # This is WinCe specific, adjust for other platforms
 DOCOPY=$(DM_CP)  $(srcdir)/regorder $(regOrderDir)
 else
 DIST_PATH = $(DIST)/bin/