diff options
| author | Nadeem Vawda <nadeem.vawda@gmail.com> | 2011-07-31 13:58:05 +0200 |
|---|---|---|
| committer | Nadeem Vawda <nadeem.vawda@gmail.com> | 2011-07-31 13:58:05 +0200 |
| commit | 1f992bfd24a53c316a53b69f6e96b12865b64f36 (patch) | |
| tree | 9fa963bad24598f0bf648997ee2838584625251a /Makefile.pre.in | |
| parent | abaf669ada1b25ead5265041a9b59655a71d3f17 (diff) | |
| download | cpython-1f992bfd24a53c316a53b69f6e96b12865b64f36.tar.gz | |
Oops, "make buildbottest" isn't supposed to use -j0.
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index a253f41c81..0c7b180d90 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -749,12 +749,12 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS) # 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 @@ testall: all platform -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 @@ testuniversal: all platform 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 @@ QUICKTESTOPTS= $(TESTOPTS) -x test_subprocess test_io test_lib2to3 \ 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 |