From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 14 Oct 2010 11:37:30 +0000 (+0000)
Subject: Merged revisions 85472 via svnmerge from
X-Git-Tag: v2.7.1rc1~162
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3125f5039d71c03e6666394fd0adfa96d19a02b5;p=python

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 0f0318cf94..9bcbdab555 100644
--- 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)