Merged revisions 85472 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85472 | antoine.pitrou | 2010-10-14 13:29:16 +0200 (jeu., 14 oct. 2010) | 3 lines

  Add make variable to allow testing of different interpreter flags in buildbot runs
........

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 0f0318cf94d84f3872286fa4356e1a9f6d295ee0..9bcbdab5555bcced35dbfe4cbc694bcbf4626262 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -702,7 +702,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS)
 
 TESTOPTS=      -l $(EXTRATESTOPTS)
 TESTPROG=      $(srcdir)/Lib/test/regrtest.py
-TESTPYTHON=    $(RUNSHARED) ./$(BUILDPYTHON) -Wd -3 -E -tt
+TESTPYTHON=    $(RUNSHARED) ./$(BUILDPYTHON) -Wd -3 -E -tt $(TESTPYTHONOPTS)
 test:          all platform
                -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
                -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)