From 855895b97fa7f9d67dfcc41140efbe55bf98f291 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Tue, 30 Jul 2002 01:59:06 +0000 Subject: Add more Repository tests (and clean up multi-dir.py). --- test/Repository/Program.py | 238 ++++++++++++++++++++++++++++++++------ test/Repository/SConscript.py | 104 +++++++++++++++++ test/Repository/absolute-path.py | 103 +++++++++++++++++ test/Repository/multi-dir.py | 3 +- test/Repository/top-level-path.py | 102 ++++++++++++++++ 5 files changed, 515 insertions(+), 35 deletions(-) create mode 100644 test/Repository/SConscript.py create mode 100644 test/Repository/absolute-path.py create mode 100644 test/Repository/top-level-path.py diff --git a/test/Repository/Program.py b/test/Repository/Program.py index c3eff53..03fc78f 100644 --- a/test/Repository/Program.py +++ b/test/Repository/Program.py @@ -34,14 +34,17 @@ else: test = TestSCons.TestSCons() -test.subdir('repository', 'work') + + +# First, test a single repository. +test.subdir('repository', 'work1') repository = test.workpath('repository') repository_foo_c = test.workpath('repository', 'foo.c') -work_foo = test.workpath('work', 'foo' + _exe) -work_foo_c = test.workpath('work', 'foo.c') +work1_foo = test.workpath('work1', 'foo' + _exe) +work1_foo_c = test.workpath('work1', 'foo.c') -test.write(['work', 'SConstruct'], r""" +test.write(['work1', 'SConstruct'], r""" Repository(r'%s') env = Environment() env.Program(target= 'foo', source = Split('aaa.c bbb.c foo.c')) @@ -81,43 +84,43 @@ main(int argc, char *argv[]) # if we try to write into it accidentally. test.writable('repository', 0) -test.run(chdir = 'work', arguments = '.') +test.run(chdir = 'work1', arguments = '.') -test.run(program = work_foo, stdout = """repository/aaa.c +test.run(program = work1_foo, stdout = """repository/aaa.c repository/bbb.c repository/foo.c """) -test.up_to_date(chdir = 'work', arguments = '.') +test.up_to_date(chdir = 'work1', arguments = '.') # -test.write(['work', 'bbb.c'], r""" +test.write(['work1', 'bbb.c'], r""" void bbb(void) { - printf("work/bbb.c\n"); + printf("work1/bbb.c\n"); } """) -test.run(chdir = 'work', arguments = '.') +test.run(chdir = 'work1', arguments = '.') -test.run(program = work_foo, stdout = """repository/aaa.c -work/bbb.c +test.run(program = work1_foo, stdout = """repository/aaa.c +work1/bbb.c repository/foo.c """) -test.up_to_date(chdir = 'work', arguments = '.') +test.up_to_date(chdir = 'work1', arguments = '.') # -test.write(['work', 'aaa.c'], r""" +test.write(['work1', 'aaa.c'], r""" void aaa(void) { - printf("work/aaa.c\n"); + printf("work1/aaa.c\n"); } """) -test.write(['work', 'foo.c'], r""" +test.write(['work1', 'foo.c'], r""" extern void aaa(void); extern void bbb(void); int @@ -126,44 +129,213 @@ main(int argc, char *argv[]) argv[argc++] = "--"; aaa(); bbb(); - printf("work/foo.c\n"); + printf("work1/foo.c\n"); exit (0); } """) -test.run(chdir = 'work', arguments = '.') +test.run(chdir = 'work1', arguments = '.') -test.run(program = work_foo, stdout = """work/aaa.c -work/bbb.c -work/foo.c +test.run(program = work1_foo, stdout = """work1/aaa.c +work1/bbb.c +work1/foo.c """) -test.up_to_date(chdir = 'work', arguments = '.') +test.up_to_date(chdir = 'work1', arguments = '.') # -test.unlink(['work', 'aaa.c']) +test.unlink(['work1', 'aaa.c']) -test.run(chdir = 'work', arguments = '.') +test.run(chdir = 'work1', arguments = '.') -test.run(program = work_foo, stdout = """repository/aaa.c -work/bbb.c -work/foo.c +test.run(program = work1_foo, stdout = """repository/aaa.c +work1/bbb.c +work1/foo.c """) -test.up_to_date(chdir = 'work', arguments = '.') +test.up_to_date(chdir = 'work1', arguments = '.') # -test.unlink(['work', 'bbb.c']) -test.unlink(['work', 'foo.c']) +test.unlink(['work1', 'bbb.c']) +test.unlink(['work1', 'foo.c']) -test.run(chdir = 'work', arguments = '.') +test.run(chdir = 'work1', arguments = '.') -test.run(program = work_foo, stdout = """repository/aaa.c +test.run(program = work1_foo, stdout = """repository/aaa.c repository/bbb.c repository/foo.c """) -test.up_to_date(chdir = 'work', arguments = '.') +test.up_to_date(chdir = 'work1', arguments = '.') + + + +# Now, test multiple repositories. +test.subdir('repository.new', 'repository.old', 'work2') + +repository_new = test.workpath('repository.new') +repository_old = test.workpath('repository.old') +work2_foo = test.workpath('work2', 'foo' + _exe) + +test.write(['work2', 'SConstruct'], r""" +Repository(r'%s') +Repository(r'%s') +env = Environment() +env.Program(target= 'foo', source = Split('aaa.c bbb.c foo.c')) +""" % (repository_new, repository_old)) + +test.write(['repository.old', 'aaa.c'], r""" +void +aaa(void) +{ + printf("repository.old/aaa.c\n"); +} +""") + +test.write(['repository.old', 'bbb.c'], r""" +void +bbb(void) +{ + printf("repository.old/bbb.c\n"); +} +""") + +test.write(['repository.old', 'foo.c'], r""" +extern void aaa(void); +extern void bbb(void); +int +main(int argc, char *argv[]) +{ + argv[argc++] = "--"; + aaa(); + bbb(); + printf("repository.old/foo.c\n"); + exit (0); +} +""") + +# Make both repositories non-writable, so we'll detect +# if we try to write into it accidentally. +test.writable('repository.new', 0) +test.writable('repository.old', 0) + +test.run(chdir = 'work2', arguments = '.') + +test.run(program = work2_foo, stdout = """repository.old/aaa.c +repository.old/bbb.c +repository.old/foo.c +""") + +test.up_to_date(chdir = 'work2', arguments = '.') + +# +test.writable('repository.new', 1) + +test.write(['repository.new', 'aaa.c'], r""" +void +aaa(void) +{ + printf("repository.new/aaa.c\n"); +} +""") + +test.write(['work2', 'bbb.c'], r""" +void +bbb(void) +{ + printf("work2/bbb.c\n"); +} +""") + +# +test.writable('repository.new', 0) + +test.run(chdir = 'work2', arguments = '.') + +test.run(program = work2_foo, stdout = """repository.new/aaa.c +work2/bbb.c +repository.old/foo.c +""") + +test.up_to_date(chdir = 'work2', arguments = '.') + +# +test.write(['work2', 'aaa.c'], r""" +void +aaa(void) +{ + printf("work2/aaa.c\n"); +} +""") + +test.write(['work2', 'foo.c'], r""" +extern void aaa(void); +extern void bbb(void); +int +main(int argc, char *argv[]) +{ + argv[argc++] = "--"; + aaa(); + bbb(); + printf("work2/foo.c\n"); + exit (0); +} +""") + +# +test.run(chdir = 'work2', arguments = '.') + +test.run(program = work2_foo, stdout = """work2/aaa.c +work2/bbb.c +work2/foo.c +""") + +test.up_to_date(chdir = 'work2', arguments = '.') + +# +test.unlink(['work2', 'aaa.c']) +test.unlink(['work2', 'bbb.c']) + +# +test.run(chdir = 'work2', arguments = '.') + +test.run(program = work2_foo, stdout = """repository.new/aaa.c +repository.old/bbb.c +work2/foo.c +""") + +test.up_to_date(chdir = 'work2', arguments = '.') + +# +test.unlink(['work2', 'foo.c']) + +# +test.run(chdir = 'work2', arguments = '.') + +test.run(program = work2_foo, stdout = """repository.new/aaa.c +repository.old/bbb.c +repository.old/foo.c +""") + +test.up_to_date(chdir = 'work2', arguments = '.') + +# +test.writable('repository.new', 1) + +test.unlink(['repository.new', 'aaa.c']) + +test.writable('repository.new', 0) + +# +test.run(chdir = 'work2', arguments = '.') + +test.run(program = work2_foo, stdout = """repository.old/aaa.c +repository.old/bbb.c +repository.old/foo.c +""") + +test.up_to_date(chdir = 'work2', arguments = '.') + # test.pass_test() diff --git a/test/Repository/SConscript.py b/test/Repository/SConscript.py new file mode 100644 index 0000000..2a30590 --- /dev/null +++ b/test/Repository/SConscript.py @@ -0,0 +1,104 @@ +#!/usr/bin/env python +# +# Copyright (c) 2001, 2002 Steven Knight +# +# 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 sys +import TestSCons + +if sys.platform == 'win32': + _exe = '.exe' +else: + _exe = '' + +test = TestSCons.TestSCons() + +# +test.subdir('work', + ['work', 'src'], + 'repository', + ['repository', 'src']) + +# +workpath_repository = test.workpath('repository') +work_src_foo = test.workpath('work', 'src', 'foo' + _exe) + +# +test.write(['work', 'SConstruct'], """ +Repository(r'%s') +SConscript('src/SConscript') +""" % workpath_repository) + +test.write(['repository', 'src', 'SConscript'], """ +env = Environment() +env.Program(target = 'foo', source = ['aaa.c', 'bbb.c', 'main.c']) +""") + +test.write(['repository', 'src', 'aaa.c'], r""" +void +aaa(void) +{ + printf("repository/src/aaa.c\n"); +} +""") + +test.write(['repository', 'src', 'bbb.c'], r""" +void +bbb(void) +{ + printf("repository/src/bbb.c\n"); +} +""") + +test.write(['repository', 'src', 'main.c'], r""" +extern void aaa(void); +extern void bbb(void); + +int +main(int argc, char *argv[]) +{ + argv[argc++] = "--"; + aaa(); + bbb(); + printf("repository/src/main.c\n"); + exit (0); +} +""") + +# Make the repository non-writable, +# so we'll detect if we try to write into it accidentally. +test.writable('repository', 0) + +test.run(chdir = 'work', arguments = ".") + +test.run(program = work_src_foo, stdout = +"""repository/src/aaa.c +repository/src/bbb.c +repository/src/main.c +""") + +test.up_to_date(chdir = 'work', arguments = ".") + +# +test.pass_test() diff --git a/test/Repository/absolute-path.py b/test/Repository/absolute-path.py new file mode 100644 index 0000000..ad392f0 --- /dev/null +++ b/test/Repository/absolute-path.py @@ -0,0 +1,103 @@ +#!/usr/bin/env python +# +# Copyright (c) 2001, 2002 Steven Knight +# +# 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.path +import sys +import TestSCons + +if sys.platform == 'win32': + _exe = '.exe' +else: + _exe = '' + +test = TestSCons.TestSCons() + +test.subdir('repository', + ['repository', 'src'], + 'subdir', + 'work') + +src_SConscript = os.path.join('src', 'SConscript') +subdir_aaa_c = test.workpath('subdir', 'aaa.c') +work_src_foo = test.workpath('work', 'src', 'foo' + _exe) + +opts = "-Y " + test.workpath('repository') + +# +test.write(['repository', 'SConstruct'], r""" +SConscript(r'%s') +""" % src_SConscript) + +test.write(['repository', 'src', 'SConscript'], r""" +env = Environment() +env.Program('foo', ['aaa.c', r'%s', 'foo.c']) +""" % subdir_aaa_c) + +test.write(['repository', 'src', 'aaa.c'], r""" +void +src_aaa(void) +{ + printf("repository/src/aaa.c\n"); +} +""") + +test.write(['subdir', 'aaa.c'], r""" +void +subdir_aaa(void) +{ + printf("subdir/aaa.c\n"); +} +""") + +test.write(['repository', 'src', 'foo.c'], r""" +extern void src_aaa(void); +extern void subdir_aaa(void); +int +main(int argc, char *argv[]) +{ + argv[argc++] = "--"; + src_aaa(); + subdir_aaa(); + printf("repository/src/foo.c\n"); + exit (0); +} +""") + +# Make the entire repository non-writable, so we'll detect +# if we try to write into it accidentally. +test.writable('repository', 0) + +test.run(chdir = 'work', options = opts, arguments = '.') + +test.run(program = work_src_foo, stdout = """repository/src/aaa.c +subdir/aaa.c +repository/src/foo.c +""") + +test.up_to_date(chdir = 'work', options = opts, arguments = '.') + +# +test.pass_test() diff --git a/test/Repository/multi-dir.py b/test/Repository/multi-dir.py index a588814..fb8c0e6 100644 --- a/test/Repository/multi-dir.py +++ b/test/Repository/multi-dir.py @@ -95,7 +95,7 @@ repository/src/main.c """) # Double-check that the Repository is up-to-date. -#test.up_to_date(chdir = 'repository', arguments = ".") +test.up_to_date(chdir = 'repository', arguments = ".") # Make the repository non-writable, # so we'll detect if we try to write into it accidentally. @@ -143,4 +143,3 @@ repository/src/main.c # test.pass_test() -__END__ diff --git a/test/Repository/top-level-path.py b/test/Repository/top-level-path.py new file mode 100644 index 0000000..f46c3da --- /dev/null +++ b/test/Repository/top-level-path.py @@ -0,0 +1,102 @@ +#!/usr/bin/env python +# +# Copyright (c) 2001, 2002 Steven Knight +# +# 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.path +import sys +import TestSCons + +if sys.platform == 'win32': + _exe = '.exe' +else: + _exe = '' + +test = TestSCons.TestSCons() + +test.subdir('repository', + ['repository', 'src'], + ['repository', 'subdir'], + 'work') + +src_SConscript = os.path.join('src', 'SConscript') +work_src_foo = test.workpath('work', 'src', 'foo' + _exe) + +opts = "-Y " + test.workpath('repository') + +# +test.write(['repository', 'SConstruct'], r""" +SConscript(r'%s') +""" % src_SConscript) + +test.write(['repository', 'src', 'SConscript'], r""" +env = Environment() +env.Program('foo', ['aaa.c', '#subdir/aaa.c', 'foo.c']) +""") + +test.write(['repository', 'src', 'aaa.c'], r""" +void +src_aaa(void) +{ + printf("repository/src/aaa.c\n"); +} +""") + +test.write(['repository', 'subdir', 'aaa.c'], r""" +void +subdir_aaa(void) +{ + printf("repository/subdir/aaa.c\n"); +} +""") + +test.write(['repository', 'src', 'foo.c'], r""" +extern void src_aaa(void); +extern void subdir_aaa(void); +int +main(int argc, char *argv[]) +{ + argv[argc++] = "--"; + src_aaa(); + subdir_aaa(); + printf("repository/src/foo.c\n"); + exit (0); +} +""") + +# Make the entire repository non-writable, so we'll detect +# if we try to write into it accidentally. +test.writable('repository', 0) + +test.run(chdir = 'work', options = opts, arguments = '.') + +test.run(program = work_src_foo, stdout = """repository/src/aaa.c +repository/subdir/aaa.c +repository/src/foo.c +""") + +test.up_to_date(chdir = 'work', options = opts, arguments = '.') + +# +test.pass_test() -- cgit v0.12