summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2020-02-23 19:43:18 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2020-02-23 19:43:18 (GMT)
commit02080bf85ef1ae7b75476a1fe7402937fbcd2626 (patch)
tree6875b8a990997ac09b962a50dee8ac4be950d28b
parent731b4bbca9ec4f1f80e3a27e1cc428ad3721e46f (diff)
downloadSCons-02080bf85ef1ae7b75476a1fe7402937fbcd2626.zip
SCons-02080bf85ef1ae7b75476a1fe7402937fbcd2626.tar.gz
SCons-02080bf85ef1ae7b75476a1fe7402937fbcd2626.tar.bz2
Reduce IMPLICIT_COMMAND_DEPENDENCIES's tried in test. No need to try all values, only new functionality. Full range is covered in other test
-rw-r--r--test/Repository/Program.py5
-rw-r--r--test/Repository/StaticLibrary.py2
2 files changed, 5 insertions, 2 deletions
diff --git a/test/Repository/Program.py b/test/Repository/Program.py
index 9e8af77..75860a7 100644
--- a/test/Repository/Program.py
+++ b/test/Repository/Program.py
@@ -32,9 +32,10 @@ if sys.platform == 'win32':
else:
_exe = ''
-for implicit_deps in ['0', '1', '2', 'all']:
+for implicit_deps in ['0', '1', '"all"']:
# First, test a single repository.
test = TestSCons.TestSCons()
+ test.verbose_set(1)
test.subdir('repository', 'work1')
repository = test.workpath('repository')
repository_foo_c = test.workpath('repository', 'foo.c')
@@ -42,6 +43,7 @@ for implicit_deps in ['0', '1', '2', 'all']:
work1_foo_c = test.workpath('work1', 'foo.c')
test.write(['work1', 'SConstruct'], r"""
+DefaultEnvironment(tools=[])
Repository(r'%s')
env = Environment(IMPLICIT_COMMAND_DEPENDENCIES=%s)
env.Program(target= 'foo', source = Split('aaa.c bbb.c foo.c'))
@@ -184,6 +186,7 @@ repository/foo.c
work2_foo = test.workpath('work2', 'foo' + _exe)
test.write(['work2', 'SConstruct'], r"""
+DefaultEnvironment(tools=[])
Repository(r'%s')
Repository(r'%s')
env = Environment()
diff --git a/test/Repository/StaticLibrary.py b/test/Repository/StaticLibrary.py
index acd4b83..29cb841 100644
--- a/test/Repository/StaticLibrary.py
+++ b/test/Repository/StaticLibrary.py
@@ -30,7 +30,7 @@ import TestSCons
_obj = TestSCons._obj
_exe = TestSCons._exe
-for implicit_deps in ['0', '1', '2', 'all']:
+for implicit_deps in ['1', '2']:
test = TestSCons.TestSCons()
#