Merge 3.3

2512caed · Martin v. Löwis · a27af806 · 7ab8c872 · 2512caed
Commit 2512caed authored Sep 30, 2013 by Martin v. Löwis
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

Makefile.pre.in Makefile.pre.in +3 -0

No files found.
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -941,6 +941,9 @@ 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 \