diff options
| author | doko <doko@ubuntu.com> | 2016-03-23 12:58:00 +0100 |
|---|---|---|
| committer | doko <doko@ubuntu.com> | 2016-03-23 12:58:00 +0100 |
| commit | fbbf427579a48399b174bd01400e700b71fc2a38 (patch) | |
| tree | 83946147693d6b84bc9ba90f58888d490d3d220c /Makefile.pre.in | |
| parent | 25195e8913d29a6c9683e22649de3df5c04053bf (diff) | |
| parent | aa515aa420a3f160bdf09ff44be0c43f9093d2fb (diff) | |
| download | cpython-fbbf427579a48399b174bd01400e700b71fc2a38.tar.gz | |
Merge 3.5
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index fc2d7095c8..6dd1b51203 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -568,7 +568,7 @@ $(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) platform: $(BUILDPYTHON) pybuilddir.txt - $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform + $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform # Create build directory and generate the sysconfig build-time data there. # pybuilddir.txt contains the name of the build dir and is used for @@ -974,7 +974,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/python.o: $(PYTHON_HEADERS) TESTOPTS= $(EXTRATESTOPTS) TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) $(TESTPYTHONOPTS) TESTRUNNER= $(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py -TESTTIMEOUT= 3600 +TESTTIMEOUT= 900 # Run a basic set of regression tests. # This excludes some tests that are particularly resource-intensive. @@ -1175,6 +1175,7 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ test/cjkencodings test/decimaltestdata test/xmltestdata \ test/eintrdata \ test/imghdrdata \ + test/libregrtest \ test/subprocessdata test/sndhdrdata test/support \ test/tracedmodules test/encoded_modules \ test/test_import \ |