Strip $(-$) bracketed text from command lines.

2 files changed, 27 insertions, 0 deletions

diff --git a/test/CPPPATH.py b/test/CPPPATH.py
index af7bdd8..30439ad 100644
--- a/test/CPPPATH.py
+++ b/test/CPPPATH.py
@@ -161,4 +161,19 @@ test.fail_test(os.path.exists(test.workpath('variant', 'prog.c')))
 
 test.up_to_date(arguments = args)
 
+# Change CPPPATH and make sure we don't rebuild because of it.
+test.write('SConstruct', """
+env = Environment(CPPPATH = ['include'])
+obj = env.Object(target='prog', source='subdir/prog.c')
+env.Program(target='prog', source=obj)
+SConscript('subdir/SConscript', "env")
+
+BuildDir('variant', 'subdir', 0)
+include = Dir('include')
+env = Environment(CPPPATH=[include])
+SConscript('variant/SConscript', "env")
+""")
+
+test.up_to_date(arguments = args)
+
 test.pass_test()
diff --git a/test/LIBPATH.py b/test/LIBPATH.py
index 7d5a7cc..a373425 100644
--- a/test/LIBPATH.py
+++ b/test/LIBPATH.py
@@ -60,4 +60,16 @@ test.run(arguments = '.')
 test.run(program = test.workpath('prog'),
          stdout = "f1.c\nprog.c\n")
 
+test.up_to_date(arguments = '.')
+
+# Change LIBPATH and make sure we don't rebuild because of it.
+test.write('SConstruct', """
+env = Environment(LIBS = [ 'foo1' ],
+                  LIBPATH = [ './libs', './lib2' ])
+env.Program(target = 'prog', source = 'prog.c')
+env.Library(target = './libs/foo1', source = 'f1.c')
+""")
+
+test.up_to_date(arguments = '.', stderr = None)
+
 test.pass_test()