From 447fe1ef8e8974b1862fa87fa730b38a50db0c7f Mon Sep 17 00:00:00 2001 From: William Deegan Date: Thu, 14 Jan 2016 11:38:14 -0800 Subject: fix test which was expecting a given location for python binary running the test --- test/Builder/multi/different-environments.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/Builder/multi/different-environments.py b/test/Builder/multi/different-environments.py index 68749cf..783b7f9 100644 --- a/test/Builder/multi/different-environments.py +++ b/test/Builder/multi/different-environments.py @@ -30,6 +30,7 @@ but the overrides don't appear to affect the build operation. """ import TestSCons +import sys test = TestSCons.TestSCons(match=TestSCons.match_re) @@ -57,9 +58,9 @@ test.write('file03b.in', 'file03b.in\n') expect = TestSCons.re_escape(""" scons: *** Two environments with different actions were specified for the same target: file03.out -(action 1: /usr/bin/python build.py 1 file03.out file03b.in) -(action 2: /usr/bin/python build.py 2 file03.out file03b.in) -""") + TestSCons.file_expr +(action 1: %s build.py 1 file03.out file03b.in) +(action 2: %s build.py 2 file03.out file03b.in) +""" % (sys.executable, sys.executable )) + TestSCons.file_expr test.run(arguments='file03.out', status=2, stderr=expect) -- cgit v0.12