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) ........ ................
This commit is contained in:
parent
16b1d2b71c
commit
53203f1eca
|
@ -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 \
|
||||
|
|
Loading…
Reference in New Issue