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/JAVABOOTCLASSPATH.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/JAVABOOTCLASSPATH.py')
| -rw-r--r-- | test/Java/JAVABOOTCLASSPATH.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/test/Java/JAVABOOTCLASSPATH.py b/test/Java/JAVABOOTCLASSPATH.py index 6913c6a..196cc54 100644 --- a/test/Java/JAVABOOTCLASSPATH.py +++ b/test/Java/JAVABOOTCLASSPATH.py @@ -42,7 +42,6 @@ where_javah = test.java_where_javah() test.write('SConstruct', """ env = Environment(tools = ['javac', 'javah'], - JAVAC = r'%(where_javac)s', JAVABOOTCLASSPATH = ['dir1', 'dir2']) j1 = env.Java(target = 'class', source = 'com/Example1.java') j2 = env.Java(target = 'class', source = 'com/Example2.java') @@ -85,11 +84,11 @@ public class Example2 bootclasspath = os.pathsep.join(['dir1', 'dir2']) expect = """\ -%(where_javac)s -bootclasspath %(bootclasspath)s -d class -sourcepath com com/Example1.java -%(where_javac)s -bootclasspath %(bootclasspath)s -d class -sourcepath com com/Example2.java +javac -bootclasspath %(bootclasspath)s -d class -sourcepath com com.Example1\.java +javac -bootclasspath %(bootclasspath)s -d class -sourcepath com com.Example2\.java """ % locals() -test.run(arguments = '-Q -n .', stdout = expect) +test.run(arguments = '-Q -n .', stdout = expect, match=TestSCons.match_re) test.pass_test() |