diff options
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | test/Libs/SharedLibrary-update-deps.py | 57 | ||||
| -rw-r--r-- | test/Libs/bug2909/SConstruct | 3 | ||||
| -rw-r--r-- | test/Libs/bug2909/SConstruct-libs | 3 | ||||
| -rw-r--r-- | test/Libs/bug2909/lib.c | 1 | ||||
| -rw-r--r-- | test/Libs/bug2909/main.c | 3 |
6 files changed, 70 insertions, 0 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 1e91144..9fa8985 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -6,6 +6,9 @@ RELEASE 2.3.1.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE + From Alexandre Feblot: + - Make sure SharedLibrary depends on all dependent libs (by depending on SHLINKCOM) + From Stefan Sperling: - Fixed the setup of linker flags for a versioned SharedLibrary under OpenBSD (#2916). diff --git a/test/Libs/SharedLibrary-update-deps.py b/test/Libs/SharedLibrary-update-deps.py new file mode 100644 index 0000000..24c5262 --- /dev/null +++ b/test/Libs/SharedLibrary-update-deps.py @@ -0,0 +1,57 @@ +#!/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 SharedLibrary() updates when a different lib is linked, even if it has the same md5. +This is Tigris bug #2909. +""" + +import os.path +import TestSCons + +test = TestSCons.TestSCons() + +test.dir_fixture( "bug2909" ) + +# Build the sub-libs (don't care about details of this) +test.run(arguments='-f SConstruct-libs') +# This should build the main lib, using libfoo.so +test.run(arguments='libname=foo') +# This should rebuild the main lib, using libbar.so; +# it should NOT say it's already up to date. +test.run(arguments='libname=bar') +test.must_not_contain_any_line(test.stdout(), ["is up to date"]) +# Try it again, in reverse, to make sure: +test.run(arguments='libname=foo') +test.must_not_contain_any_line(test.stdout(), ["is up to date"]) + +test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/Libs/bug2909/SConstruct b/test/Libs/bug2909/SConstruct new file mode 100644 index 0000000..2c5440b --- /dev/null +++ b/test/Libs/bug2909/SConstruct @@ -0,0 +1,3 @@ +env=Environment() +libname=ARGUMENTS.get('libname', 'foo') +env.SharedLibrary('myshared', ['main.c'], LIBS=[libname], LIBPATH='.')
\ No newline at end of file diff --git a/test/Libs/bug2909/SConstruct-libs b/test/Libs/bug2909/SConstruct-libs new file mode 100644 index 0000000..3f59f9c --- /dev/null +++ b/test/Libs/bug2909/SConstruct-libs @@ -0,0 +1,3 @@ +env=Environment() +libfoo = env.SharedLibrary('foo', 'lib.c') +env.InstallAs('${SHLIBPREFIX}bar${SHLIBSUFFIX}', libfoo)
\ No newline at end of file diff --git a/test/Libs/bug2909/lib.c b/test/Libs/bug2909/lib.c new file mode 100644 index 0000000..048f715 --- /dev/null +++ b/test/Libs/bug2909/lib.c @@ -0,0 +1 @@ +int i; diff --git a/test/Libs/bug2909/main.c b/test/Libs/bug2909/main.c new file mode 100644 index 0000000..3fe7d49 --- /dev/null +++ b/test/Libs/bug2909/main.c @@ -0,0 +1,3 @@ +void func() +{ +} |