diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-02-21 02:44:56 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-02-21 02:44:56 (GMT) |
| commit | aee9dfba4a9230f2832dd69d67e92f8e0490a163 (patch) | |
| tree | 27a9896969ac7ff79dc75017cff121a077c3eb6e /Makefile.pre.in | |
| parent | 34b345b8885e5db8ab6627c081ca86a8b78b6989 (diff) | |
| parent | b19fb2462eac776746f6cb40cc84b0587c83b9bc (diff) | |
| download | cpython-aee9dfba4a9230f2832dd69d67e92f8e0490a163.zip cpython-aee9dfba4a9230f2832dd69d67e92f8e0490a163.tar.gz cpython-aee9dfba4a9230f2832dd69d67e92f8e0490a163.tar.bz2 | |
merge 2.6 with hash randomization fix
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 340da24..e2237a9 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -290,6 +290,7 @@ PYTHON_OBJS= \ Python/pymath.o \ Python/pystate.o \ Python/pythonrun.o \ + Python/random.o \ Python/structmember.o \ Python/symtable.o \ Python/sysmodule.o \ @@ -739,7 +740,7 @@ buildbottest: all platform -@if which pybuildbot.identify >/dev/null 2>&1; then \ pybuildbot.identify "CC='$(CC)'" "CXX='$(CXX)'"; \ fi - $(TESTPYTHON) $(TESTPROG) -uall -rwW $(TESTOPTS) + $(TESTPYTHON) -R $(TESTPROG) -uall -rwW $(TESTOPTS) QUICKTESTOPTS= $(TESTOPTS) -x test_subprocess test_io test_lib2to3 \ test_multibytecodec test_urllib2_localnet test_itertools \ |