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)
........

diff --git a/Makefile.pre.in b/Makefile.pre.in
index eaff82265c6cdd4df895e9b3acadd7f9b9305f76..e3fdf410ec17383abcfe5f0f27919e0376f13ef6 100644 (file)
--- 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 \