From c4fc0ad2e86ca03de81332cc984db0e0ccd98959 Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Tue, 29 Sep 2015 13:22:24 -0700
Subject: Pull request # 234 (Bug #2840) code checkin. No tests yet
---
src/engine/SCons/Builder.py | 6 +++---
test/CPPDEFINES/pkg-config.py | 11 ++++++-----
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py
index 769b15d..52a592b 100644
--- a/src/engine/SCons/Builder.py
+++ b/src/engine/SCons/Builder.py
@@ -292,9 +292,9 @@ def _node_errors(builder, env, tlist, slist):
if t.has_explicit_builder():
if not t.env is None and not t.env is env:
action = t.builder.action
- t_contents = action.get_contents(tlist, slist, t.env)
- contents = action.get_contents(tlist, slist, env)
-
+ t_contents = t.builder.action.get_contents(tlist, slist, t.env)
+ contents = builder.action.get_contents(tlist, slist, env)
+
if t_contents == contents:
msg = "Two different environments were specified for target %s,\n\tbut they appear to have the same action: %s" % (t, action.genstring(tlist, slist, t.env))
SCons.Warnings.warn(SCons.Warnings.DuplicateEnvironmentWarning, msg)
diff --git a/test/CPPDEFINES/pkg-config.py b/test/CPPDEFINES/pkg-config.py
index 0656900..1b308d3 100644
--- a/test/CPPDEFINES/pkg-config.py
+++ b/test/CPPDEFINES/pkg-config.py
@@ -32,7 +32,8 @@ import TestSCons
test = TestSCons.TestSCons()
-if not test.where_is('pkg-config'):
+pkg_config_path = test.where_is('pkg-config')
+if not pkg_config_path:
test.skip_test("Could not find 'pkg-config' in system PATH, skipping test.\n")
test.write('bug.pc', """\
@@ -58,7 +59,7 @@ test.write('SConstruct', """\
# http://scons.tigris.org/issues/show_bug.cgi?id=2671
# Passing test cases
env_1 = Environment(CPPDEFINES=[('DEBUG','1'), 'TEST'])
-env_1.ParseConfig('PKG_CONFIG_PATH=. pkg-config --cflags bug')
+env_1.ParseConfig('PKG_CONFIG_PATH=. %(pkg_config_path)s --cflags bug')
print env_1.subst('$_CPPDEFFLAGS')
env_2 = Environment(CPPDEFINES=[('DEBUG','1'), 'TEST'])
@@ -67,7 +68,7 @@ print env_2.subst('$_CPPDEFFLAGS')
# Failing test cases
env_3 = Environment(CPPDEFINES={'DEBUG':1, 'TEST':None})
-env_3.ParseConfig('PKG_CONFIG_PATH=. pkg-config --cflags bug')
+env_3.ParseConfig('PKG_CONFIG_PATH=. %(pkg_config_path)s --cflags bug')
print env_3.subst('$_CPPDEFFLAGS')
env_4 = Environment(CPPDEFINES={'DEBUG':1, 'TEST':None})
@@ -76,10 +77,10 @@ print env_4.subst('$_CPPDEFFLAGS')
# http://scons.tigris.org/issues/show_bug.cgi?id=1738
env_1738_1 = Environment(tools=['default'])
-env_1738_1.ParseConfig('PKG_CONFIG_PATH=. pkg-config --cflags --libs bug')
+env_1738_1.ParseConfig('PKG_CONFIG_PATH=. %(pkg_config_path)s --cflags --libs bug')
env_1738_1.Append(CPPDEFINES={'value' : '1'})
print env_1738_1.subst('$_CPPDEFFLAGS')
-""")
+"""%locals() )
expect_print_output="""\
-DDEBUG=1 -DTEST -DSOMETHING -DVARIABLE=2
--
cgit v0.12