[Python-checkins] cpython: Oops, "make buildbottest" isn't supposed to use -j0.

nadeem.vawda python-checkins at python.org
Sun Jul 31 14:04:50 CEST 2011


http://hg.python.org/cpython/rev/372679ff8705
changeset:   71655:372679ff8705
parent:      71651:6bbe07737027
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun Jul 31 13:58:05 2011 +0200
summary:
  Oops, "make buildbottest" isn't supposed to use -j0.

files:
  Makefile.pre.in |  16 ++++++++--------
  1 files changed, 8 insertions(+), 8 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -749,12 +749,12 @@
 
 # Run a basic set of regression tests.
 # This excludes some tests that are particularly resource-intensive.
-TESTOPTS=	-j0 $(EXTRATESTOPTS)
+TESTOPTS=	$(EXTRATESTOPTS)
 TESTPROG=	$(srcdir)/Lib/test/regrtest.py
 TESTPYTHON=	$(RUNSHARED) ./$(BUILDPYTHON) -Wd -E -bb $(TESTPYTHONOPTS)
 TESTTIMEOUT=	3600
 test:		all platform
-		$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
+		$(TESTPYTHON) $(TESTPROG) -j0 $(TESTOPTS)
 
 # Run the full test suite twice - once without .pyc files, and once with.
 # In the past, we've had problems where bugs in the marshalling or
@@ -767,8 +767,8 @@
 		-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
 		$(TESTPYTHON) $(srcdir)/Lib/compileall.py
 		-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
-		-$(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS)
-		$(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS)
+		-$(TESTPYTHON) $(TESTPROG) -j0 -uall $(TESTOPTS)
+		$(TESTPYTHON) $(TESTPROG) -j0 -uall $(TESTOPTS)
 
 # Run the test suite for both architectures in a Universal build on OSX.
 # Must be run on an Intel box.
@@ -777,8 +777,8 @@
 			echo "This can only be used on OSX/i386" ;\
 			exit 1 ;\
 		fi
-		$(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS)
-		$(RUNSHARED) /usr/libexec/oah/translate ./$(BUILDPYTHON) -E $(TESTPROG) -uall $(TESTOPTS)
+		$(TESTPYTHON) $(TESTPROG) -j0 -uall $(TESTOPTS)
+		$(RUNSHARED) /usr/libexec/oah/translate ./$(BUILDPYTHON) -E $(TESTPROG) -j0 -uall $(TESTOPTS)
 
 # Like testall, but with only one pass.
 # Run an optional script to include information about the build environment.
@@ -794,8 +794,8 @@
 		test_select test_zipfile
 quicktest:	all platform
 		-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
-		-$(TESTPYTHON) $(TESTPROG) $(QUICKTESTOPTS)
-		$(TESTPYTHON) $(TESTPROG) $(QUICKTESTOPTS)
+		-$(TESTPYTHON) $(TESTPROG) -j0 $(QUICKTESTOPTS)
+		$(TESTPYTHON) $(TESTPROG) -j0 $(QUICKTESTOPTS)
 
 
 install: altinstall bininstall

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list