From d6ecc399de10455c765c47c7f1d008fae55a29eb Mon Sep 17 00:00:00 2001 From: William Deegan Date: Fri, 10 Jul 2020 16:02:20 -0700 Subject: move tempfilemung tests to their own directory --- test/TEMPFILEPREFIX.py | 124 ----------------------------------- test/TEMPFILESUFFIX.py | 124 ----------------------------------- test/TempFileMunge/TEMPFILEPREFIX.py | 124 +++++++++++++++++++++++++++++++++++ test/TempFileMunge/TEMPFILESUFFIX.py | 124 +++++++++++++++++++++++++++++++++++ 4 files changed, 248 insertions(+), 248 deletions(-) delete mode 100644 test/TEMPFILEPREFIX.py delete mode 100644 test/TEMPFILESUFFIX.py create mode 100644 test/TempFileMunge/TEMPFILEPREFIX.py create mode 100644 test/TempFileMunge/TEMPFILESUFFIX.py diff --git a/test/TEMPFILEPREFIX.py b/test/TEMPFILEPREFIX.py deleted file mode 100644 index 4ccfd7d..0000000 --- a/test/TEMPFILEPREFIX.py +++ /dev/null @@ -1,124 +0,0 @@ -#!/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. - -""" -Verify that setting the $TEMPFILEPREFIX variable will cause -it to appear at the front of name of the generated tempfile -used for long command lines. -""" - -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" - -import os -import stat - -import TestSCons - -test = TestSCons.TestSCons(match = TestSCons.match_re) - -test.write('echo.py', """\ -import sys -print(sys.argv) -""") - -echo_py = test.workpath('echo.py') - -st = os.stat(echo_py) -os.chmod(echo_py, st[stat.ST_MODE]|0o111) - -test.write('SConstruct', """ -import os -env = Environment( - BUILDCOM = '${TEMPFILE("xxx.py $TARGET $SOURCES")}', - MAXLINELENGTH = 16, - TEMPFILEPREFIX = '-via', -) -env.AppendENVPath('PATH', os.curdir) -env.Command('foo.out', 'foo.in', '$BUILDCOM') -""") - -test.write('foo.in', "foo.in\n") - -test.run(arguments = '-n -Q .', - stdout = """\ -Using tempfile \\S+ for command line: -xxx.py foo.out foo.in -xxx.py -via\\S+ -""") - -test.write('SConstruct', """ -import os - -def print_cmd_line(s, targets, sources, env): - pass - -env = Environment( - BUILDCOM = '${TEMPFILE("xxx.py $TARGET $SOURCES")}', - MAXLINELENGTH = 16, - TEMPFILEPREFIX = '-via', - PRINT_CMD_LINE_FUNC=print_cmd_line -) -env.AppendENVPath('PATH', os.curdir) -env.Command('foo.out', 'foo.in', '$BUILDCOM') -""") - -test.run(arguments = '-n -Q .', - stdout = """""") - -test.write('SConstruct', """ -import os -from SCons.Platform import TempFileMunge - -class TestTempFileMunge(TempFileMunge): - - def __init__(self, cmd, cmdstr = None): - super(TestTempFileMunge, self).__init__(cmd, cmdstr) - - def _print_cmd_str(self, target, source, env, cmdstr): - super(TestTempFileMunge, self)._print_cmd_str(target, source, None, cmdstr) - -env = Environment( - TEMPFILE = TestTempFileMunge, - BUILDCOM = '${TEMPFILE("xxx.py $TARGET $SOURCES")}', - MAXLINELENGTH = 16, - TEMPFILEPREFIX = '-via', - -) -env.AppendENVPath('PATH', os.curdir) -env.Command('foo.out', 'foo.in', '$BUILDCOM') -""") - -test.run(arguments = '-n -Q .', - stdout = """\ -Using tempfile \\S+ for command line: -xxx.py foo.out foo.in -xxx.py -via\\S+ -""") - -test.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/TEMPFILESUFFIX.py b/test/TEMPFILESUFFIX.py deleted file mode 100644 index df546ac..0000000 --- a/test/TEMPFILESUFFIX.py +++ /dev/null @@ -1,124 +0,0 @@ -#!/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. - -""" -Verify that setting the $TEMPFILESUFFIX variable will cause -it to appear at the end of name of the generated tempfile -used for long command lines. -""" - -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" - -import os -import stat - -import TestSCons - -test = TestSCons.TestSCons(match=TestSCons.match_re) - -test.write('echo.py', """\ -import sys -print(sys.argv) -""") - -echo_py = test.workpath('echo.py') - -st = os.stat(echo_py) -os.chmod(echo_py, st[stat.ST_MODE] | 0o111) - -test.write('SConstruct', """ -import os -env = Environment( - BUILDCOM = '${TEMPFILE("xxx.py $TARGET $SOURCES")}', - MAXLINELENGTH = 16, - TEMPFILESUFFIX = '.foo', -) -env.AppendENVPath('PATH', os.curdir) -env.Command('foo.out', 'foo.in', '$BUILDCOM') -""") - -test.write('foo.in', "foo.in\n") - -test.run(arguments = '-n -Q .', - stdout = """\ -Using tempfile \\S+ for command line: -xxx.py foo.out foo.in -xxx.py \\S+ -""") - -test.write('SConstruct', """ -import os - -def print_cmd_line(s, targets, sources, env): - pass - -env = Environment( - BUILDCOM = '${TEMPFILE("xxx.py $TARGET $SOURCES")}', - MAXLINELENGTH = 16, - TEMPFILESUFFIX = '.foo', - PRINT_CMD_LINE_FUNC=print_cmd_line -) -env.AppendENVPath('PATH', os.curdir) -env.Command('foo.out', 'foo.in', '$BUILDCOM') -""") - -test.run(arguments = '-n -Q .', - stdout = """""") - -test.write('SConstruct', """ -import os -from SCons.Platform import TempFileMunge - -class TestTempFileMunge(TempFileMunge): - - def __init__(self, cmd, cmdstr = None): - super(TestTempFileMunge, self).__init__(cmd, cmdstr) - - def _print_cmd_str(self, target, source, env, cmdstr): - super(TestTempFileMunge, self)._print_cmd_str(target, source, None, cmdstr) - -env = Environment( - TEMPFILE = TestTempFileMunge, - BUILDCOM = '${TEMPFILE("xxx.py $TARGET $SOURCES")}', - MAXLINELENGTH = 16, - TEMPFILESUFFIX = '.foo', - -) -env.AppendENVPath('PATH', os.curdir) -env.Command('foo.out', 'foo.in', '$BUILDCOM') -""") - -test.run(arguments = '-n -Q .', - stdout = """\ -Using tempfile \\S+ for command line: -xxx.py foo.out foo.in -xxx.py \\S+ -""") - -test.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/TempFileMunge/TEMPFILEPREFIX.py b/test/TempFileMunge/TEMPFILEPREFIX.py new file mode 100644 index 0000000..4ccfd7d --- /dev/null +++ b/test/TempFileMunge/TEMPFILEPREFIX.py @@ -0,0 +1,124 @@ +#!/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. + +""" +Verify that setting the $TEMPFILEPREFIX variable will cause +it to appear at the front of name of the generated tempfile +used for long command lines. +""" + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +import os +import stat + +import TestSCons + +test = TestSCons.TestSCons(match = TestSCons.match_re) + +test.write('echo.py', """\ +import sys +print(sys.argv) +""") + +echo_py = test.workpath('echo.py') + +st = os.stat(echo_py) +os.chmod(echo_py, st[stat.ST_MODE]|0o111) + +test.write('SConstruct', """ +import os +env = Environment( + BUILDCOM = '${TEMPFILE("xxx.py $TARGET $SOURCES")}', + MAXLINELENGTH = 16, + TEMPFILEPREFIX = '-via', +) +env.AppendENVPath('PATH', os.curdir) +env.Command('foo.out', 'foo.in', '$BUILDCOM') +""") + +test.write('foo.in', "foo.in\n") + +test.run(arguments = '-n -Q .', + stdout = """\ +Using tempfile \\S+ for command line: +xxx.py foo.out foo.in +xxx.py -via\\S+ +""") + +test.write('SConstruct', """ +import os + +def print_cmd_line(s, targets, sources, env): + pass + +env = Environment( + BUILDCOM = '${TEMPFILE("xxx.py $TARGET $SOURCES")}', + MAXLINELENGTH = 16, + TEMPFILEPREFIX = '-via', + PRINT_CMD_LINE_FUNC=print_cmd_line +) +env.AppendENVPath('PATH', os.curdir) +env.Command('foo.out', 'foo.in', '$BUILDCOM') +""") + +test.run(arguments = '-n -Q .', + stdout = """""") + +test.write('SConstruct', """ +import os +from SCons.Platform import TempFileMunge + +class TestTempFileMunge(TempFileMunge): + + def __init__(self, cmd, cmdstr = None): + super(TestTempFileMunge, self).__init__(cmd, cmdstr) + + def _print_cmd_str(self, target, source, env, cmdstr): + super(TestTempFileMunge, self)._print_cmd_str(target, source, None, cmdstr) + +env = Environment( + TEMPFILE = TestTempFileMunge, + BUILDCOM = '${TEMPFILE("xxx.py $TARGET $SOURCES")}', + MAXLINELENGTH = 16, + TEMPFILEPREFIX = '-via', + +) +env.AppendENVPath('PATH', os.curdir) +env.Command('foo.out', 'foo.in', '$BUILDCOM') +""") + +test.run(arguments = '-n -Q .', + stdout = """\ +Using tempfile \\S+ for command line: +xxx.py foo.out foo.in +xxx.py -via\\S+ +""") + +test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/TempFileMunge/TEMPFILESUFFIX.py b/test/TempFileMunge/TEMPFILESUFFIX.py new file mode 100644 index 0000000..df546ac --- /dev/null +++ b/test/TempFileMunge/TEMPFILESUFFIX.py @@ -0,0 +1,124 @@ +#!/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. + +""" +Verify that setting the $TEMPFILESUFFIX variable will cause +it to appear at the end of name of the generated tempfile +used for long command lines. +""" + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +import os +import stat + +import TestSCons + +test = TestSCons.TestSCons(match=TestSCons.match_re) + +test.write('echo.py', """\ +import sys +print(sys.argv) +""") + +echo_py = test.workpath('echo.py') + +st = os.stat(echo_py) +os.chmod(echo_py, st[stat.ST_MODE] | 0o111) + +test.write('SConstruct', """ +import os +env = Environment( + BUILDCOM = '${TEMPFILE("xxx.py $TARGET $SOURCES")}', + MAXLINELENGTH = 16, + TEMPFILESUFFIX = '.foo', +) +env.AppendENVPath('PATH', os.curdir) +env.Command('foo.out', 'foo.in', '$BUILDCOM') +""") + +test.write('foo.in', "foo.in\n") + +test.run(arguments = '-n -Q .', + stdout = """\ +Using tempfile \\S+ for command line: +xxx.py foo.out foo.in +xxx.py \\S+ +""") + +test.write('SConstruct', """ +import os + +def print_cmd_line(s, targets, sources, env): + pass + +env = Environment( + BUILDCOM = '${TEMPFILE("xxx.py $TARGET $SOURCES")}', + MAXLINELENGTH = 16, + TEMPFILESUFFIX = '.foo', + PRINT_CMD_LINE_FUNC=print_cmd_line +) +env.AppendENVPath('PATH', os.curdir) +env.Command('foo.out', 'foo.in', '$BUILDCOM') +""") + +test.run(arguments = '-n -Q .', + stdout = """""") + +test.write('SConstruct', """ +import os +from SCons.Platform import TempFileMunge + +class TestTempFileMunge(TempFileMunge): + + def __init__(self, cmd, cmdstr = None): + super(TestTempFileMunge, self).__init__(cmd, cmdstr) + + def _print_cmd_str(self, target, source, env, cmdstr): + super(TestTempFileMunge, self)._print_cmd_str(target, source, None, cmdstr) + +env = Environment( + TEMPFILE = TestTempFileMunge, + BUILDCOM = '${TEMPFILE("xxx.py $TARGET $SOURCES")}', + MAXLINELENGTH = 16, + TEMPFILESUFFIX = '.foo', + +) +env.AppendENVPath('PATH', os.curdir) +env.Command('foo.out', 'foo.in', '$BUILDCOM') +""") + +test.run(arguments = '-n -Q .', + stdout = """\ +Using tempfile \\S+ for command line: +xxx.py foo.out foo.in +xxx.py \\S+ +""") + +test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: -- cgit v0.12