diff options
| author | Mats Wichmann <mats@linux.com> | 2022-01-28 13:39:16 (GMT) |
|---|---|---|
| committer | Mats Wichmann <mats@linux.com> | 2022-01-28 13:57:11 (GMT) |
| commit | 5fcf75e653d4fe5cd0f171635ee569902d041549 (patch) | |
| tree | b9a107c3d01b71af8b42fe14db9fd439604898c6 /test/Java | |
| parent | 45c02700a8356785ce995a381326d8b5878310e7 (diff) | |
| download | SCons-5fcf75e653d4fe5cd0f171635ee569902d041549.zip SCons-5fcf75e653d4fe5cd0f171635ee569902d041549.tar.gz SCons-5fcf75e653d4fe5cd0f171635ee569902d041549.tar.bz2 | |
Java not-in-path tests use limited tools
There's no reason for these tests to initialize all tools since
only checking for one. During development of unrelated PR #4088
these two failed initializing gcc tool - might as well run as
lean as possible.
Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'test/Java')
| -rw-r--r-- | test/Java/jar_not_in_PATH.py | 3 | ||||
| -rw-r--r-- | test/Java/rmic_not_in_PATH.py | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/test/Java/jar_not_in_PATH.py b/test/Java/jar_not_in_PATH.py index 05bb9c8..b890ba1 100644 --- a/test/Java/jar_not_in_PATH.py +++ b/test/Java/jar_not_in_PATH.py @@ -41,7 +41,8 @@ test.write('SConstruct', """\ import os oldpath = os.environ.get('PATH', '') -env = Environment(ENV={'PATH': ['.']}) +DefaultEnvironment(tools=[]) +env = Environment(ENV={'PATH': ['.']}, tools=['javac', 'jar']) env['ENV']['PATH'] = oldpath env['JAR'] = r'%(_python_)s ./myjar.py' env.Jar(target='test1.jar', source='test1.class') diff --git a/test/Java/rmic_not_in_PATH.py b/test/Java/rmic_not_in_PATH.py index ac3f28e..68a2c30 100644 --- a/test/Java/rmic_not_in_PATH.py +++ b/test/Java/rmic_not_in_PATH.py @@ -63,11 +63,13 @@ sys.exit(0) test.write('SConstruct', """ import os -oldpath = os.environ.get('PATH','') -env = Environment(ENV = {'PATH' : ['.']}) + +oldpath = os.environ.get('PATH', '') +DefaultEnvironment(tools=[]) +env = Environment(ENV={'PATH': ['.']}, tools=['javac', 'rmic']) env['ENV']['PATH'] = oldpath env['RMIC'] = r'%(_python_)s myrmic.py' -env.RMIC(target = 'outdir', source = 'test1.java') +env.RMIC(target='outdir', source='test1.java') """ % locals()) test.write('test1.java', """\ |