Bug 493611 - use $(MAKE) throughout the unit tests instead of make; r=ted.mielczarek
authorMarco Perez <bugmail@millibyte.net>
Tue, 26 May 2009 18:40:26 +0200
changeset 28773 4e4f6175bfeb2ef8d8ffdee1cbbe67961704ea6e
parent 28772 cf17e49a665a730e56e1d13ea29351d67cb942dd
child 28774 e31e8be2736aa391e079ea0cac88cf6df37e0fd9
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs493611
milestone1.9.2a1pre
Bug 493611 - use $(MAKE) throughout the unit tests instead of make; r=ted.mielczarek
config/Makefile.in
config/tests/src-simple/Makefile.in
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -161,14 +161,14 @@ check:: check-python-modules check-jar-m
 
 check-python-modules::
 	@$(EXIT_ON_ERROR) \
 	for test in $(PYUNITS); do \
 	  $(PYTHON) $(srcdir)/tests/$$test ; \
 	done
 
 check-jar-mn::
-	make -C tests/src-simple check-jar
-	make -C tests/src-simple check-flat
-	make -C tests/src-simple check-flat USE_EXTENSION_MANIFEST=1
+	$(MAKE) -C tests/src-simple check-jar
+	$(MAKE) -C tests/src-simple check-flat
+	$(MAKE) -C tests/src-simple check-flat USE_EXTENSION_MANIFEST=1
 ifneq (,$(filter-out WINNT OS2,$(OS_ARCH)))
-	make -C tests/src-simple check-symlink
+	$(MAKE) -C tests/src-simple check-symlink
 endif
--- a/config/tests/src-simple/Makefile.in
+++ b/config/tests/src-simple/Makefile.in
@@ -52,17 +52,17 @@ DEFINES += \
 	-DAB_CD=ab-X-stuff \
 	$(NULL)
 
 MY_MANIFEST = $(if $(USE_EXTENSION_MANIFEST), $(FINAL_TARGET)/chrome.manifest, $(FINAL_TARGET)/chrome/test.manifest)
 REF_MANIFEST = $(if $(USE_EXTENSION_MANIFEST),chrome.manifest,test.manifest)
 
 check-%::
 	if test -d $(FINAL_TARGET); then rm -rf $(FINAL_TARGET); fi;
-	make realchrome MOZ_CHROME_FILE_FORMAT=$*
+	$(MAKE) realchrome MOZ_CHROME_FILE_FORMAT=$*
 	@echo "Comparing manifests..."
 	@if ! sort $(MY_MANIFEST) | diff --text -U 0 $(srcdir)/../$(REF_MANIFEST).$* - ; then \
 	  echo "TEST-UNEXPECTED-FAIL | config/tests/$(REF_MANIFEST).$* | differing content in manifest!" ; \
 	  false; \
 	fi
 	@if [ $* = "jar" ]; then \
 	  $(UNZIP) -d $(FINAL_TARGET)/chrome/test $(FINAL_TARGET)/chrome/test.jar; \
 	fi