diff options
author | William Blevins <wblevins001@gmail.com> | 2016-09-24 08:29:36 (GMT) |
---|---|---|
committer | William Blevins <wblevins001@gmail.com> | 2016-09-24 08:29:36 (GMT) |
commit | c4c2ba91c671527828fbc6ffb79421d5e487a398 (patch) | |
tree | c6fa3299dd54d4764e6e3d4225b7d32d0bc17395 /test/Java | |
parent | 9e87609dfac0fd6a87d2cdc0a9e4e8b5c0a6a99a (diff) | |
download | SCons-c4c2ba91c671527828fbc6ffb79421d5e487a398.zip SCons-c4c2ba91c671527828fbc6ffb79421d5e487a398.tar.gz SCons-c4c2ba91c671527828fbc6ffb79421d5e487a398.tar.bz2 |
Updating tests to use fixture wrapper.py.
Diffstat (limited to 'test/Java')
-rw-r--r-- | test/Java/JAR.py | 7 | ||||
-rw-r--r-- | test/Java/JAVAH.py | 7 | ||||
-rw-r--r-- | test/Java/RMIC.py | 7 |
3 files changed, 3 insertions, 18 deletions
diff --git a/test/Java/JAR.py b/test/Java/JAR.py index 81664dc..98dfa38 100644 --- a/test/Java/JAR.py +++ b/test/Java/JAR.py @@ -124,12 +124,7 @@ where_jar = test.java_where_jar() -test.write("wrapper.py", """\ -import os -import sys -open('%s', 'ab').write("wrapper.py %%s\\n" %% " ".join(sys.argv[1:])) -os.system(" ".join(sys.argv[1:])) -""" % test.workpath('wrapper.out').replace('\\', '\\\\')) +test.file_fixture('wrapper.py') test.write('SConstruct', """ foo = Environment(tools = ['javac', 'jar'], diff --git a/test/Java/JAVAH.py b/test/Java/JAVAH.py index 81582d7..f647b03 100644 --- a/test/Java/JAVAH.py +++ b/test/Java/JAVAH.py @@ -105,12 +105,7 @@ if java_version: if test.javac_is_gcj: test.skip_test('Test not valid for gcj (gnu java); skipping test(s).\n') -test.write("wrapper.py", """\ -import os -import sys -open('%s', 'ab').write("wrapper.py %%s\\n" %% " ".join(sys.argv[1:])) -os.system(" ".join(sys.argv[1:])) -""" % test.workpath('wrapper.out').replace('\\', '\\\\')) +test.file_fixture('wrapper.py') test.write('SConstruct', """ foo = Environment(tools = ['javac', 'javah', 'install'], diff --git a/test/Java/RMIC.py b/test/Java/RMIC.py index 876ed80..5f5decd 100644 --- a/test/Java/RMIC.py +++ b/test/Java/RMIC.py @@ -111,12 +111,7 @@ if java_version.count('.') == 1: # Note, how we allow simple version strings like "5" and # "6" to successfully pass this test. if curver < (1, 8): - test.write("wrapper.py", """\ -import os -import sys -open('%s', 'ab').write("wrapper.py %%s\\n" %% " ".join(sys.argv[1:])) -os.system(" ".join(sys.argv[1:])) -""" % test.workpath('wrapper.out').replace('\\', '\\\\')) + test.file_fixture('wrapper.py') test.write('SConstruct', """ foo = Environment(tools = ['javac', 'rmic'], |