Moved common my<xxx>.py functions to global fixture and resolve byte/str.

8 files changed, 16 insertions, 117 deletions

diff --git a/test/Java/JARCOM.py b/test/Java/JARCOM.py
index 9d93ba58..91464453 100644
--- a/test/Java/JARCOM.py
+++ b/test/Java/JARCOM.py
@@ -35,20 +35,11 @@ _python_ = TestSCons._python_
 test = TestSCons.TestSCons()
 
 
-
-test.write('myjar.py', r"""
-import sys
-outfile = open(sys.argv[1], 'wb')
-for f in sys.argv[2:]:
-    infile = open(f, 'rb')
-    for l in [l for l in infile.readlines() if l != '/*jar*/\n']:
-        outfile.write(l)
-sys.exit(0)
-""")
+test.file_fixture('mycompile.py')
 
 test.write('SConstruct', """
 env = Environment(TOOLS = ['default', 'jar'],
-                  JARCOM = r'%(_python_)s myjar.py $TARGET $SOURCES')
+                  JARCOM = r'%(_python_)s mycompile.py jar $TARGET $SOURCES')
 env.Jar(target = 'test1', source = ['file1.in', 'file2.in', 'file3.in'])
 """ % locals())
 
@@ -60,8 +51,6 @@ test.run()
 
 test.must_match('test1.jar', "file1.in\nfile2.in\nfile3.in\n")
 
-
-
 test.pass_test()
 
 # Local Variables:
diff --git a/test/Java/JARCOMSTR.py b/test/Java/JARCOMSTR.py
index 069587fe..4bdc45b5 100644
--- a/test/Java/JARCOMSTR.py
+++ b/test/Java/JARCOMSTR.py
@@ -35,21 +35,11 @@ _python_ = TestSCons._python_
 
 test = TestSCons.TestSCons()
 
-
-
-test.write('myjar.py', r"""
-import sys
-outfile = open(sys.argv[1], 'wb')
-for f in sys.argv[2:]:
-    infile = open(f, 'rb')
-    for l in [l for l in infile.readlines() if l != '/*jar*/\n']:
-        outfile.write(l)
-sys.exit(0)
-""")
+test.file_fixture('mycompile.py')
 
 test.write('SConstruct', """
 env = Environment(TOOLS = ['default', 'jar'],
-                  JARCOM = r'%(_python_)s myjar.py $TARGET $SOURCES',
+                  JARCOM = r'%(_python_)s mycompile.py jar $TARGET $SOURCES',
                   JARCOMSTR = "Jar'ing up $TARGET from $SOURCES")
 env.Jar(target = 'test1', source = ['file1.in', 'file2.in', 'file3.in'])
 """ % locals())
@@ -64,8 +54,6 @@ Jar'ing up test1.jar from file1.in file2.in file3.in
 
 test.must_match('test1.jar', "file1.in\nfile2.in\nfile3.in\n")
 
-
-
 test.pass_test()
 
 # Local Variables:
diff --git a/test/Java/JAVACCOM.py b/test/Java/JAVACCOM.py
index 064feed0..0de173df 100644
--- a/test/Java/JAVACCOM.py
+++ b/test/Java/JAVACCOM.py
@@ -36,21 +36,11 @@ test = TestSCons.TestSCons()
 
 test.subdir('src')
 
-
-
-test.write('myjavac.py', r"""
-import sys
-outfile = open(sys.argv[1], 'wb')
-for f in sys.argv[2:]:
-    infile = open(f, 'rb')
-    for l in [l for l in infile.readlines() if l != '/*javac*/\n']:
-        outfile.write(l)
-sys.exit(0)
-""")
+test.file_fixture('mycompile.py')
 
 test.write('SConstruct', """
 env = Environment(TOOLS = ['default', 'javac'],
-                  JAVACCOM = r'%(_python_)s myjavac.py $TARGET $SOURCES')
+                  JAVACCOM = r'%(_python_)s mycompile.py javac $TARGET $SOURCES')
 env.Java(target = 'classes', source = 'src')
 """ % locals())
 
@@ -63,8 +53,6 @@ test.run()
 test.must_match(['classes', 'file1.class'],
                 "file1.java\nfile2.java\nfile3.java\n")
 
-
-
 test.pass_test()
 
 # Local Variables:
diff --git a/test/Java/JAVACCOMSTR.py b/test/Java/JAVACCOMSTR.py
index 64402830..8540e13c 100644
--- a/test/Java/JAVACCOMSTR.py
+++ b/test/Java/JAVACCOMSTR.py
@@ -39,21 +39,11 @@ test = TestSCons.TestSCons()
 
 test.subdir('src')
 
-
-
-test.write('myjavac.py', r"""
-import sys
-outfile = open(sys.argv[1], 'wb')
-for f in sys.argv[2:]:
-    infile = open(f, 'rb')
-    for l in [l for l in infile.readlines() if l != '/*javac*/\n']:
-        outfile.write(l)
-sys.exit(0)
-""")
+test.file_fixture('mycompile.py')
 
 test.write('SConstruct', """
 env = Environment(TOOLS = ['default', 'javac'],
-                  JAVACCOM = r'%(_python_)s myjavac.py $TARGET $SOURCES',
+                  JAVACCOM = r'%(_python_)s mycompile.py javac $TARGET $SOURCES',
                   JAVACCOMSTR = "Compiling class(es) $TARGET from $SOURCES")
 env.Java(target = 'classes', source = 'src')
 """ % locals())
@@ -74,8 +64,6 @@ Compiling class(es) %(classes_file1_class)s from %(src_file1_java)s %(src_file2_
 test.must_match(['classes', 'file1.class'],
                 "file1.java\nfile2.java\nfile3.java\n")
 
-
-
 test.pass_test()
 
 # Local Variables:
diff --git a/test/Java/JAVAHCOM.py b/test/Java/JAVAHCOM.py
index 9db897a8..801707e5 100644
--- a/test/Java/JAVAHCOM.py
+++ b/test/Java/JAVAHCOM.py
@@ -34,21 +34,11 @@ _python_ = TestSCons._python_
 
 test = TestSCons.TestSCons()
 
-
-
-test.write('myjavah.py', r"""
-import sys
-outfile = open(sys.argv[1], 'wb')
-for f in sys.argv[2:]:
-    infile = open(f, 'rb')
-    for l in [l for l in infile.readlines() if l != '/*javah*/\n']:
-        outfile.write(l)
-sys.exit(0)
-""")
+test.file_fixture('mycompile.py')
 
 test.write('SConstruct', """
 env = Environment(TOOLS = ['default', 'javah'],
-                  JAVAHCOM = r'%(_python_)s myjavah.py $TARGET $SOURCES')
+                  JAVAHCOM = r'%(_python_)s mycompile.py javah $TARGET $SOURCES')
 env.JavaH(target = 'out', source = 'file1.class')
 env.JavaH(target = 'out', source = 'file2.class')
 env.JavaH(target = 'out', source = 'file3.class')
@@ -64,8 +54,6 @@ test.must_match(['out', 'file1.h'], "file1.class\n")
 test.must_match(['out', 'file2.h'], "file2.class\n")
 test.must_match(['out', 'file3.h'], "file3.class\n")
 
-
-
 test.pass_test()
 
 # Local Variables:
diff --git a/test/Java/JAVAHCOMSTR.py b/test/Java/JAVAHCOMSTR.py
index f8120d65..c2058904 100644
--- a/test/Java/JAVAHCOMSTR.py
+++ b/test/Java/JAVAHCOMSTR.py
@@ -39,27 +39,15 @@ test = TestSCons.TestSCons()
 
 test.subdir('src')
 
-
-
 out_file1_h = os.path.join('out', 'file1.h')
 out_file2_h = os.path.join('out', 'file2.h')
 out_file3_h = os.path.join('out', 'file3.h')
 
-
-
-test.write('myjavah.py', r"""
-import sys
-outfile = open(sys.argv[1], 'wb')
-for f in sys.argv[2:]:
-    infile = open(f, 'rb')
-    for l in [l for l in infile.readlines() if l != '/*javah*/\n']:
-        outfile.write(l)
-sys.exit(0)
-""")
+test.file_fixture('mycompile.py')
 
 test.write('SConstruct', """
 env = Environment(TOOLS = ['default', 'javah'],
-                  JAVAHCOM = r'%(_python_)s myjavah.py $TARGET $SOURCES',
+                  JAVAHCOM = r'%(_python_)s mycompile.py javah $TARGET $SOURCES',
                   JAVAHCOMSTR = 'Building javah $TARGET from $SOURCES')
 env.JavaH(target = 'out', source = 'file1.class')
 env.JavaH(target = 'out', source = 'file2.class')
@@ -80,8 +68,6 @@ test.must_match(['out', 'file1.h'], "file1.class\n")
 test.must_match(['out', 'file2.h'], "file2.class\n")
 test.must_match(['out', 'file3.h'], "file3.class\n")
 
-
-
 test.pass_test()
 
 # Local Variables:
diff --git a/test/Java/RMICCOM.py b/test/Java/RMICCOM.py
index ba7f965d..9f6595dd 100644
--- a/test/Java/RMICCOM.py
+++ b/test/Java/RMICCOM.py
@@ -38,27 +38,15 @@ test = TestSCons.TestSCons()
 
 test.subdir('src')
 
-
-
 out_file1 = os.path.join('out', 'file1', 'class_Stub.class')
 out_file2 = os.path.join('out', 'file2', 'class_Stub.class')
 out_file3 = os.path.join('out', 'file3', 'class_Stub.class')
 
-
-
-test.write('myrmic.py', r"""
-import sys
-outfile = open(sys.argv[1], 'wb')
-for f in sys.argv[2:]:
-    infile = open(f, 'rb')
-    for l in [l for l in infile.readlines() if l != '/*rmic*/\n']:
-        outfile.write(l)
-sys.exit(0)
-""")
+test.file_fixture('mycompile.py')
 
 test.write('SConstruct', """
 env = Environment(TOOLS = ['default', 'rmic'],
-                  RMICCOM = r'%(_python_)s myrmic.py $TARGET $SOURCES')
+                  RMICCOM = r'%(_python_)s mycompile.py rmic $TARGET $SOURCES')
 env.RMIC(target = 'out', source = 'file1.class')
 env.RMIC(target = 'out', source = 'file2.class')
 env.RMIC(target = 'out', source = 'file3.class')
@@ -74,8 +62,6 @@ test.must_match(out_file1, "file1.class\n")
 test.must_match(out_file2, "file2.class\n")
 test.must_match(out_file3, "file3.class\n")
 
-
-
 test.pass_test()
 
 # Local Variables:
diff --git a/test/Java/RMICCOMSTR.py b/test/Java/RMICCOMSTR.py
index 8fe535aa..d4d19041 100644
--- a/test/Java/RMICCOMSTR.py
+++ b/test/Java/RMICCOMSTR.py
@@ -39,27 +39,15 @@ test = TestSCons.TestSCons()
 
 test.subdir('src')
 
-
-
 out_file1 = os.path.join('out', 'file1', 'class_Stub.class')
 out_file2 = os.path.join('out', 'file2', 'class_Stub.class')
 out_file3 = os.path.join('out', 'file3', 'class_Stub.class')
 
-
-
-test.write('myrmic.py', r"""
-import sys
-outfile = open(sys.argv[1], 'wb')
-for f in sys.argv[2:]:
-    infile = open(f, 'rb')
-    for l in [l for l in infile.readlines() if l != '/*rmic*/\n']:
-        outfile.write(l)
-sys.exit(0)
-""")
+test.file_fixture('mycompile.py')
 
 test.write('SConstruct', """
 env = Environment(TOOLS = ['default', 'rmic'],
-                  RMICCOM = r'%(_python_)s myrmic.py $TARGET $SOURCES',
+                  RMICCOM = r'%(_python_)s mycompile.py rmic $TARGET $SOURCES',
                   RMICCOMSTR = 'Building rmic $TARGET from $SOURCES')
 env.RMIC(target = 'out', source = 'file1.class')
 env.RMIC(target = 'out', source = 'file2.class')
@@ -80,8 +68,6 @@ test.must_match(out_file1, "file1.class\n")
 test.must_match(out_file2, "file2.class\n")
 test.must_match(out_file3, "file3.class\n")
 
-
-
 test.pass_test()
 
 # Local Variables: