diff options
author | Martin v. Löwis <martin@v.loewis.de> | 2013-10-02 16:59:41 +0200 |
---|---|---|
committer | Martin v. Löwis <martin@v.loewis.de> | 2013-10-02 16:59:41 +0200 |
commit | 73c6ee00805729919f98d4f2dbe27e16c54b4db2 (patch) | |
tree | 80b0815ef53aefe30f0e5bdff5f54c022cd2c98d | |
parent | 0de3f0197b564c138f4115badd34dbb67628477f (diff) | |
parent | 706f0f5f57ace45d061206e1fb873f5a33c61b44 (diff) | |
download | cpython-git-73c6ee00805729919f98d4f2dbe27e16c54b4db2.tar.gz |
Merge 3.3
-rw-r--r-- | Makefile.pre.in | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index fd0f7e7e6f..1d7b7c3c66 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 \ |