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 bb230bb04e5c7ed46f7890b0b6a5398efeb5772c..5e37f36da65fe40c59f52629945adb2ea7c20e92 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -686,8 +686,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.
@@ -697,9 +697,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
@@ -708,7 +708,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_thread test_signal test_strftime \
                test_unicodedata test_re test_sre test_select test_poll \