summaryrefslogtreecommitdiffstats
path: root/Makefile.pre.in
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2013-10-02 14:59:41 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2013-10-02 14:59:41 (GMT)
commit73c6ee00805729919f98d4f2dbe27e16c54b4db2 (patch)
tree80b0815ef53aefe30f0e5bdff5f54c022cd2c98d /Makefile.pre.in
parent0de3f0197b564c138f4115badd34dbb67628477f (diff)
parent706f0f5f57ace45d061206e1fb873f5a33c61b44 (diff)
downloadcpython-73c6ee00805729919f98d4f2dbe27e16c54b4db2.zip
cpython-73c6ee00805729919f98d4f2dbe27e16c54b4db2.tar.gz
cpython-73c6ee00805729919f98d4f2dbe27e16c54b4db2.tar.bz2
Merge 3.3
Diffstat (limited to 'Makefile.pre.in')
-rw-r--r--Makefile.pre.in3
1 files changed, 0 insertions, 3 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index fd0f7e7..1d7b7c3 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -941,9 +941,6 @@ buildbottest: all platform
fi
$(TESTRUNNER) -j 1 -u all -W --timeout=$(TESTTIMEOUT) $(TESTOPTS)
-# Like touch, but also working on 2.7 (where the target is a no-op)
-buildbottouch: touch
-
QUICKTESTOPTS= $(TESTOPTS) -x test_subprocess test_io test_lib2to3 \
test_multibytecodec test_urllib2_localnet test_itertools \
test_multiprocessing_fork test_multiprocessing_spawn \