diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-12 00:10:46 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-12 00:10:46 (GMT) |
| commit | 98431789fb772771eb1113c89971f6e0ce6de3ad (patch) | |
| tree | 0427978de0c24f5807c2f45333658f04eb10f077 /Makefile.pre.in | |
| parent | ab5ce720e2accfee979e2bbbd1691a03dfe276be (diff) | |
| download | cpython-98431789fb772771eb1113c89971f6e0ce6de3ad.zip cpython-98431789fb772771eb1113c89971f6e0ce6de3ad.tar.gz cpython-98431789fb772771eb1113c89971f6e0ce6de3ad.tar.bz2 | |
It is possible to add extra testing options using EXTRATESTOPTS.
When such extra options include "-x testname", subsequent arguments
are all taken as test names to ignore. Therefore, standard options
must be passed before *TESTOPTS.
(witnessed on the ARM buildbots)
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 1047f43..2d18d62 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -712,8 +712,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) $(TESTOPTS) -uall - $(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall + -$(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS) + $(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS) # Run the unitests for both architectures in a Universal build on OSX # Must be run on an Intel box. @@ -723,9 +723,9 @@ testuniversal: all platform exit 1 ;\ fi -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f - -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall - $(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall - $(RUNSHARED) /usr/libexec/oah/translate ./$(BUILDPYTHON) -E -tt $(TESTPROG) $(TESTOPTS) -uall + -$(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS) + $(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS) + $(RUNSHARED) /usr/libexec/oah/translate ./$(BUILDPYTHON) -E -tt $(TESTPROG) -uall $(TESTOPTS) # Like testall, but with a single pass only @@ -734,7 +734,7 @@ buildbottest: all platform -@if which pybuildbot.identify >/dev/null 2>&1; then \ pybuildbot.identify "CC='$(CC)'" "CXX='$(CXX)'"; \ fi - $(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall -rwW + $(TESTPYTHON) $(TESTPROG) -uall -rwW $(TESTOPTS) QUICKTESTOPTS= $(TESTOPTS) -x test_subprocess test_io test_lib2to3 \ test_multibytecodec test_urllib2_localnet test_itertools \ |