From 8fc4aacb7fba5fb04e3f942ad96d9adace020113 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Sun, 28 Sep 2014 21:16:54 +0200 Subject: [PATCH] Regressions due to the changes in find_program --- demos/wscript | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/demos/wscript b/demos/wscript index 49a196ef..47348b02 100644 --- a/demos/wscript +++ b/demos/wscript @@ -15,10 +15,10 @@ if "uname" in dir(os): machine = os.uname()[1] elif sys.platform == "win32": machine = os.environ["COMPUTERNAME"] else: raise Exception("Unknown platform, cannot get machine name") -from waflib import Logs +from waflib import Logs, Errors # python 2.3 tends to hang for whatever reason :-/ -PYTHONS = "2.4 2.5 2.6 2.7 3.0 3.1 3.2 3.3".split() +PYTHONS = "2.4 2.5 2.6 2.7 3.0 3.1 3.2 3.3 3.4".split() DIRS = ['c', 'python'] @@ -82,8 +82,8 @@ def configure(conf): try: conf.find_program('python'+x, var=x) # unpacking the waf directory concurrently can lead to a race condition, we'll need to take care of this (thanks, build farm!) - conf.cmd_and_log(conf.env[x] + " ./waf --version", env={}) - except: + conf.cmd_and_log(conf.env[x] + ['./waf', '--version'], env={}) + except Exception as e: pass else: conf.env.append_value('PYTHONS', x) @@ -107,14 +107,14 @@ def installcheck(bld): #print('testsuite: waflib') def waf_cmd(self): - cmd = [self.env[self.generator.python], self.env.WAF, 'distclean', 'configure', 'build', 'clean', 'build', '-o', 'build' + self.generator.python] + cmd = self.env[self.generator.python] + [self.env.WAF, 'distclean', 'configure', 'build', 'clean', 'build', '-o', 'build' + self.generator.python] cwd = self.generator.cwd env = dict(os.environ) env['WAFDIR'] = '' env['WAFLOCK'] = '.lock-wscript' + self.generator.python # use a different build directory for each build try: bld.cmd_and_log(cmd, cwd=cwd, env=env, quiet=0, ) - except: + except Errors.WafError as e: e = sys.exc_info()[1] s = "testsuite: %s\ntestsuite-xfail: %s [ %s \n %s ]\n" % (self.generator.name, self.generator.name, e.stderr, e.stdout) Logs.info(s)