Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: py3.5
Changeset: r95654:f7b6aeba6694
Date: 2019-01-16 20:36 +0000
http://bitbucket.org/pypy/pypy/changeset/f7b6aeba6694/
Log: hg merge default
diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -14,6 +14,14 @@
rsyncdirs = ['.', '../lib-python', '../lib_pypy', '../demo']
rsyncignore = ['_cache']
+try:
+ from hypothesis import settings
+except ImportError:
+ pass
+else:
+ settings.register_profile('default', deadline=None)
+ settings.load_profile('default')
+
# PyPy's command line extra options (these are added
# to py.test's standard options)
#
diff --git a/rpython/translator/platform/windows.py
b/rpython/translator/platform/windows.py
--- a/rpython/translator/platform/windows.py
+++ b/rpython/translator/platform/windows.py
@@ -83,12 +83,14 @@
stderr=subprocess.PIPE)
stdout, stderr = popen.communicate()
- if popen.wait() != 0:
+ if popen.wait() != 0 or stdout[:5].lower() == 'error':
+ log.msg('Running "%s" errored: \n\nstdout:\n%s\n\nstderr:\n%s'
% (
+ vcvars, stdout.split()[0], stderr))
return None
- if stdout[:5].lower() == 'error':
- log.msg('Running "%s" errored: %s' %(vcvars,
stdout.split()[0]))
- return None
- except:
+ else:
+ log.msg('Running "%s" succeeded' %(vcvars,))
+ except Exception as e:
+ log.msg('Running "%s" failed: "%s"', (vcvars, str(e)))
return None
stdout = stdout.replace("\r\n", "\n")
@@ -189,8 +191,13 @@
self.cc = cc
# detect version of current compiler
- returncode, stdout, stderr = _run_subprocess(self.cc, [],
+ try:
+ returncode, stdout, stderr = _run_subprocess(self.cc, [],
env=self.c_environ)
+ except EnvironmentError:
+ log.msg('Could not run %s using PATH=\n%s' %(self.cc,
+ '\n'.join(self.c_environ['PATH'].split(';'))))
+ raise
r = re.search(r'Microsoft.+C/C\+\+.+\s([0-9]+)\.([0-9]+).*', stderr)
if r is not None:
self.version = int(''.join(r.groups())) / 10 - 60
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
