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/JAVAH.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/JAVAH.py')
| -rw-r--r-- | test/Java/JAVAH.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/test/Java/JAVAH.py b/test/Java/JAVAH.py index f07ebb9..c7ac334 100644 --- a/test/Java/JAVAH.py +++ b/test/Java/JAVAH.py @@ -108,9 +108,7 @@ if test.javac_is_gcj: test.file_fixture('wrapper_with_args.py') test.write('SConstruct', """ -foo = Environment(tools = ['javac', 'javah', 'install'], - JAVAC = r'%(where_javac)s', - JAVAH = r'%(where_javah)s') +foo = Environment(tools = ['javac', 'javah', 'install']) jv = %(java_version)s if jv: foo['JAVAVERSION'] = jv @@ -282,7 +280,7 @@ class Private { test.run(arguments = '.') -test.must_match('wrapper.out', "wrapper_with_args.py %(where_javah)s -d outdir2 -classpath class2 com.sub.bar.Example4 com.other.Example5 com.sub.bar.Example6\n" % locals(), +test.must_match('wrapper.out', "wrapper_with_args.py javah -d outdir2 -classpath class2 com.sub.bar.Example4 com.other.Example5 com.sub.bar.Example6\n" % locals(), mode='r') test.must_exist(['outdir1', 'com_sub_foo_Example1.h']) |