Merge 3.3

This commit is contained in:
Martin v. Löwis 2013-10-02 16:59:41 +02:00
commit 73c6ee0080
1 changed files with 0 additions and 3 deletions

View File

@ -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 \