diff options
author | William Deegan <bill@baddogconsulting.com> | 2017-03-20 11:01:16 -0700 |
---|---|---|
committer | William Deegan <bill@baddogconsulting.com> | 2017-03-20 11:01:16 -0700 |
commit | 1103b68d54aac9cb01c85f4fdc449c5aa31d7950 (patch) | |
tree | dd973de1ccfde1cd2c5bd6787b0ccce9f420f269 /test/Deprecated | |
parent | 7548f446029397b266fbeed450446f29ab97c8f7 (diff) | |
download | scons-1103b68d54aac9cb01c85f4fdc449c5aa31d7950.tar.gz |
Remove deprecated tool RCS
Diffstat (limited to 'test/Deprecated')
-rw-r--r-- | test/Deprecated/SourceCode/RCS/RCS_COCOM.py | 140 | ||||
-rw-r--r-- | test/Deprecated/SourceCode/RCS/RCS_COCOMSTR.py | 141 | ||||
-rw-r--r-- | test/Deprecated/SourceCode/RCS/changed.py | 107 | ||||
-rw-r--r-- | test/Deprecated/SourceCode/RCS/diskcheck.py | 202 | ||||
-rw-r--r-- | test/Deprecated/SourceCode/RCS/explicit.py | 176 | ||||
-rw-r--r-- | test/Deprecated/SourceCode/RCS/implicit.py | 100 | ||||
-rw-r--r-- | test/Deprecated/SourceCode/RCS/transparent.py | 187 |
7 files changed, 0 insertions, 1053 deletions
diff --git a/test/Deprecated/SourceCode/RCS/RCS_COCOM.py b/test/Deprecated/SourceCode/RCS/RCS_COCOM.py deleted file mode 100644 index c5934ace..00000000 --- a/test/Deprecated/SourceCode/RCS/RCS_COCOM.py +++ /dev/null @@ -1,140 +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. - -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" - -""" -Test setting the $RCS_COCOM variable. -""" - -import os - -import TestSCons - -_python_ = TestSCons._python_ - -test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) - -test.write('SConscript', """ -Environment(tools = ['RCS']).RCS() -""") - -msg_rcs = """The RCS() factory is deprecated and there is no replacement.""" -warn_rcs = test.deprecated_fatal('deprecated-build-dir', msg_rcs) -msg_sc = """SourceCode() has been deprecated and there is no replacement. -\tIf you need this function, please contact scons-dev@scons.org""" -warn_sc = test.deprecated_wrap(msg_sc) - -test.subdir('RCS', ['RCS', 'sub'], 'sub') - -sub_RCS = os.path.join('sub', 'RCS') -sub_SConscript = os.path.join('sub', 'SConscript') -sub_all = os.path.join('sub', 'all') -sub_ddd_in = os.path.join('sub', 'ddd.in') -sub_ddd_out = os.path.join('sub', 'ddd.out') -sub_eee_in = os.path.join('sub', 'eee.in') -sub_eee_out = os.path.join('sub', 'eee.out') -sub_fff_in = os.path.join('sub', 'fff.in') -sub_fff_out = os.path.join('sub', 'fff.out') - -test.write('my-rcs-co.py', """ -import shutil -import sys -for f in sys.argv[1:]: - shutil.copy('RCS/'+f, f) -""") - -test.write('SConstruct', """ -SetOption('warn', 'deprecated-source-code') -def cat(env, source, target): - target = str(target[0]) - f = open(target, "wb") - for src in source: - f.write(open(str(src), "rb").read()) - f.close() -env = Environment(TOOLS = ['default', 'RCS'], - BUILDERS={'Cat':Builder(action=cat)}, - RCS_COCOM=r'%(_python_)s my-rcs-co.py $TARGET') -env.Cat('aaa.out', 'aaa.in') -env.Cat('bbb.out', 'bbb.in') -env.Cat('ccc.out', 'ccc.in') -env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out']) -env.SourceCode('.', env.RCS()) -SConscript('sub/SConscript', "env") -""" % locals()) - -test.write(['RCS', 'sub', 'SConscript'], """\ -Import("env") -env.Cat('ddd.out', 'ddd.in') -env.Cat('eee.out', 'eee.in') -env.Cat('fff.out', 'fff.in') -env.Cat('all', ['ddd.out', 'eee.out', 'fff.out']) -""") - -test.write(['RCS', 'aaa.in'], "RCS/aaa.in\n") -test.write('bbb.in', "checked-out bbb.in\n") -test.write(['RCS', 'ccc.in'], "RCS/ccc.in\n") - -test.write(['RCS', 'sub', 'ddd.in'], "RCS/sub/ddd.in\n") -test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n") -test.write(['RCS', 'sub', 'fff.in'], "RCS/sub/fff.in\n") - -read_str = """\ -%(_python_)s my-rcs-co.py %(sub_SConscript)s -""" % locals() - -build_str = """\ -%(_python_)s my-rcs-co.py aaa.in -cat(["aaa.out"], ["aaa.in"]) -cat(["bbb.out"], ["bbb.in"]) -%(_python_)s my-rcs-co.py ccc.in -cat(["ccc.out"], ["ccc.in"]) -cat(["all"], ["aaa.out", "bbb.out", "ccc.out"]) -%(_python_)s my-rcs-co.py %(sub_ddd_in)s -cat(["%(sub_ddd_out)s"], ["%(sub_ddd_in)s"]) -cat(["%(sub_eee_out)s"], ["%(sub_eee_in)s"]) -%(_python_)s my-rcs-co.py %(sub_fff_in)s -cat(["%(sub_fff_out)s"], ["%(sub_fff_in)s"]) -cat(["%(sub_all)s"], ["%(sub_ddd_out)s", "%(sub_eee_out)s", "%(sub_fff_out)s"]) -""" % locals() - -stdout = test.wrap_stdout(read_str = read_str, build_str = build_str) - -test.run(arguments = '.', - stdout = TestSCons.re_escape(stdout), - stderr = warn_rcs + warn_sc) - -test.must_match('all', - "RCS/aaa.in\nchecked-out bbb.in\nRCS/ccc.in\n") - -test.must_match(['sub', 'all'], - "RCS/sub/ddd.in\nchecked-out sub/eee.in\nRCS/sub/fff.in\n") - - -test.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/Deprecated/SourceCode/RCS/RCS_COCOMSTR.py b/test/Deprecated/SourceCode/RCS/RCS_COCOMSTR.py deleted file mode 100644 index cb542027..00000000 --- a/test/Deprecated/SourceCode/RCS/RCS_COCOMSTR.py +++ /dev/null @@ -1,141 +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. - -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" - -""" -Test customizing the output with the the $RCS_COCOMSTR variable. -""" - -import os.path - -import TestSCons - -_python_ = TestSCons._python_ - -test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) - -test.write('SConscript', """ -Environment(tools = ['RCS']).RCS() -""") - -msg_rcs = """The RCS() factory is deprecated and there is no replacement.""" -warn_rcs = test.deprecated_fatal('deprecated-build-dir', msg_rcs) -msg_sc = """SourceCode() has been deprecated and there is no replacement. -\tIf you need this function, please contact scons-dev@scons.org""" -warn_sc = test.deprecated_wrap(msg_sc) - -test.subdir('RCS', ['RCS', 'sub'], 'sub') - -sub_RCS = os.path.join('sub', 'RCS') -sub_SConscript = os.path.join('sub', 'SConscript') -sub_all = os.path.join('sub', 'all') -sub_ddd_in = os.path.join('sub', 'ddd.in') -sub_ddd_out = os.path.join('sub', 'ddd.out') -sub_eee_in = os.path.join('sub', 'eee.in') -sub_eee_out = os.path.join('sub', 'eee.out') -sub_fff_in = os.path.join('sub', 'fff.in') -sub_fff_out = os.path.join('sub', 'fff.out') - -test.write('my-rcs-co.py', """ -import shutil -import sys -for f in sys.argv[1:]: - shutil.copy('RCS/'+f, f) -""") - -test.write('SConstruct', """ -SetOption('warn', 'deprecated-source-code') -def cat(env, source, target): - target = str(target[0]) - f = open(target, "wb") - for src in source: - f.write(open(str(src), "rb").read()) - f.close() -env = Environment(TOOLS = ['default', 'RCS'], - BUILDERS={'Cat':Builder(action=cat)}, - RCS_COCOM=r'%(_python_)s my-rcs-co.py $TARGET', - RCS_COCOMSTR='Checking out $TARGET from our fake RCS') -env.Cat('aaa.out', 'aaa.in') -env.Cat('bbb.out', 'bbb.in') -env.Cat('ccc.out', 'ccc.in') -env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out']) -env.SourceCode('.', env.RCS()) -SConscript('sub/SConscript', "env") -""" % locals()) - -test.write(['RCS', 'sub', 'SConscript'], """\ -Import("env") -env.Cat('ddd.out', 'ddd.in') -env.Cat('eee.out', 'eee.in') -env.Cat('fff.out', 'fff.in') -env.Cat('all', ['ddd.out', 'eee.out', 'fff.out']) -""") - -test.write(['RCS', 'aaa.in'], "RCS/aaa.in\n") -test.write('bbb.in', "checked-out bbb.in\n") -test.write(['RCS', 'ccc.in'], "RCS/ccc.in\n") - -test.write(['RCS', 'sub', 'ddd.in'], "RCS/sub/ddd.in\n") -test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n") -test.write(['RCS', 'sub', 'fff.in'], "RCS/sub/fff.in\n") - -read_str = """\ -Checking out %(sub_SConscript)s from our fake RCS -""" % locals() - -build_str = """\ -Checking out aaa.in from our fake RCS -cat(["aaa.out"], ["aaa.in"]) -cat(["bbb.out"], ["bbb.in"]) -Checking out ccc.in from our fake RCS -cat(["ccc.out"], ["ccc.in"]) -cat(["all"], ["aaa.out", "bbb.out", "ccc.out"]) -Checking out %(sub_ddd_in)s from our fake RCS -cat(["%(sub_ddd_out)s"], ["%(sub_ddd_in)s"]) -cat(["%(sub_eee_out)s"], ["%(sub_eee_in)s"]) -Checking out %(sub_fff_in)s from our fake RCS -cat(["%(sub_fff_out)s"], ["%(sub_fff_in)s"]) -cat(["%(sub_all)s"], ["%(sub_ddd_out)s", "%(sub_eee_out)s", "%(sub_fff_out)s"]) -""" % locals() - -stdout = test.wrap_stdout(read_str = read_str, build_str = build_str) - -test.run(arguments = '.', - stdout = TestSCons.re_escape(stdout), - stderr = warn_rcs + warn_sc) - -test.must_match('all', - "RCS/aaa.in\nchecked-out bbb.in\nRCS/ccc.in\n") - -test.must_match(['sub', 'all'], - "RCS/sub/ddd.in\nchecked-out sub/eee.in\nRCS/sub/fff.in\n") - - -test.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/Deprecated/SourceCode/RCS/changed.py b/test/Deprecated/SourceCode/RCS/changed.py deleted file mode 100644 index fec1ba36..00000000 --- a/test/Deprecated/SourceCode/RCS/changed.py +++ /dev/null @@ -1,107 +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. - -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" - -""" -Test explicit checkouts from local RCS files. -""" - -import TestSCons - -test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) - -test.write('SConscript', """ -Environment(tools = ['RCS']).RCS() -""") - -msg_rcs = """The RCS() factory is deprecated and there is no replacement.""" -warn_rcs = test.deprecated_fatal('deprecated-build-dir', msg_rcs) -msg_sc = """SourceCode() has been deprecated and there is no replacement. -\tIf you need this function, please contact scons-dev@scons.org""" -warn_sc = test.deprecated_wrap(msg_sc) - -rcs = test.where_is('rcs') -if not rcs: - test.skip_test("Could not find 'rcs'; skipping test(s).\n") - -ci = test.where_is('ci') -if not ci: - test.skip_test("Could not find `ci' command, skipping test(s).\n") - -co = test.where_is('co') -if not co: - test.skip_test("Could not find `co' command, skipping test(s).\n") - - -main_cpp_contents = """\ -#include <stdio.h> -#include <stdlib.h> -int -main(int argc, char *argv[]) -{ - printf("main.c %s\\n"); - exit (0); -} -""" - -test.write('main.c', main_cpp_contents % 1) - -test.run(program = ci, arguments = '-f -tmain.c main.c', stderr = None) - - -test.write('SConstruct', """ -SetOption('warn', 'deprecated-source-code') -import os -for key in ['LOGNAME', 'USERNAME', 'USER']: - logname = os.environ.get(key) - if logname: break -ENV = {'PATH' : os.environ['PATH'], - 'LOGNAME' : logname} -env = Environment(ENV=ENV, RCS_COFLAGS='-q') -env.SourceCode('main.c', env.RCS()) -env2 = env.Clone() -env2.Program('main.exe', 'main.c') -""") - -test.run(stderr = warn_rcs + warn_sc) - -test.run(program = test.workpath('main.exe'), stdout = "main.c 1\n") - -test.run(program = co, arguments = '-l main.c', stderr = None) - - -test.write('main.c', main_cpp_contents % 2) - -test.not_up_to_date(arguments = 'main.exe', stderr = warn_rcs + warn_sc) - -test.run(program = test.workpath('main.exe'), stdout = "main.c 2\n") - - -test.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/Deprecated/SourceCode/RCS/diskcheck.py b/test/Deprecated/SourceCode/RCS/diskcheck.py deleted file mode 100644 index 7183975d..00000000 --- a/test/Deprecated/SourceCode/RCS/diskcheck.py +++ /dev/null @@ -1,202 +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. - -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" - -""" -Test transparent RCS checkouts from an RCS subdirectory. -""" - -import os - -import TestSCons - -test = TestSCons.TestSCons() - -test.write('SConscript', """ -Environment(tools = ['RCS']).RCS() -""") - -msg_rcs = """The RCS() factory is deprecated and there is no replacement.""" -test.deprecated_fatal('deprecated-build-dir', msg_rcs) - -rcs = test.where_is('rcs') -if not rcs: - test.skip_test("Could not find 'rcs'; skipping test(s).\n") - -ci = test.where_is('ci') -if not ci: - test.skip_test("Could not find 'ci'; skipping test(s).\n") - - -sub_RCS = os.path.join('sub', 'RCS') -sub_SConscript = os.path.join('sub', 'SConscript') -sub_all = os.path.join('sub', 'all') -sub_ddd_in = os.path.join('sub', 'ddd.in') -sub_ddd_out = os.path.join('sub', 'ddd.out') -sub_eee_in = os.path.join('sub', 'eee.in') -sub_eee_out = os.path.join('sub', 'eee.out') -sub_fff_in = os.path.join('sub', 'fff.in') -sub_fff_out = os.path.join('sub', 'fff.out') - -test.subdir('RCS', 'sub', ['sub', 'RCS']) - -for f in ['aaa.in', 'bbb.in', 'ccc.in']: - test.write(f, "%s\n" % f) - args = "-f -t%s %s" % (f, f) - test.run(program = ci, arguments = args, stderr = None) - -for f in ['ddd.in', 'eee.in', 'fff.in']: - test.write(['sub', f], "sub/%s\n" % f) - args = "-f -tsub/%s sub/%s" % (f, f) - test.run(program = ci, arguments = args, stderr = None) - -test.write(['sub', 'SConscript'], """\ -Import("env") -env.Cat('ddd.out', 'ddd.in') -env.Cat('eee.out', 'eee.in') -env.Cat('fff.out', 'fff.in') -env.Cat('all', ['ddd.out', 'eee.out', 'fff.out']) -""") -args = "-f -tsub/SConscript sub/SConscript" -test.run(program = ci, arguments = args, stderr = None) - -test.no_result(os.path.exists(test.workpath('aaa.in'))) -test.no_result(os.path.exists(test.workpath('bbb.in'))) -test.no_result(os.path.exists(test.workpath('ccc.in'))) - -test.no_result(os.path.exists(test.workpath('sub', 'SConscript'))) - -test.no_result(os.path.exists(test.workpath('sub', 'aaa.in'))) -test.no_result(os.path.exists(test.workpath('sub', 'bbb.in'))) -test.no_result(os.path.exists(test.workpath('sub', 'ccc.in'))) - -test.write('SConstruct', """ -SetOption('warn', 'deprecated-source-code') -import os -for key in ['LOGNAME', 'USERNAME', 'USER']: - logname = os.environ.get(key) - if logname: break -ENV = {'PATH' : os.environ['PATH'], - 'LOGNAME' : logname} -def cat(env, source, target): - target = str(target[0]) - f = open(target, "wb") - for src in source: - f.write(open(str(src), "rb").read()) - f.close() -SetOption('diskcheck', None) -DefaultEnvironment()['ENV'] = ENV -DefaultEnvironment()['RCS_COFLAGS'] = '-l' -env = Environment(ENV=ENV, BUILDERS={'Cat':Builder(action=cat)}) -env.Cat('aaa.out', 'aaa.in') -env.Cat('bbb.out', 'bbb.in') -env.Cat('ccc.out', 'ccc.in') -env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out']) -SConscript('sub/SConscript', "env") -""") - -test.write('bbb.in', "checked-out bbb.in\n") - -test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n") - -sub_SConscript = os.path.join('sub', 'SConscript') -SConstruct_file_line = test.python_file_line(test.workpath('SConstruct'), 23)[:-1] - -expect = """\ - -scons: warning: Ignoring missing SConscript '%(sub_SConscript)s' -%(SConstruct_file_line)s -scons: *** [aaa.out] Source `aaa.in' not found, needed by target `aaa.out'. -""" % locals() - -test.run(status=2, stderr=expect) - -test.run(arguments = '--diskcheck=match,sccs', status=2, stderr=expect) - -read_str = """\ -co -l %(sub_SConscript)s -""" % locals() - -build_str = """\ -co -l aaa.in -cat(["aaa.out"], ["aaa.in"]) -cat(["bbb.out"], ["bbb.in"]) -co -l ccc.in -cat(["ccc.out"], ["ccc.in"]) -cat(["all"], ["aaa.out", "bbb.out", "ccc.out"]) -co -l %(sub_ddd_in)s -cat(["%(sub_ddd_out)s"], ["%(sub_ddd_in)s"]) -cat(["%(sub_eee_out)s"], ["%(sub_eee_in)s"]) -co -l %(sub_fff_in)s -cat(["%(sub_fff_out)s"], ["%(sub_fff_in)s"]) -cat(["%(sub_all)s"], ["%(sub_ddd_out)s", "%(sub_eee_out)s", "%(sub_fff_out)s"]) -""" % locals() - -stdout = test.wrap_stdout(read_str = read_str, build_str = build_str) - -stderr = """\ -%(sub_RCS)s/SConscript,v --> %(sub_SConscript)s -revision 1.1 (locked) -done -RCS/aaa.in,v --> aaa.in -revision 1.1 (locked) -done -RCS/ccc.in,v --> ccc.in -revision 1.1 (locked) -done -%(sub_RCS)s/ddd.in,v --> %(sub_ddd_in)s -revision 1.1 (locked) -done -%(sub_RCS)s/fff.in,v --> %(sub_fff_in)s -revision 1.1 (locked) -done -""" % locals() - -test.run(arguments = '--diskcheck=rcs', stdout = stdout, stderr = stderr) - -# Checking things back out of RCS apparently messes with the line -# endings, so read the result files in non-binary mode. - -test.must_match('all', - "aaa.in\nchecked-out bbb.in\nccc.in\n", - mode='r') - -test.must_match(['sub', 'all'], - "sub/ddd.in\nchecked-out sub/eee.in\nsub/fff.in\n", - mode='r') - -test.must_be_writable(test.workpath('sub', 'SConscript')) -test.must_be_writable(test.workpath('aaa.in')) -test.must_be_writable(test.workpath('ccc.in')) -test.must_be_writable(test.workpath('sub', 'ddd.in')) -test.must_be_writable(test.workpath('sub', 'fff.in')) - - -test.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/Deprecated/SourceCode/RCS/explicit.py b/test/Deprecated/SourceCode/RCS/explicit.py deleted file mode 100644 index 96ce02f8..00000000 --- a/test/Deprecated/SourceCode/RCS/explicit.py +++ /dev/null @@ -1,176 +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. - -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" - -""" -Test explicit checkouts from local RCS files. -""" - -import os - -import TestSCons - -test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) - -test.write('SConscript', """ -Environment(tools = ['RCS']).RCS() -""") - -msg_rcs = """The RCS() factory is deprecated and there is no replacement.""" -warn_rcs = test.deprecated_fatal('deprecated-build-dir', msg_rcs) -msg_sc = """SourceCode() has been deprecated and there is no replacement. -\tIf you need this function, please contact scons-dev@scons.org""" -warn_sc = test.deprecated_wrap(msg_sc) - -rcs = test.where_is('rcs') -if not rcs: - test.skip_test("Could not find 'rcs'; skipping test(s).\n") - -ci = test.where_is('ci') -if not ci: - test.skip_test("Could not find `ci' command, skipping test(s).\n") - - -test.subdir('sub') - -sub_RCS = os.path.join('sub', 'RCS') -sub_SConscript = os.path.join('sub', 'SConscript') -sub_all = os.path.join('sub', 'all') -sub_ddd_in = os.path.join('sub', 'ddd.in') -sub_ddd_out = os.path.join('sub', 'ddd.out') -sub_eee_in = os.path.join('sub', 'eee.in') -sub_eee_out = os.path.join('sub', 'eee.out') -sub_fff_in = os.path.join('sub', 'fff.in') -sub_fff_out = os.path.join('sub', 'fff.out') - -for f in ['aaa.in', 'bbb.in', 'ccc.in']: - test.write(f, "%s\n" % f) - args = "-f -t%s %s" % (f, f) - test.run(program = ci, arguments = args, stderr = None) - -test.write(['sub', 'SConscript'], """\ -Import("env") -env.Cat('ddd.out', 'ddd.in') -env.Cat('eee.out', 'eee.in') -env.Cat('fff.out', 'fff.in') -env.Cat('all', ['ddd.out', 'eee.out', 'fff.out']) -""") -args = "-f -tsub/SConscript sub/SConscript" -test.run(program = ci, arguments = args, stderr = None) - -for f in ['ddd.in', 'eee.in', 'fff.in']: - test.write(['sub', f], "sub/%s\n" % f) - args = "-f -tsub/%s sub/%s" % (f, f) - test.run(program = ci, arguments = args, stderr = None) - -test.no_result(os.path.exists(test.workpath('aaa.in'))) -test.no_result(os.path.exists(test.workpath('bbb.in'))) -test.no_result(os.path.exists(test.workpath('ccc.in'))) - -test.no_result(os.path.exists(test.workpath('sub', 'SConscript'))) - -test.no_result(os.path.exists(test.workpath('sub', 'ddd.in'))) -test.no_result(os.path.exists(test.workpath('sub', 'eee.in'))) -test.no_result(os.path.exists(test.workpath('sub', 'fff.in'))) - -test.write('SConstruct', """ -SetOption('warn', 'deprecated-source-code') -import os -for key in ['LOGNAME', 'USERNAME', 'USER']: - logname = os.environ.get(key) - if logname: break -ENV = {'PATH' : os.environ['PATH'], - 'LOGNAME' : logname} -def cat(env, source, target): - target = str(target[0]) - f = open(target, "wb") - for src in source: - f.write(open(str(src), "rb").read()) - f.close() -env = Environment(ENV=ENV, - BUILDERS={'Cat':Builder(action=cat)}, - RCS_COFLAGS='-q') -DefaultEnvironment()['ENV'] = ENV -env.Cat('aaa.out', 'aaa.in') -env.Cat('bbb.out', 'bbb.in') -env.Cat('ccc.out', 'ccc.in') -env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out']) -env.SourceCode('.', env.RCS()) -SConscript('sub/SConscript', "env") -""") - -test.write('bbb.in', "checked-out bbb.in\n") - -test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n") - -read_str = """\ -co -q %(sub_SConscript)s -""" % locals() - -build_str = """\ -co -q aaa.in -cat(["aaa.out"], ["aaa.in"]) -cat(["bbb.out"], ["bbb.in"]) -co -q ccc.in -cat(["ccc.out"], ["ccc.in"]) -cat(["all"], ["aaa.out", "bbb.out", "ccc.out"]) -co -q %(sub_ddd_in)s -cat(["%(sub_ddd_out)s"], ["%(sub_ddd_in)s"]) -cat(["%(sub_eee_out)s"], ["%(sub_eee_in)s"]) -co -q %(sub_fff_in)s -cat(["%(sub_fff_out)s"], ["%(sub_fff_in)s"]) -cat(["%(sub_all)s"], ["%(sub_ddd_out)s", "%(sub_eee_out)s", "%(sub_fff_out)s"]) -""" % locals() - -stdout = test.wrap_stdout(read_str = read_str, build_str = build_str) - -test.run(arguments = '.', - stdout = TestSCons.re_escape(stdout), - stderr = warn_rcs + warn_sc) - -# Checking things back out of RCS apparently messes with the line -# endings, so read the result files in non-binary mode. - -test.must_match('all', - "aaa.in\nchecked-out bbb.in\nccc.in\n", - mode='r') - -test.must_match(['sub', 'all'], - "sub/ddd.in\nchecked-out sub/eee.in\nsub/fff.in\n", - mode='r') - -test.must_not_be_writable(test.workpath('sub', 'SConscript')) -test.must_not_be_writable(test.workpath('aaa.in')) -test.must_not_be_writable(test.workpath('ccc.in')) -test.must_not_be_writable(test.workpath('sub', 'ddd.in')) -test.must_not_be_writable(test.workpath('sub', 'fff.in')) - - -test.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/Deprecated/SourceCode/RCS/implicit.py b/test/Deprecated/SourceCode/RCS/implicit.py deleted file mode 100644 index ed1f1a23..00000000 --- a/test/Deprecated/SourceCode/RCS/implicit.py +++ /dev/null @@ -1,100 +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. - -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" - -""" -Test transparent RCS checkouts of implicit dependencies. -""" - -import TestSCons - -test = TestSCons.TestSCons() - -test.write('SConscript', """ -Environment(tools = ['RCS']).RCS() -""") - -msg_rcs = """The RCS() factory is deprecated and there is no replacement.""" -test.deprecated_fatal('deprecated-build-dir', msg_rcs) - -rcs = test.where_is('rcs') -if not rcs: - test.skip_test("Could not find 'rcs'; skipping test(s).\n") - -ci = test.where_is('ci') -if not ci: - test.skip_test("Could not find 'ci'; skipping test(s).\n") - -co = test.where_is('co') -if not co: - test.skip_test("Could not find 'co'; skipping test(s).\n") - - -test.subdir('RCS') - -test.write('foo.c', """\ -#include <stdio.h> - -#include "foo.h" -int -main(int argc, char *argv[]) { - printf(STR); - printf("foo.c\\n"); -} -""") -test.run(program = ci, - arguments = "-f -tfoo.c foo.c", - stderr = None) - -test.write('foo.h', """\ -#define STR "foo.h\\n" -""") -test.run(program = ci, - arguments = "-f -tfoo.h foo.h", - stderr = None) - -test.write('SConstruct', """ -SetOption('warn', 'deprecated-source-code') -DefaultEnvironment(RCS_CO = r'%s') -env = Environment() -env.Program('foo.c') -""" % co) - -test.run(stderr="""\ -RCS/foo.c,v --> foo.c -revision 1.1 -done -RCS/foo.h,v --> foo.h -revision 1.1 -done -""") - - -test.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/Deprecated/SourceCode/RCS/transparent.py b/test/Deprecated/SourceCode/RCS/transparent.py deleted file mode 100644 index 67d0512f..00000000 --- a/test/Deprecated/SourceCode/RCS/transparent.py +++ /dev/null @@ -1,187 +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. - -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" - -""" -Test transparent RCS checkouts from an RCS subdirectory. -""" - -import os - -import TestSCons - -test = TestSCons.TestSCons() - -test.write('SConscript', """ -Environment(tools = ['RCS']).RCS() -""") - -msg_rcs = """The RCS() factory is deprecated and there is no replacement.""" -test.deprecated_fatal('deprecated-build-dir', msg_rcs) - -rcs = test.where_is('rcs') -if not rcs: - test.skip_test("Could not find 'rcs'; skipping test(s).\n") - -ci = test.where_is('ci') -if not ci: - test.skip_test("Could not find 'ci'; skipping test(s).\n") - - -sub_RCS = os.path.join('sub', 'RCS') -sub_SConscript = os.path.join('sub', 'SConscript') -sub_all = os.path.join('sub', 'all') -sub_ddd_in = os.path.join('sub', 'ddd.in') -sub_ddd_out = os.path.join('sub', 'ddd.out') -sub_eee_in = os.path.join('sub', 'eee.in') -sub_eee_out = os.path.join('sub', 'eee.out') -sub_fff_in = os.path.join('sub', 'fff.in') -sub_fff_out = os.path.join('sub', 'fff.out') - -test.subdir('RCS', 'sub', ['sub', 'RCS']) - -for f in ['aaa.in', 'bbb.in', 'ccc.in']: - test.write(f, "%s\n" % f) - args = "-f -t%s %s" % (f, f) - test.run(program = ci, arguments = args, stderr = None) - -for f in ['ddd.in', 'eee.in', 'fff.in']: - test.write(['sub', f], "sub/%s\n" % f) - args = "-f -tsub/%s sub/%s" % (f, f) - test.run(program = ci, arguments = args, stderr = None) - -test.write(['sub', 'SConscript'], """\ -Import("env") -env.Cat('ddd.out', 'ddd.in') -env.Cat('eee.out', 'eee.in') -env.Cat('fff.out', 'fff.in') -env.Cat('all', ['ddd.out', 'eee.out', 'fff.out']) -""") -args = "-f -tsub/SConscript sub/SConscript" -test.run(program = ci, arguments = args, stderr = None) - -test.no_result(os.path.exists(test.workpath('aaa.in'))) -test.no_result(os.path.exists(test.workpath('bbb.in'))) -test.no_result(os.path.exists(test.workpath('ccc.in'))) - -test.no_result(os.path.exists(test.workpath('sub', 'SConscript'))) - -test.no_result(os.path.exists(test.workpath('sub', 'aaa.in'))) -test.no_result(os.path.exists(test.workpath('sub', 'bbb.in'))) -test.no_result(os.path.exists(test.workpath('sub', 'ccc.in'))) - -test.write('SConstruct', """ -SetOption('warn', 'deprecated-source-code') -import os -for key in ['LOGNAME', 'USERNAME', 'USER']: - logname = os.environ.get(key) - if logname: break -ENV = {'PATH' : os.environ['PATH'], - 'LOGNAME' : logname} -def cat(env, source, target): - target = str(target[0]) - f = open(target, "wb") - for src in source: - f.write(open(str(src), "rb").read()) - f.close() -DefaultEnvironment()['ENV'] = ENV -DefaultEnvironment()['RCS_COFLAGS'] = '-l' -env = Environment(ENV=ENV, BUILDERS={'Cat':Builder(action=cat)}) -env.Cat('aaa.out', 'aaa.in') -env.Cat('bbb.out', 'bbb.in') -env.Cat('ccc.out', 'ccc.in') -env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out']) -SConscript('sub/SConscript', "env") -""") - -test.write('bbb.in', "checked-out bbb.in\n") - -test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n") - -read_str = """\ -co -l %(sub_SConscript)s -""" % locals() - -build_str = """\ -co -l aaa.in -cat(["aaa.out"], ["aaa.in"]) -cat(["bbb.out"], ["bbb.in"]) -co -l ccc.in -cat(["ccc.out"], ["ccc.in"]) -cat(["all"], ["aaa.out", "bbb.out", "ccc.out"]) -co -l %(sub_ddd_in)s -cat(["%(sub_ddd_out)s"], ["%(sub_ddd_in)s"]) -cat(["%(sub_eee_out)s"], ["%(sub_eee_in)s"]) -co -l %(sub_fff_in)s -cat(["%(sub_fff_out)s"], ["%(sub_fff_in)s"]) -cat(["%(sub_all)s"], ["%(sub_ddd_out)s", "%(sub_eee_out)s", "%(sub_fff_out)s"]) -""" % locals() - -stdout = test.wrap_stdout(read_str = read_str, build_str = build_str) - -stderr = """\ -%(sub_RCS)s/SConscript,v --> %(sub_SConscript)s -revision 1.1 (locked) -done -RCS/aaa.in,v --> aaa.in -revision 1.1 (locked) -done -RCS/ccc.in,v --> ccc.in -revision 1.1 (locked) -done -%(sub_RCS)s/ddd.in,v --> %(sub_ddd_in)s -revision 1.1 (locked) -done -%(sub_RCS)s/fff.in,v --> %(sub_fff_in)s -revision 1.1 (locked) -done -""" % locals() - -test.run(arguments = '.', stdout = stdout, stderr = stderr) - -# Checking things back out of RCS apparently messes with the line -# endings, so read the result files in non-binary mode. - -test.must_match('all', - "aaa.in\nchecked-out bbb.in\nccc.in\n", - mode='r') - -test.must_match(['sub', 'all'], - "sub/ddd.in\nchecked-out sub/eee.in\nsub/fff.in\n", - mode='r') - -test.must_be_writable(test.workpath('sub', 'SConscript')) -test.must_be_writable(test.workpath('aaa.in')) -test.must_be_writable(test.workpath('ccc.in')) -test.must_be_writable(test.workpath('sub', 'ddd.in')) -test.must_be_writable(test.workpath('sub', 'fff.in')) - - -test.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: |