diff options
| author | William Deegan <bill@baddogconsulting.com> | 2018-11-13 18:58:06 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2018-11-13 18:58:06 (GMT) |
| commit | c2aba592affffdb12d2f95e251ccfc566b6dd674 (patch) | |
| tree | 3f1719afc1ec7408135659f154f4b4072f8b44af /test/Java/JAVACFLAGS.py | |
| parent | ade84bc59db524fbccd670bfadefa786407c7c0b (diff) | |
| parent | 648cf42a89845ccad012e02609ca8958e62ce272 (diff) | |
| download | SCons-c2aba592affffdb12d2f95e251ccfc566b6dd674.zip SCons-c2aba592affffdb12d2f95e251ccfc566b6dd674.tar.gz SCons-c2aba592affffdb12d2f95e251ccfc566b6dd674.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into subst_rewrite
Diffstat (limited to 'test/Java/JAVACFLAGS.py')
| -rw-r--r-- | test/Java/JAVACFLAGS.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/Java/JAVACFLAGS.py b/test/Java/JAVACFLAGS.py index 6afd1b9..28c58c1 100644 --- a/test/Java/JAVACFLAGS.py +++ b/test/Java/JAVACFLAGS.py @@ -36,7 +36,6 @@ test.subdir('src') test.write('SConstruct', """ env = Environment(tools = ['javac'], - JAVAC = r'%(where_javac)s', JAVACFLAGS = '-O') env.Java(target = 'classes', source = 'src') """ % locals()) @@ -55,7 +54,7 @@ public class Example1 } """) -expected_wrapper_out = "%(where_javac)s -O -d classes -sourcepath src src/Example1.java\n" +expected_wrapper_out = "javac -O -d classes -sourcepath src src/Example1.java\n" expected_wrapper_out = expected_wrapper_out.replace('/', os.sep) test.run(arguments = '.', stdout = test.wrap_stdout(expected_wrapper_out % locals())) |