From: stevenknight Date: Tue, 30 Jul 2002 21:56:44 +0000 (+0000) Subject: Still more Repository tests: CPPPATH, StaticLibrary, linking objects, and compilatio... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b5233b2446fdad9799e632556fd448557a26c0bb;p=scons.git Still more Repository tests: CPPPATH, StaticLibrary, linking objects, and compilation within a Repository. git-svn-id: http://scons.tigris.org/svn/scons/trunk@424 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- diff --git a/test/Repository/CPPPATH.py b/test/Repository/CPPPATH.py new file mode 100644 index 00000000..cdb5cd70 --- /dev/null +++ b/test/Repository/CPPPATH.py @@ -0,0 +1,95 @@ +#!/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('repository', + ['repository', 'include1'], + ['repository', 'include2'], + 'work') + +work_foo = test.workpath('work', 'foo') + +opts = '-Y ' + test.workpath('repository') + +# +test.write(['repository', 'include1', 'foo.h'], r""" +#define STRING "repository/include1/foo.h" +""") + +test.write(['repository', 'include2', 'foo.h'], r""" +#define STRING "repository/include2/foo.h" +""") + +test.write(['repository', 'foo.c'], r""" +#include +int +main(int argc, char *argv[]) +{ + argv[argc++] = "--"; + printf("%s\n", STRING); + 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.write(['work', 'SConstruct'], """ +env = Environment(CPPPATH = ['include1', 'include2']) +env.Program(target = 'foo', source = 'foo.c') +""") + +test.run(chdir = 'work', options = opts, arguments = '.') + +test.run(program = work_foo, stdout = "repository/include1/foo.h\n") + +test.up_to_date(chdir = 'work', options = opts, arguments = '.') + +# +test.write(['work', 'SConstruct'], """ +env = Environment(CPPPATH = ['include2', 'include1']) +env.Program(target = 'foo', source = 'foo.c') +""") + +test.run(chdir = 'work', options = opts, arguments = '.') + +test.run(program = work_foo, stdout = "repository/include2/foo.h\n") + +test.up_to_date(chdir = 'work', options = opts, arguments = '.') + +# +test.pass_test() diff --git a/test/Repository/StaticLibrary.py b/test/Repository/StaticLibrary.py new file mode 100644 index 00000000..3861ce9d --- /dev/null +++ b/test/Repository/StaticLibrary.py @@ -0,0 +1,216 @@ +#!/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': + _obj = '.obj' + _exe = '.exe' +else: + _obj = '.o' + _exe = '' + + + +test = TestSCons.TestSCons() + +# +test.subdir('repository', 'work1', 'work2', 'work3') + +# +workpath_repository = test.workpath('repository') +repository_aaa_obj = test.workpath('repository', 'aaa' + _obj) +repository_bbb_obj = test.workpath('repository', 'bbb' + _obj) +repository_foo_obj = test.workpath('repository', 'foo' + _obj) +repository_foo = test.workpath('repository', 'foo' + _exe) +work1_foo = test.workpath('work1', 'foo' + _exe) +work2_aaa_obj = test.workpath('work2', 'aaa' + _obj) +work2_foo_obj = test.workpath('work2', 'foo' + _obj) +work2_foo = test.workpath('work2', 'foo' + _exe) +work3_aaa_obj = test.workpath('work3', 'aaa' + _obj) +work3_bbb_obj = test.workpath('work3', 'bbb' + _obj) +work3_foo = test.workpath('work3', 'foo' + _exe) + +opts = '-Y ' + workpath_repository + +# +test.write(['repository', 'SConstruct'], """ +env = Environment(LIBS = ['xxx'], LIBPATH = '.') +env.Library(target = 'xxx', source = ['aaa.c', 'bbb.c']) +env.Program(target = 'foo', source = 'foo.c') +""") + +test.write(['repository', 'aaa.c'], r""" +void +aaa(void) +{ + printf("repository/aaa.c\n"); +} +""") + +test.write(['repository', 'bbb.c'], r""" +void +bbb(void) +{ + printf("repository/bbb.c\n"); +} +""") + +test.write(['repository', 'foo.c'], r""" +extern void aaa(void); +extern void bbb(void); +int +main(int argc, char *argv[]) +{ + argv[argc++] = "--"; + aaa(); + bbb(); + printf("repository/foo.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 = 'work1', options = opts, arguments = ".") + +test.run(program = work1_foo, stdout = +"""repository/aaa.c +repository/bbb.c +repository/foo.c +""") + +test.fail_test(os.path.exists(repository_aaa_obj)) +test.fail_test(os.path.exists(repository_bbb_obj)) +test.fail_test(os.path.exists(repository_foo_obj)) +test.fail_test(os.path.exists(repository_foo)) + +test.up_to_date(chdir = 'work1', options = opts, arguments = ".") + +test.write(['work1', 'bbb.c'], """ +void +bbb(void) +{ + printf("work1/bbb.c\n"); +} +""") + +test.run(chdir = 'work1', options = opts, arguments = ".") + +test.run(program = work1_foo, stdout = +"""repository/aaa.c +work1/bbb.c +repository/foo.c +""") + +test.fail_test(os.path.exists(repository_aaa_obj)) +test.fail_test(os.path.exists(repository_bbb_obj)) +test.fail_test(os.path.exists(repository_foo_obj)) +test.fail_test(os.path.exists(repository_foo)) + +test.up_to_date(chdir = 'work1', options = opts, arguments = ".") + +# +test.writable('repository', 1) + +test.run(chdir = 'repository', options = opts, arguments = ".") + +test.run(program = repository_foo, stdout = +"""repository/aaa.c +repository/bbb.c +repository/foo.c +""") + +test.fail_test(not os.path.exists(repository_aaa_obj)) +test.fail_test(not os.path.exists(repository_bbb_obj)) +test.fail_test(not os.path.exists(repository_foo_obj)) + +test.up_to_date(chdir = 'repository', options = opts, arguments = ".") + +# +test.writable('repository', 0) + +# +test.up_to_date(chdir = 'work2', options = opts, arguments = ".") + +test.write(['work2', 'bbb.c'], """ +void +bbb(void) +{ + printf("work2/bbb.c\n"); +} +""") + +test.run(chdir = 'work2', options = opts, arguments = ".") + +test.run(program = work2_foo, stdout = +"""repository/aaa.c +work2/bbb.c +repository/foo.c +""") + +test.fail_test(os.path.exists(work2_aaa_obj)) +test.fail_test(os.path.exists(work2_foo_obj)) + +test.up_to_date(chdir = 'work2', options = opts, arguments = ".") + +# +test.up_to_date(chdir = 'work3', options = opts, arguments = ".") + +test.write(['work3', 'foo.c'], r""" +extern void aaa(void); +extern void bbb(void); +int +main(int argc, char *argv[]) +{ + argv[argc++] = "--"; + aaa(); + bbb(); + printf("work3/foo.c\n"); + exit (0); +} +""") + +test.run(chdir = 'work3', options = opts, arguments = ".") + +test.run(program = work3_foo, stdout = +"""repository/aaa.c +repository/bbb.c +work3/foo.c +""") + +test.fail_test(os.path.exists(work3_aaa_obj)) +test.fail_test(os.path.exists(work3_bbb_obj)) + +test.up_to_date(chdir = 'work3', options = opts, arguments = ".") + +# +test.pass_test() diff --git a/test/Repository/link-object.py b/test/Repository/link-object.py new file mode 100644 index 00000000..af0214e5 --- /dev/null +++ b/test/Repository/link-object.py @@ -0,0 +1,149 @@ +#!/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('repository', 'work') + +# +workpath_repository = test.workpath('repository') +repository_foo = test.workpath('repository', 'foo' + _exe) +work_foo = test.workpath('work', 'foo' + _exe) + +# +test.write(['repository', 'SConstruct'], """ +Repository(r'%s') +env = Environment() +env.Program(target = 'foo', source = ['aaa.c', 'bbb.c', 'foo.c']) +""" % workpath_repository) + +test.write(['repository', 'aaa.c'], r""" +void +aaa(void) +{ + printf("repository/aaa.c\n"); +} +""") + +test.write(['repository', 'bbb.c'], r""" +void +bbb(void) +{ + printf("repository/bbb.c\n"); +} +""") + +test.write(['repository', 'foo.c'], r""" +extern void aaa(void); +extern void bbb(void); +int +main(int argc, char *argv[]) +{ + argv[argc++] = "--"; + aaa(); + bbb(); + printf("repository/foo.c\n"); + exit (0); +} +""") + +# +test.run(chdir = 'repository', arguments = ".") + +test.run(program = repository_foo, stdout = +"""repository/aaa.c +repository/bbb.c +repository/foo.c +""") + +test.up_to_date(chdir = 'repository', arguments = ".") + +# Make the repository non-writable, +# so we'll detect if we try to write into it accidentally. +test.writable('repository', 0) + +# +test.write(['work', 'SConstruct'], """ +Repository(r'%s') +env = Environment() +env.Program(target = 'foo', source = ['aaa.c', 'bbb.c', 'foo.c']) +""" % workpath_repository) + +test.up_to_date(chdir = 'work', arguments = ".") + +# +test.write(['work', 'bbb.c'], """ +void +bbb(void) +{ + printf("work/bbb.c\n"); +} +""") + +# +test.run(chdir = 'work', arguments = ".") + +test.run(program = work_foo, stdout = +"""repository/aaa.c +work/bbb.c +repository/foo.c +""") + +test.up_to_date(chdir = 'work', arguments = ".") + +# +test.unlink(['work', 'bbb.c']) + +# +test.run(chdir = 'work', arguments = ".") + +test.run(program = work_foo, stdout = +"""repository/aaa.c +repository/bbb.c +repository/foo.c +""") + +test.up_to_date(chdir = 'work', arguments = ".") + +# +test.writable('repository', 1) + +# +test.up_to_date(chdir = 'repository', arguments = ".") + +# +test.pass_test() diff --git a/test/Repository/multi-dir.py b/test/Repository/multi-dir.py index fb8c0e66..9aa2bca1 100644 --- a/test/Repository/multi-dir.py +++ b/test/Repository/multi-dir.py @@ -85,26 +85,19 @@ main(int argc, char *argv[]) } """) -# -test.run(chdir = 'repository', arguments = ".") +# Make the repository non-writable, +# so we'll detect if we try to write into it accidentally. +test.writable('repository', 0) -test.run(program = repository_src_xxx, stdout = +test.run(chdir = 'work', options = opts, arguments = ".") + +test.run(program = work_src_xxx, stdout = """repository/include/my_string.h repository/src/include.h repository/src/main.c """) -# Double-check that the Repository is up-to-date. -test.up_to_date(chdir = 'repository', arguments = ".") - -# Make the repository non-writable, -# so we'll detect if we try to write into it accidentally. -test.writable('repository', 0) - -# Because the Repository is completely up-to-date, -# a build in an empty work directory should also be up-to-date. -test.up_to_date(chdir = 'work', options = opts, arguments = ".") - +# test.write(['work', 'include', 'my_string.h'], r""" #define MY_STRING "work/include/my_string.h" """) diff --git a/test/Repository/within-repository.py b/test/Repository/within-repository.py new file mode 100644 index 00000000..6b9f0866 --- /dev/null +++ b/test/Repository/within-repository.py @@ -0,0 +1,139 @@ +#!/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('repository', ['repository', 'src']) + +# +workpath_repository = test.workpath('repository') +repository_foo = test.workpath('repository', 'foo' + _exe) +repository_src_bar = test.workpath('repository', 'src', 'bar' + _exe) + +# +test.write(['repository', 'SConstruct'], """ +Repository(r'%s') +SConscript('src/SConscript') +env = Environment() +env.Program(target = 'foo', source = ['aaa.c', 'bbb.c', 'foo.c']) +""" % workpath_repository) + +test.write(['repository', 'aaa.c'], r""" +void +aaa(void) +{ + printf("repository/aaa.c\n"); +} +""") + +test.write(['repository', 'bbb.c'], r""" +void +bbb(void) +{ + printf("repository/bbb.c\n"); +} +""") + +test.write(['repository', 'foo.c'], r""" +extern void aaa(void); +extern void bbb(void); +int +main(int argc, char *argv[]) +{ + argv[argc++] = "--"; + aaa(); + bbb(); + printf("repository/foo.c\n"); + exit (0); +} +""") + +test.write(['repository', 'src', 'SConscript'], """ +env = Environment() +env.Program(target = 'bar', source = ['aaa.c', 'bbb.c', 'bar.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', 'bar.c'], r""" +extern void aaa(void); +extern void bbb(void); +int +main(int argc, char *argv[]) +{ + argv[argc++] = "--"; + aaa(); + bbb(); + printf("repository/src/bar.c\n"); + exit (0); +} +""") + +# +test.run(chdir = 'repository', arguments = ".") + +test.run(program = repository_foo, stdout = +"""repository/aaa.c +repository/bbb.c +repository/foo.c +""") + +test.run(program = repository_src_bar, stdout = +"""repository/src/aaa.c +repository/src/bbb.c +repository/src/bar.c +""") + +# +test.up_to_date(chdir = 'repository', arguments = ".") + +# +test.pass_test()