More display customizability: , . (Also add the missing , for completeness, and gets rid of the unused SCons.Defaults.DAction object.)

4 files changed, 432 insertions, 0 deletions

diff --git a/test/AS/ASPP.py b/test/AS/ASPP.py
new file mode 100644
index 0000000..da47618
--- /dev/null
+++ b/test/AS/ASPP.py
@@ -0,0 +1,139 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import string
+import sys
+import TestSCons
+
+python = TestSCons.python
+_exe   = TestSCons._exe
+
+test = TestSCons.TestSCons()
+
+
+
+if sys.platform == 'win32':
+
+    test.write('mylink.py', r"""
+import string
+import sys
+args = sys.argv[1:]
+while args:
+    a = args[0]
+    if a[0] != '/':
+        break
+    args = args[1:]
+    if string.lower(a[:5]) == '/out:': out = a[5:]
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:5] != '#link':
+        outfile.write(l)
+sys.exit(0)
+""")
+
+    test.write('myas.py', r"""
+import sys
+args = sys.argv[1:]
+inf = None
+while args:
+    a = args[0]
+    args = args[1:]
+    if not a[0] in "/-":
+        if not inf:
+            inf = a
+        continue
+    if a[:3] == '/Fo': out = a[3:]
+    if a == '-o':
+        out = args[0]
+        args = args[1:]
+infile = open(inf, 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:3] != '#as':
+        outfile.write(l)
+sys.exit(0)
+""")
+
+else:
+
+    test.write('mylink.py', r"""
+import getopt
+import sys
+opts, args = getopt.getopt(sys.argv[1:], 'o:')
+for opt, arg in opts:
+    if opt == '-o': out = arg
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:5] != '#link':
+        outfile.write(l)
+sys.exit(0)
+""")
+
+    test.write('myas.py', r"""
+import getopt
+import sys
+opts, args = getopt.getopt(sys.argv[1:], 'co:')
+for opt, arg in opts:
+    if opt == '-o': out = arg
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:3] != '#as':
+        outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(LINK = r'%s mylink.py',
+                  LINKFLAGS = [],
+                  ASPP = r'%s myas.py',
+                  CC = r'%s myas.py')
+env.Program(target = 'test1', source = 'test1.spp')
+env.Program(target = 'test2', source = 'test2.SPP')
+""" % (python, python, python))
+
+test.write('test1.spp', r"""This is a .spp file.
+#as
+#link
+""")
+
+test.write('test2.SPP', r"""This is a .SPP file.
+#as
+#link
+""")
+
+test.run(arguments = '.', stderr = None)
+
+test.fail_test(test.read('test1' + _exe) != "This is a .spp file.\n")
+
+test.fail_test(test.read('test2' + _exe) != "This is a .SPP file.\n")
+
+
+
+test.pass_test()
diff --git a/test/AS/ASPPCOM.py b/test/AS/ASPPCOM.py
new file mode 100644
index 0000000..e877354
--- /dev/null
+++ b/test/AS/ASPPCOM.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Test the ability to configure the $ASPPCOM construction variable.
+"""
+
+import os
+import string
+import sys
+import TestSCons
+
+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 filter(lambda l: l != "#as\n", infile.readlines()):
+    outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(ASPPCOM = r'%(python)s myas.py $TARGET $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.run(arguments = '.')
+
+test.fail_test(test.read('test1.obj') != "test1.spp\n")
+test.fail_test(test.read('test2.obj') != "test2.SPP\n")
+
+
+
+test.pass_test()
diff --git a/test/AS/ASPPCOMSTR.py b/test/AS/ASPPCOMSTR.py
new file mode 100644
index 0000000..21e8033
--- /dev/null
+++ b/test/AS/ASPPCOMSTR.py
@@ -0,0 +1,73 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Test that the $ASPPCOMSTR construction variable allows you to customize
+the displayed assembler string.
+"""
+
+import os
+import string
+import sys
+import TestSCons
+
+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 filter(lambda l: l != "#as\n", infile.readlines()):
+    outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(ASPPCOM = r'%(python)s myas.py $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.run(stdout = test.wrap_stdout("""\
+Assembling test1.obj from test1.spp
+Assembling test2.obj from test2.SPP
+"""))
+
+test.fail_test(test.read('test1.obj') != "test1.spp\n")
+test.fail_test(test.read('test2.obj') != "test2.SPP\n")
+
+
+
+test.pass_test()
diff --git a/test/AS/ASPPFLAGS.py b/test/AS/ASPPFLAGS.py
new file mode 100644
index 0000000..cbd4339
--- /dev/null
+++ b/test/AS/ASPPFLAGS.py
@@ -0,0 +1,152 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import string
+import sys
+import TestSCons
+
+python = TestSCons.python
+
+test = TestSCons.TestSCons()
+_exe = TestSCons._exe
+
+
+if sys.platform == 'win32':
+
+    o = ' -x'
+
+    o_c = ' -x'
+
+    test.write('mylink.py', r"""
+import string
+import sys
+args = sys.argv[1:]
+while args:
+    a = args[0]
+    if a[0] != '/':
+        break
+    args = args[1:]
+    if string.lower(a[:5]) == '/out:': out = a[5:]
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:5] != '#link':
+        outfile.write(l)
+sys.exit(0)
+""")
+
+    test.write('myas.py', r"""
+import sys
+args = sys.argv[1:]
+inf = None
+optstring = ''
+while args:
+    a = args[0]
+    args = args[1:]
+    if not a[0] in '/-':
+        if not inf:
+            inf = a
+        continue
+    if a[:2] == '/c':
+        continue
+    if a[:3] == '/Fo':
+        out = a[3:]
+        continue
+    optstring = optstring + ' ' + a
+infile = open(inf, 'rb')
+outfile = open(out, 'wb')
+outfile.write(optstring + "\n")
+for l in infile.readlines():
+    if l[:3] != '#as':
+        outfile.write(l)
+sys.exit(0)
+""")
+
+else:
+
+    o = ' -x'
+
+    o_c = ' -x -c'
+
+    test.write('mylink.py', r"""
+import getopt
+import sys
+opts, args = getopt.getopt(sys.argv[1:], 'o:')
+for opt, arg in opts:
+    if opt == '-o': out = arg
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:5] != '#link':
+        outfile.write(l)
+sys.exit(0)
+""")
+
+    test.write('myas.py', r"""
+import getopt
+import sys
+opts, args = getopt.getopt(sys.argv[1:], 'co:x')
+optstring = ''
+for opt, arg in opts:
+    if opt == '-o': out = arg
+    else: optstring = optstring + ' ' + opt
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+outfile.write(optstring + "\n")
+for l in infile.readlines():
+    if l[:3] != '#as':
+        outfile.write(l)
+sys.exit(0)
+""")
+
+
+
+test.write('SConstruct', """
+env = Environment(LINK = r'%(python)s mylink.py',
+                  LINKFLAGS = [],
+                  ASPP = r'%(python)s myas.py', ASPPFLAGS = '-x',
+                  CC = r'%(python)s myas.py')
+env.Program(target = 'test1', source = 'test1.spp')
+env.Program(target = 'test2', source = 'test2.SPP')
+""" % locals())
+
+test.write('test1.spp', r"""This is a .spp file.
+#as
+#link
+""")
+
+test.write('test2.SPP', r"""This is a .SPP file.
+#as
+#link
+""")
+
+test.run(arguments = '.', stderr = None)
+
+test.must_match('test1' + _exe, "%s\nThis is a .spp file.\n" % o_c)
+test.must_match('test2' + _exe, "%s\nThis is a .SPP file.\n" % o_c)
+
+test.pass_test()