From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 30 Sep 2013 14:22:05 +0000 (+0200)
Subject: Merge 3.3
X-Git-Tag: v3.4.0a4~308
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2512caedd7a51537be3241eeae78baaad09321ac;p=python

Merge 3.3
---

2512caedd7a51537be3241eeae78baaad09321ac
diff --cc Makefile.pre.in
index 1d7b7c3c66,471b96602b..fd0f7e7e6f
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@@ -941,11 -893,12 +941,14 @@@ buildbottest:	all platfor
  		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 test_mailbox test_socket test_poll \
 +		test_multiprocessing_fork test_multiprocessing_spawn \
 +		test_multiprocessing_forkserver \
 +		test_mailbox test_socket test_poll \
  		test_select test_zipfile test_concurrent_futures
  quicktest:	all platform
  		$(TESTRUNNER) $(QUICKTESTOPTS)