diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-12 00:16:50 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-12 00:16:50 (GMT) |
| commit | e09b6238d5b8ee184d258d7cb56713e889096d84 (patch) | |
| tree | e8c9902601181aedfc037deec78aaad5dd524cb8 /Makefile.pre.in | |
| parent | 9faa7ec08bb1634aa447a6f6cc0c315deb453be3 (diff) | |
| download | cpython-e09b6238d5b8ee184d258d7cb56713e889096d84.zip cpython-e09b6238d5b8ee184d258d7cb56713e889096d84.tar.gz cpython-e09b6238d5b8ee184d258d7cb56713e889096d84.tar.bz2 | |
Merged revisions 79982 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79982 | antoine.pitrou | 2010-04-12 02:10:46 +0200 (lun., 12 avril 2010) | 8 lines
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 eaff822..e3fdf41 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -729,8 +729,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. @@ -740,9 +740,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 $(TESTPROG) $(TESTOPTS) -uall + -$(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS) + $(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS) + $(RUNSHARED) /usr/libexec/oah/translate ./$(BUILDPYTHON) -E $(TESTPROG) -uall $(TESTOPTS) # Like testall, but with a single pass only @@ -751,7 +751,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 \ |