Updating tests to use fixture wrapper.py.

3 files changed, 3 insertions, 18 deletions

diff --git a/test/Java/JAR.py b/test/Java/JAR.py
index 81664dc7..98dfa38a 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 81582d72..f647b030 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 876ed804..5f5decd4 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'],