summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-10-14 11:35:17 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-10-14 11:35:17 (GMT)
commitc8ef6436d833b06f2b916127701abebb114ed38c (patch)
tree12cb00c677230ae04543d7234efa0304fa5a80e7
parent35ce42f20d17db5ec2ebe535e6f966895e407eb0 (diff)
downloadcpython-c8ef6436d833b06f2b916127701abebb114ed38c.zip
cpython-c8ef6436d833b06f2b916127701abebb114ed38c.tar.gz
cpython-c8ef6436d833b06f2b916127701abebb114ed38c.tar.bz2
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 ........
-rw-r--r--Makefile.pre.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 21e514f..51134fe 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -705,7 +705,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS)
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)