diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-12 00:20:24 +0000 |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-12 00:20:24 +0000 |
| commit | 53203f1eca0997ac5c07e4159182f3d1b36a4a1d (patch) | |
| tree | 3c8ef2177cd6859361f150bfef8ee53ac0fb59bf /Makefile.pre.in | |
| parent | 16b1d2b71c0f51c0bc6d8b288715edfbd75be172 (diff) | |
| download | cpython-git-53203f1eca0997ac5c07e4159182f3d1b36a4a1d.tar.gz | |
Merged revisions 79983 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r79983 | antoine.pitrou | 2010-04-12 02:16:50 +0200 (lun., 12 avril 2010) | 14 lines
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 0d772a8f20..c60d253f06 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -715,8 +715,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. @@ -726,9 +726,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 @@ -737,7 +737,7 @@ buildbottest: all platform -@if which pybuildbot.identify >/dev/null 2>&1; then \ pybuildbot.identify "CC='$(CC)'" "CXX='$(CXX)'"; \ fi - $(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall -rw + $(TESTPYTHON) $(TESTPROG) -uall -rw $(TESTOPTS) QUICKTESTOPTS= $(TESTOPTS) -x test_subprocess test_io test_lib2to3 \ test_multibytecodec test_urllib2_localnet test_itertools \ |