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)

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 1047f438f511a2c13e9eaa36672ec8791616c830..2d18d62a493369c2e18709d3f368d5f2817d6a3b 100644 (file)
--- 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 \