More command-line customizability: and .

4 files changed, 436 insertions, 0 deletions

diff --git a/test/TAR/TAR.py b/test/TAR/TAR.py
new file mode 100644
index 00000000..abd86bad
--- /dev/null
+++ b/test/TAR/TAR.py
@@ -0,0 +1,164 @@
+#!/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 os.path
+import string
+import sys
+import TestSCons
+
+python = TestSCons.python
+
+test = TestSCons.TestSCons()
+
+test.subdir('sub1')
+
+test.write('mytar.py', r"""
+import getopt
+import os
+import os.path
+import sys
+opts, args = getopt.getopt(sys.argv[1:], 'cf:')
+for opt, arg in opts:
+    if opt == '-f': out = arg
+def process(outfile, name):
+    if os.path.isdir(name):
+        list = os.listdir(name)
+        list.sort()
+        for entry in list:
+	    process(outfile, os.path.join(name, entry))
+    else:
+        outfile.write(open(name, 'rb').read())
+outfile = open(out, 'wb')
+for infile in args:
+    process(outfile, infile)
+outfile.close()
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(tools = ['tar'], TAR = r'%s mytar.py')
+env.Tar(target = 'aaa.tar', source = ['file1', 'file2'])
+env.Tar(target = 'aaa.tar', source = 'file3')
+env.Tar(target = 'bbb', source = 'sub1')
+env.Tar(target = 'bbb', source = 'file4')
+""" % python)
+
+test.write('file1', "file1\n")
+test.write('file2', "file2\n")
+test.write('file3', "file3\n")
+test.write('file4', "file4\n")
+
+test.write(['sub1', 'file5'], "sub1/file5\n")
+test.write(['sub1', 'file6'], "sub1/file6\n")
+
+test.run(arguments = 'aaa.tar', stderr = None)
+
+test.fail_test(test.read('aaa.tar') != "file1\nfile2\nfile3\n")
+
+test.run(arguments = 'bbb.tar', stderr = None)
+
+test.fail_test(test.read('bbb.tar') != "sub1/file5\nsub1/file6\nfile4\n")
+
+
+tar = test.detect('TAR', 'tar')
+
+if tar:
+
+    test.write("wrapper.py", """import os
+import string
+import sys
+open('%s', 'wb').write("wrapper.py\\n")
+os.system(string.join(sys.argv[1:], " "))
+""" % string.replace(test.workpath('wrapper.out'), '\\', '\\\\'))
+
+    test.write('SConstruct', """
+foo = Environment()
+tar = foo.Dictionary('TAR')
+bar = Environment(TAR = r'%s wrapper.py ' + tar)
+f3 = Environment(TARFLAGS = '-c -z', TARSUFFIX = '.tar.gz')
+f4 = Environment(TARFLAGS = '-c -z', TARSUFFIX = '.tgz')
+f5 = Environment(TARFLAGS = '-c -z')
+foo.Tar(target = 'foo.tar', source = ['file10', 'file11'])
+foo.Tar(target = 'foo.tar', source = 'file12')
+bar.Tar(target = 'bar.tar', source = ['file13', 'file14'])
+bar.Tar(target = 'bar.tar', source = 'file15')
+f3.Tar(target = 'f3', source = 'file16')
+f3.Tar(target = 'f3', source = ['file17', 'file18'])
+f4.Tar(target = 'f4', source = 'file19')
+f4.Tar(target = 'f4', source = ['file20', 'file21'])
+f5.Tar(target = 'f5.tgz', source = 'file22')
+f5.Tar(target = 'f5.tgz', source = ['file23', 'file24'])
+""" % python)
+
+    for f in ['file10', 'file11', 'file12',
+              'file13', 'file14', 'file15',
+              'file16', 'file17', 'file18',
+              'file19', 'file20', 'file21',
+              'file22', 'file23', 'file24']:
+        test.write(f, f + "\n")
+
+    test.run(arguments = 'foo.tar', stderr = None)
+
+    test.fail_test(os.path.exists(test.workpath('wrapper.out')))
+
+    test.fail_test(not os.path.exists(test.workpath('foo.tar')))
+
+    test.run(arguments = 'bar.tar', stderr = None)
+
+    test.fail_test(not os.path.exists(test.workpath('wrapper.out')))
+
+    test.fail_test(not os.path.exists(test.workpath('bar.tar')))
+
+    test.run(arguments = '.', stderr = None)
+
+    test.fail_test(os.path.exists(test.workpath('f3.tar')))
+    test.fail_test(not os.path.exists(test.workpath('f3.tar.gz')))
+
+    test.fail_test(os.path.exists(test.workpath('f4.tar')))
+    test.fail_test(os.path.exists(test.workpath('f4.tar.gz')))
+    test.fail_test(not os.path.exists(test.workpath('f4.tgz')))
+
+    test.fail_test(os.path.exists(test.workpath('f5.tar')))
+    test.fail_test(os.path.exists(test.workpath('f5.tar.gz')))
+    test.fail_test(not os.path.exists(test.workpath('f5.tgz')))
+
+    test.run(program = tar, arguments = "-t -f foo.tar", stderr = None)
+    test.fail_test(test.stdout() != "file10\nfile11\nfile12\n")
+
+    test.run(program = tar, arguments = "-t -f bar.tar", stderr = None)
+    test.fail_test(test.stdout() != "file13\nfile14\nfile15\n")
+
+    test.run(program = tar, arguments = "-t -z -f f3.tar.gz", stderr = None)
+    test.fail_test(test.stdout() != "file16\nfile17\nfile18\n")
+
+    test.run(program = tar, arguments = "-t -z -f f4.tgz", stderr = None)
+    test.fail_test(test.stdout() != "file19\nfile20\nfile21\n")
+
+    test.run(program = tar, arguments = "-t -z -f f5.tgz", stderr = None)
+    test.fail_test(test.stdout() != "file22\nfile23\nfile24\n")
+
+test.pass_test()
diff --git a/test/TAR/TARCOM.py b/test/TAR/TARCOM.py
new file mode 100644
index 00000000..f6e36e79
--- /dev/null
+++ b/test/TAR/TARCOM.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 $TARCOM construction variable.
+"""
+
+import os
+import string
+import sys
+import TestSCons
+
+python = TestSCons.python
+
+test = TestSCons.TestSCons()
+
+
+
+test.write('mytar.py', r"""
+import sys
+outfile = open(sys.argv[1], 'wb')
+infile = open(sys.argv[2], 'rb')
+for l in filter(lambda l: l != '/*tar*/\n', infile.readlines()):
+    outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(TOOLS = ['tar'],
+                  TARCOM = r'%(python)s mytar.py $TARGET $SOURCE')
+env.Tar('test1.tar', 'test1.in')
+""" % locals())
+
+test.write('test1.in', """\
+test1.in
+/*tar*/
+""")
+
+test.run()
+
+test.must_match('test1.tar', "test1.in\n")
+
+
+
+test.pass_test()
diff --git a/test/TAR/TARCOMSTR.py b/test/TAR/TARCOMSTR.py
new file mode 100644
index 00000000..2bd3813d
--- /dev/null
+++ b/test/TAR/TARCOMSTR.py
@@ -0,0 +1,67 @@
+#!/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 $TARCOMSTR construction variable allows you to customize
+the displayed string when tar is called.
+"""
+
+import TestSCons
+
+python = TestSCons.python
+
+test = TestSCons.TestSCons()
+
+
+
+test.write('mytar.py', """
+import sys
+outfile = open(sys.argv[1], 'wb')
+for f in sys.argv[2:]:
+    infile = open(f, 'rb')
+    for l in filter(lambda l: l != '/*tar*/\\n', infile.readlines()):
+        outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(tools=['tar'],
+                  TARCOM = r'%s mytar.py $TARGET $SOURCES',
+                  TARCOMSTR = 'Taring $TARGET from $SOURCE')
+env.Tar('aaa.tar', 'aaa.in')
+""" % python)
+
+test.write('aaa.in', "aaa.in\n/*tar*/\n")
+
+test.run(stdout = test.wrap_stdout("""\
+Taring aaa.tar from aaa.in
+"""))
+
+test.must_match('aaa.tar', "aaa.in\n")
+
+
+
+test.pass_test()
diff --git a/test/TAR/TARFLAGS.py b/test/TAR/TARFLAGS.py
new file mode 100644
index 00000000..58642412
--- /dev/null
+++ b/test/TAR/TARFLAGS.py
@@ -0,0 +1,137 @@
+#!/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 os.path
+import string
+import sys
+import TestSCons
+
+python = TestSCons.python
+
+test = TestSCons.TestSCons()
+
+test.subdir('sub1')
+
+test.write('mytar.py', """
+import getopt
+import os
+import os.path
+import string
+import sys
+cmd_opts, args = getopt.getopt(sys.argv[1:], 'cf:x', [])
+opt_string = ''
+for opt, arg in cmd_opts:
+    if opt == '-f': out = arg
+    else: opt_string = opt_string + ' ' + opt
+def process(outfile, name):
+    if os.path.isdir(name):
+        for entry in os.listdir(name):
+	    process(outfile, os.path.join(name, entry))
+    else:
+        outfile.write(open(name, 'rb').read())
+outfile = open(out, 'wb')
+outfile.write('options: %s\\n' % opt_string)
+for infile in args:
+    process(outfile, infile)
+outfile.close()
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(tools = ['tar'], TAR = r'%s mytar.py', TARFLAGS = '-x')
+env.Tar(target = 'aaa.tar', source = ['file1', 'file2'])
+env.Tar(target = 'aaa.tar', source = 'file3')
+env.Tar(target = 'bbb', source = 'sub1')
+env.Tar(target = 'bbb', source = 'file4')
+""" % python)
+
+test.write('file1', "file1\n")
+test.write('file2', "file2\n")
+test.write('file3', "file3\n")
+test.write('file4', "file4\n")
+
+test.write(['sub1', 'file5'], "sub1/file5\n")
+test.write(['sub1', 'file6'], "sub1/file6\n")
+
+test.run(arguments = 'aaa.tar', stderr = None)
+
+test.fail_test(test.read('aaa.tar') != "options:  -x\nfile1\nfile2\nfile3\n")
+
+test.run(arguments = 'bbb.tar', stderr = None)
+
+test.fail_test(test.read('bbb.tar') != "options:  -x\nsub1/file5\nsub1/file6\nfile4\n")
+
+
+
+tar = test.detect('TAR', 'tar')
+
+if tar:
+
+    test.write("wrapper.py", """import os
+import string
+import sys
+open('%s', 'wb').write("wrapper.py\\n")
+os.system(string.join(sys.argv[1:], " "))
+""" % string.replace(test.workpath('wrapper.out'), '\\', '\\\\'))
+
+    test.write('SConstruct', """
+foo = Environment()
+tar = foo['TAR']
+bar = Environment(TAR = '',
+		  TARFLAGS = r'%s wrapper.py ' + tar + ' -c -b 1')
+foo.Tar(target = 'foo.tar', source = ['file10', 'file11'])
+foo.Tar(target = 'foo.tar', source = 'file12')
+bar.Tar(target = 'bar.tar', source = ['file13', 'file14'])
+bar.Tar(target = 'bar.tar', source = 'file15')
+""" % python)
+
+    test.write('file10', "file10\n")
+    test.write('file11', "file11\n")
+    test.write('file12', "file12\n")
+    test.write('file13', "file13\n")
+    test.write('file14', "file14\n")
+    test.write('file15', "file15\n")
+
+    test.run(arguments = 'foo.tar', stderr = None)
+
+    test.fail_test(os.path.exists(test.workpath('wrapper.out')))
+
+    test.fail_test(not os.path.exists(test.workpath('foo.tar')))
+
+    test.run(arguments = 'bar.tar', stderr = None)
+
+    test.fail_test(not os.path.exists(test.workpath('wrapper.out')))
+
+    test.fail_test(not os.path.exists(test.workpath('bar.tar')))
+
+    test.run(program = tar, arguments = "-t -f foo.tar", stderr = None)
+    test.fail_test(test.stdout() != "file10\nfile11\nfile12\n")
+
+    test.run(program = tar, arguments = "-t -f bar.tar", stderr = None)
+    test.fail_test(test.stdout() != "file13\nfile14\nfile15\n")
+
+test.pass_test()