summaryrefslogtreecommitdiffstats
path: root/Makefile.pre.in
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2013-09-30 14:22:05 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2013-09-30 14:22:05 (GMT)
commit2512caedd7a51537be3241eeae78baaad09321ac (patch)
treec61c82614949b102bc7096527fe8b3f7f2cc2125 /Makefile.pre.in
parenta27af80614e598dd0e1830bc56e0cc7699fc8197 (diff)
parent7ab8c872d315d6b705d8e4286b66234b260a0c9f (diff)
downloadcpython-2512caedd7a51537be3241eeae78baaad09321ac.zip
cpython-2512caedd7a51537be3241eeae78baaad09321ac.tar.gz
cpython-2512caedd7a51537be3241eeae78baaad09321ac.tar.bz2
Merge 3.3
Diffstat (limited to 'Makefile.pre.in')
-rw-r--r--Makefile.pre.in3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 1d7b7c3..fd0f7e7 100644
--- 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 \