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

4 files changed, 26 insertions, 70 deletions

diff --git a/test/AS/ASCOM.py b/test/AS/ASCOM.py
index 8f91404..ab77586 100644
--- a/test/AS/ASCOM.py
+++ b/test/AS/ASCOM.py
@@ -36,16 +36,7 @@ _python_ = TestSCons._python_
 
 test = TestSCons.TestSCons()
 
-
-
-test.write('myas.py', r"""
-import sys
-infile = open(sys.argv[2], 'rb')
-outfile = open(sys.argv[1], 'wb')
-for l in [l for l in infile.readlines() if l != b"#as\n"]:
-    outfile.write(l)
-sys.exit(0)
-""")
+test.file_fixture('mycompile.py')
 
 if os.path.normcase('.s') == os.path.normcase('.S'):
     alt_s_suffix = '.S'
@@ -55,7 +46,7 @@ else:
     alt_asm_suffix = '.asm'
 
 test.write('SConstruct', """
-env = Environment(ASCOM = r'%(_python_)s myas.py $TARGET $SOURCE',
+env = Environment(ASCOM = r'%(_python_)s mycompile.py as $TARGET $SOURCE',
                   OBJSUFFIX = '.obj',
                   SHOBJPREFIX = '',
                   SHOBJSUFFIX = '.shobj')
@@ -69,14 +60,14 @@ env.SharedObject(target = 'test7', source = 'test7.asm')
 env.SharedObject(target = 'test8', source = 'test8%(alt_asm_suffix)s')
 """ % locals())
 
-test.write('test1.s', "test1.s\n#as\n")
-test.write('test2'+alt_s_suffix, "test2.S\n#as\n")
-test.write('test3.asm', "test3.asm\n#as\n")
-test.write('test4'+alt_asm_suffix, "test4.ASM\n#as\n")
-test.write('test5.s', "test5.s\n#as\n")
-test.write('test6'+alt_s_suffix, "test6.S\n#as\n")
-test.write('test7.asm', "test7.asm\n#as\n")
-test.write('test8'+alt_asm_suffix, "test8.ASM\n#as\n")
+test.write('test1.s', "test1.s\n/*as*/\n")
+test.write('test2'+alt_s_suffix, "test2.S\n/*as*/\n")
+test.write('test3.asm', "test3.asm\n/*as*/\n")
+test.write('test4'+alt_asm_suffix, "test4.ASM\n/*as*/\n")
+test.write('test5.s', "test5.s\n/*as*/\n")
+test.write('test6'+alt_s_suffix, "test6.S\n/*as*/\n")
+test.write('test7.asm', "test7.asm\n/*as*/\n")
+test.write('test8'+alt_asm_suffix, "test8.ASM\n/*as*/\n")
 
 test.run(arguments = '.')
 
@@ -89,8 +80,6 @@ test.must_match('test6.shobj', "test6.S\n")
 test.must_match('test7.shobj', "test7.asm\n")
 test.must_match('test8.shobj', "test8.ASM\n")
 
-
-
 test.pass_test()
 
 # Local Variables:
diff --git a/test/AS/ASCOMSTR.py b/test/AS/ASCOMSTR.py
index 39b963f..2aab94c 100644
--- a/test/AS/ASCOMSTR.py
+++ b/test/AS/ASCOMSTR.py
@@ -37,16 +37,7 @@ _python_ = TestSCons._python_
 
 test = TestSCons.TestSCons()
 
-
-
-test.write('myas.py', r"""
-import sys
-infile = open(sys.argv[2], 'rb')
-outfile = open(sys.argv[1], 'wb')
-for l in [l for l in infile.readlines() if l != b"#as\n"]:
-    outfile.write(l)
-sys.exit(0)
-""")
+test.file_fixture('mycompile.py')
 
 if os.path.normcase('.s') == os.path.normcase('.S'):
     alt_s_suffix = '.S'
@@ -56,7 +47,7 @@ else:
     alt_asm_suffix = '.asm'
 
 test.write('SConstruct', """
-env = Environment(ASCOM = r'%(_python_)s myas.py $TARGET $SOURCE',
+env = Environment(ASCOM = r'%(_python_)s mycompile.py as $TARGET $SOURCE',
                   ASCOMSTR = 'Assembling $TARGET from $SOURCE',
                   OBJSUFFIX = '.obj')
 env.Object(target = 'test1', source = 'test1.s')
@@ -65,10 +56,10 @@ env.Object(target = 'test3', source = 'test3.asm')
 env.Object(target = 'test4', source = 'test4%(alt_asm_suffix)s')
 """ % locals())
 
-test.write('test1.s', "test1.s\n#as\n")
-test.write('test2'+alt_s_suffix, "test2.S\n#as\n")
-test.write('test3.asm', "test3.asm\n#as\n")
-test.write('test4'+alt_asm_suffix, "test4.ASM\n#as\n")
+test.write('test1.s', "test1.s\n/*as*/\n")
+test.write('test2'+alt_s_suffix, "test2.S\n/*as*/\n")
+test.write('test3.asm', "test3.asm\n/*as*/\n")
+test.write('test4'+alt_asm_suffix, "test4.ASM\n/*as*/\n")
 
 test.run(stdout = test.wrap_stdout("""\
 Assembling test1.obj from test1.s
@@ -82,8 +73,6 @@ test.must_match('test2.obj', "test2.S\n")
 test.must_match('test3.obj', "test3.asm\n")
 test.must_match('test4.obj', "test4.ASM\n")
 
-
-
 test.pass_test()
 
 # Local Variables:
diff --git a/test/AS/ASPPCOM.py b/test/AS/ASPPCOM.py
index 62f859a..ce938bb 100644
--- a/test/AS/ASPPCOM.py
+++ b/test/AS/ASPPCOM.py
@@ -34,19 +34,10 @@ _python_ = TestSCons._python_
 
 test = TestSCons.TestSCons()
 
-
-
-test.write('myas.py', r"""
-import sys
-infile = open(sys.argv[2], 'rb')
-outfile = open(sys.argv[1], 'wb')
-for l in [l for l in infile.readlines() if l != b"#as\n"]:
-    outfile.write(l)
-sys.exit(0)
-""")
+test.file_fixture('mycompile.py')
 
 test.write('SConstruct', """
-env = Environment(ASPPCOM = r'%(_python_)s myas.py $TARGET $SOURCE',
+env = Environment(ASPPCOM = r'%(_python_)s mycompile.py as $TARGET $SOURCE',
                   OBJSUFFIX = '.obj',
                   SHOBJPREFIX = '',
                   SHOBJSUFFIX = '.shobj')
@@ -56,10 +47,10 @@ env.SharedObject(target = 'test3', source = 'test3.spp')
 env.SharedObject(target = 'test4', source = 'test4.SPP')
 """ % locals())
 
-test.write('test1.spp', "test1.spp\n#as\n")
-test.write('test2.SPP', "test2.SPP\n#as\n")
-test.write('test3.spp', "test3.spp\n#as\n")
-test.write('test4.SPP', "test4.SPP\n#as\n")
+test.write('test1.spp', "test1.spp\n/*as*/\n")
+test.write('test2.SPP', "test2.SPP\n/*as*/\n")
+test.write('test3.spp', "test3.spp\n/*as*/\n")
+test.write('test4.SPP', "test4.SPP\n/*as*/\n")
 
 test.run(arguments = '.')
 
@@ -68,8 +59,6 @@ test.must_match('test2.obj', "test2.SPP\n")
 test.must_match('test3.shobj', "test3.spp\n")
 test.must_match('test4.shobj', "test4.SPP\n")
 
-
-
 test.pass_test()
 
 # Local Variables:
diff --git a/test/AS/ASPPCOMSTR.py b/test/AS/ASPPCOMSTR.py
index 0497470..0ee18f5 100644
--- a/test/AS/ASPPCOMSTR.py
+++ b/test/AS/ASPPCOMSTR.py
@@ -35,27 +35,18 @@ _python_ = TestSCons._python_
 
 test = TestSCons.TestSCons()
 
-
-
-test.write('myas.py', r"""
-import sys
-infile = open(sys.argv[2], 'rb')
-outfile = open(sys.argv[1], 'wb')
-for l in [l for l in infile.readlines() if l != b"#as\n"]:
-    outfile.write(l)
-sys.exit(0)
-""")
+test.file_fixture('mycompile.py')
 
 test.write('SConstruct', """
-env = Environment(ASPPCOM = r'%(_python_)s myas.py $TARGET $SOURCE',
+env = Environment(ASPPCOM = r'%(_python_)s mycompile.py as $TARGET $SOURCE',
                   ASPPCOMSTR = 'Assembling $TARGET from $SOURCE',
                   OBJSUFFIX = '.obj')
 env.Object(target = 'test1', source = 'test1.spp')
 env.Object(target = 'test2', source = 'test2.SPP')
 """ % locals())
 
-test.write('test1.spp', "test1.spp\n#as\n")
-test.write('test2.SPP', "test2.SPP\n#as\n")
+test.write('test1.spp', "test1.spp\n/*as*/\n")
+test.write('test2.SPP', "test2.SPP\n/*as*/\n")
 
 test.run(stdout = test.wrap_stdout("""\
 Assembling test1.obj from test1.spp
@@ -65,8 +56,6 @@ Assembling test2.obj from test2.SPP
 test.must_match('test1.obj', "test1.spp\n")
 test.must_match('test2.obj', "test2.SPP\n")
 
-
-
 test.pass_test()
 
 # Local Variables: