Author: Matti Picus <matti.pi...@gmail.com> Branch: Changeset: r93872:ea67338ed935 Date: 2018-02-19 21:09 +0200 http://bitbucket.org/pypy/pypy/changeset/ea67338ed935/
Log: add externals/bin to PATH so tests pick up correct dlls (grafted from b0c75af579f53dcf071cef141b704c50e90fbaf8) 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 @@ -535,7 +535,13 @@ # The buildbot runs get_externals before building def patch_env(env, externals = Platform.externals): #print 'adding %s to PATH, INCLUDE, LIB' % basepath - env['PATH'] = externals + r'\bin;' + env.get('PATH', '') + binpath = externals + r'\bin' + path = os.environ['PATH'] + if binpath not in path.split(';'): + path = binpath + ';' + path + # make sure externals is in current path for tests and translating + os.environ['PATH'] = path + env['PATH'] = binpath + ';' + env.get('PATH', '') env['INCLUDE'] = externals + r'\include;' + env.get('INCLUDE', '') env['LIB'] = externals + r'\lib;' + env.get('LIB', '') return None _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit