[Python-checkins] r85473 - in python/branches/release31-maint: Makefile.pre.in

[antoine.pitrou]

Author: antoine.pitrou
Date: Thu Oct 14 13:35:17 2010
New Revision: 85473

Log:
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
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Makefile.pre.in

Modified: python/branches/release31-maint/Makefile.pre.in
==============================================================================
--- python/branches/release31-maint/Makefile.pre.in	(original)
+++ python/branches/release31-maint/Makefile.pre.in	Thu Oct 14 13:35:17 2010
@@ -705,7 +705,7 @@
 
 TESTOPTS=	-l $(EXTRATESTOPTS)
 TESTPROG=	$(srcdir)/Lib/test/regrtest.py
-TESTPYTHON=	$(RUNSHARED) ./$(BUILDPYTHON) -E -bb
+TESTPYTHON=	$(RUNSHARED) ./$(BUILDPYTHON) -E -bb $(TESTPYTHONOPTS)
 test:		all platform
 		-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
 		-$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)