Merged scons/scons into default

5 files changed, 757 insertions, 102 deletions

diff --git a/test/LINK/SHLIBVERSIONFLAGS.py b/test/LINK/SHLIBVERSIONFLAGS.py
new file mode 100644
index 0000000..d8fd2e6
--- /dev/null
+++ b/test/LINK/SHLIBVERSIONFLAGS.py
@@ -0,0 +1,59 @@
+#!/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__"
+
+import os
+import re
+
+import TestSCons
+import SCons.Platform
+import SCons.Defaults
+
+linkers = [ 'gnulink', 'cyglink', 'sunlink' ]
+
+foo_c_src = "void foo() {}\n"
+
+env = SCons.Defaults.DefaultEnvironment()
+platform = SCons.Platform.platform_default()
+tool_list = SCons.Platform.DefaultToolList(platform, env)
+
+test = TestSCons.TestSCons()
+test.write('foo.c', foo_c_src)
+test.write('SConstruct', "SharedLibrary('foo','foo.c',SHLIBVERSION='1.2.3')\n")
+
+if 'gnulink' in tool_list:
+    test.run(stdout = r".+ -Wl,-Bsymbolic -Wl,-soname=libfoo.so.1( .+)+", match = TestSCons.match_re_dotall)
+    test.run(arguments = ['-c'])
+elif 'sunlink' in tool_list:
+    test.run(stdout = r".+ -h libfoo.so.1( .+)+", match = TestSCons.match_re_dotall)
+    test.run(arguments = ['-c'])
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/VersionedLib-VariantDir.py b/test/LINK/VersionedLib-VariantDir.py
new file mode 100644
index 0000000..0a631b0
--- /dev/null
+++ b/test/LINK/VersionedLib-VariantDir.py
@@ -0,0 +1,168 @@
+#!/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__"
+
+"""
+Ensure that SharedLibrary builder with SHLIBVERSION set works with VariantDir.
+"""
+
+import TestSCons
+import os
+import sys
+
+import SCons.Platform
+import SCons.Defaults
+
+env = SCons.Defaults.DefaultEnvironment()
+platform = SCons.Platform.platform_default()
+tool_list = SCons.Platform.DefaultToolList(platform, env)
+
+test = TestSCons.TestSCons()
+
+test.subdir(['src'])
+test.subdir(['src','lib'])
+test.subdir(['src','bin'])
+
+test.write(['src','lib','foo.c'], """
+#if _WIN32
+__declspec(dllexport)
+#endif
+int foo() { return 0; }
+""")
+
+test.write(['src','bin','main.c'], """
+#if _WIN32
+__declspec(dllimport)
+#endif
+int foo();
+int main()
+{
+  return foo();
+}
+""")
+
+test.write('SConstruct', """
+env = Environment()
+variant = { 'variant_dir' : 'build',
+            'src_dir'     : 'src',
+            'duplicate'   : 0,
+            'exports'     : { 'env' : env } }
+SConscript('src/lib/SConscript', **variant)
+SConscript('src/bin/SConscript', **variant)
+""")
+
+test.write(['src','lib','SConscript'], """
+Import('env')
+env.SharedLibrary('foo', 'foo.c', SHLIBVERSION = '0.1.2')
+""" )
+
+test.write(['src','bin','SConscript'], """
+Import('env')
+env.Program('main.c', LIBS=['foo'], LIBPATH=['../lib'])
+""")
+
+test.run(arguments = ['--tree=all'])
+
+if platform == 'cygwin' or platform == 'win32':
+    # PATH is used to search for *.dll libraries on windows
+    path = os.environ.get('PATH','')
+    if path: path = path + os.pathsep
+    path = path + test.workpath('build/lib')
+    os.environ['PATH'] = path
+
+if os.name == 'posix':
+    os.environ['LD_LIBRARY_PATH'] = test.workpath('build/lib')
+if sys.platform.find('irix') != -1:
+    os.environ['LD_LIBRARYN32_PATH'] = test.workpath('build/lib')
+
+test.run(program = test.workpath('build/bin/main'))
+
+if 'gnulink' in tool_list:
+    # All (?) the files we expect will get created in the current directory
+    files = [
+    'libfoo.so',
+    'libfoo.so.0',
+    'libfoo.so.0.1.2',
+    ]
+    obj = 'foo.os'
+elif 'applelink' in tool_list:
+    # All (?) the files we expect will get created in the current directory
+    files = [
+    'libfoo.dylib',
+    'libfoo.0.1.2.dylib',
+    ]
+    obj = 'foo.os'
+elif 'cyglink' in tool_list:
+    # All (?) the files we expect will get created in the current directory
+    files = [
+    'cygfoo-0-1-2.dll',
+    'libfoo-0-1-2.dll.a',
+    'libfoo.dll.a',
+    ]
+    obj = 'foo.os'
+elif 'mslink' in tool_list:
+    # All (?) the files we expect will get created in the current directory
+    files = [
+    'foo.dll',
+    'foo.lib',
+    ]
+    obj = 'foo.obj'
+elif 'sunlink' in tool_list:
+    # All (?) the files we expect will get created in the current directory
+    files = [
+    'libfoo.so',
+    'libfoo.so.0',
+    'libfoo.so.0.1.2',
+    ]
+    obj = 'so_foo.os'
+else:
+    # All (?) the files we expect will get created in the current directory
+    files= [
+    'libfoo.so',
+    ]
+    obj = 'foo.os'
+
+test.must_exist([ 'build', 'lib', obj ])
+for f in files:
+    test.must_exist([ 'build', 'lib', f ])
+
+test.run(arguments = ['-c'])
+
+test.must_not_exist([ 'build', 'lib', obj ])
+for f in files:
+    test.must_not_exist([ 'build', 'lib', f ])
+
+test.must_exist(['src', 'lib', 'foo.c'])
+test.must_exist(['SConstruct'])
+test.must_exist(['src', 'lib', 'SConscript'])
+test.must_exist(['src', 'bin', 'SConscript'])
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/VersionedLib-j2.py b/test/LINK/VersionedLib-j2.py
new file mode 100644
index 0000000..249b54f
--- /dev/null
+++ b/test/LINK/VersionedLib-j2.py
@@ -0,0 +1,146 @@
+#!/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__"
+
+"""
+Ensure that SharedLibrary builder works with SHLIBVERSION and -j2.
+This is regression test for:
+http://article.gmane.org/gmane.comp.programming.tools.scons.user/27049
+"""
+
+import TestSCons
+import os
+import sys
+
+import SCons.Platform
+import SCons.Defaults
+
+test = TestSCons.TestSCons()
+
+test.write('foo.c', """
+#if _WIN32
+__declspec(dllexport)
+#endif
+int foo() { return 0; }
+""")
+
+
+test.write('main.c', """
+#if _WIN32
+__declspec(dllimport)
+#endif
+int foo();
+int main() { return foo(); }
+""")
+
+test.write('SConstruct', """
+env = Environment()
+env.AppendUnique(LIBPATH = ['.'])
+env.Program('main.c', LIBS = ['foo'])
+env.SharedLibrary('foo', 'foo.c', SHLIBVERSION = '0.1.2')
+""")
+
+test.run(arguments = ['-j 2', '--tree=all'])
+
+env = SCons.Defaults.DefaultEnvironment()
+platform = SCons.Platform.platform_default()
+tool_list = SCons.Platform.DefaultToolList(platform, env)
+
+if platform == 'cygwin':
+    # PATH is used to search for *.dll librarier (cygfoo-0-2-1.dll in our case)
+    path = os.environ.get('PATH','')
+    if path: path = path + os.pathsep
+    path = path + test.workpath('.')
+    os.environ['PATH'] = path
+
+if os.name == 'posix':
+    os.environ['LD_LIBRARY_PATH'] = test.workpath('.')
+if sys.platform.find('irix') != -1:
+    os.environ['LD_LIBRARYN32_PATH'] = test.workpath('.')
+
+test.run(program = test.workpath('main'))
+
+test.run(arguments = ['-c'])
+
+platform = SCons.Platform.platform_default()
+
+if 'gnulink' in tool_list:
+    # All (?) the files we expect will get created in the current directory
+    files = [
+    'libfoo.so',
+    'libfoo.so.0',
+    'libfoo.so.0.1.2',
+    'foo.os',
+    ]
+elif 'applelink' in tool_list:
+    # All (?) the files we expect will get created in the current directory
+    files = [
+    'libfoo.dylib',
+    'libfoo.0.1.2.dylib',
+    'foo.os',
+    ]
+elif 'cyglink' in tool_list:
+    # All (?) the files we expect will get created in the current directory
+    files = [
+    'cygfoo-0-1-2.dll',
+    'libfoo-0-1-2.dll.a',
+    'libfoo.dll.a',
+    'foo.os',
+    ]
+elif 'mslink' in tool_list:
+    # All (?) the files we expect will get created in the current directory
+    files = [
+    'foo.dll',
+    'foo.lib',
+    'foo.obj',
+    ]
+elif 'sunlink' in tool_list:
+    # All (?) the files we expect will get created in the current directory
+    files = [
+    'libfoo.so',
+    'libfoo.so.0',
+    'libfoo.so.0.1.2',
+    'so_foo.os',
+    ]
+else:
+    # All (?) the files we expect will get created in the current directory
+    files= [
+    'libfoo.so',
+    'foo.os']
+
+for f in files:
+    test.must_not_exist([ f])
+
+test.must_exist(['main.c'])
+test.must_exist(['foo.c'])
+test.must_exist(['SConstruct'])
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/VersionedLib-subdir.py b/test/LINK/VersionedLib-subdir.py
new file mode 100644
index 0000000..a2e141b
--- /dev/null
+++ b/test/LINK/VersionedLib-subdir.py
@@ -0,0 +1,160 @@
+#!/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__"
+
+"""
+Ensure that SharedLibrary builder with SHLIBVERSION='0.1.2' can build its target
+in a subdirectory containing .so.0.1.2 in name. 
+
+This is regression test for issue mentioned in:
+http://thread.gmane.org/gmane.comp.programming.tools.scons.user/27081
+"""
+
+import TestSCons
+import os
+import sys
+
+import SCons.Platform
+import SCons.Defaults
+
+test = TestSCons.TestSCons()
+
+test.write('foo.c', """
+#if _WIN32
+__declspec(dllexport)
+#endif
+int foo() { return 0; }
+""")
+
+test.write('main.c', """
+#if _WIN32
+__declspec(dllimport)
+#endif
+int foo();
+int main()
+{
+  return foo();
+}
+""")
+
+env = SCons.Defaults.DefaultEnvironment()
+platform = SCons.Platform.platform_default()
+tool_list = SCons.Platform.DefaultToolList(platform, env)
+
+if 'applelink' in tool_list:
+    subdir = 'blah.0.1.2.dylib.blah'
+elif 'cyglink' in tool_list:
+    subdir = 'blah-0-1-2.dll.a.blah'
+else:
+    subdir = 'blah.so.0.1.2.blah'
+
+test.write('SConstruct', """
+env = Environment()
+env.AppendUnique(LIBPATH = [ '%s' ])
+env.SharedLibrary('%s/foo', 'foo.c', SHLIBVERSION = '0.1.2')
+env.Program('main.c', LIBS=['foo'])
+""" % (subdir,subdir))
+
+test.run(arguments = ['--tree=all'])
+
+if platform == 'cygwin' or platform == 'win32':
+    # PATH is used to search for *.dll libraries on windows
+    path = os.environ.get('PATH','')
+    if path: path = path + os.pathsep
+    path = path + test.workpath(subdir)
+    os.environ['PATH'] = path
+
+if os.name == 'posix':
+    os.environ['LD_LIBRARY_PATH'] = subdir
+if sys.platform.find('irix') != -1:
+    os.environ['LD_LIBRARYN32_PATH'] = subdir
+
+test.run(program = test.workpath('main'))
+
+if 'gnulink' in tool_list:
+    # All (?) the files we expect will get created in the current directory
+    files = [
+    'libfoo.so',
+    'libfoo.so.0',
+    'libfoo.so.0.1.2',
+    ]
+    obj = 'foo.os'
+elif 'applelink' in tool_list:
+    # All (?) the files we expect will get created in the current directory
+    files = [
+    'libfoo.dylib',
+    'libfoo.0.1.2.dylib',
+    ]
+    obj = 'foo.os'
+elif 'cyglink' in tool_list:
+    # All (?) the files we expect will get created in the current directory
+    files = [
+    'cygfoo-0-1-2.dll',
+    'libfoo-0-1-2.dll.a',
+    'libfoo.dll.a',
+    ]
+    obj = 'foo.os'
+elif 'mslink' in tool_list:
+    # All (?) the files we expect will get created in the current directory
+    files = [
+    'foo.dll',
+    'foo.lib',
+    ]
+    obj = 'foo.obj'
+elif 'sunlink' in tool_list:
+    # All (?) the files we expect will get created in the current directory
+    files = [
+    'libfoo.so',
+    'libfoo.so.0',
+    'libfoo.so.0.1.2',
+    ]
+    obj = 'so_foo.os'
+else:
+    # All (?) the files we expect will get created in the current directory
+    files= [
+    'libfoo.so',
+    ]
+    obj = 'foo.os'
+
+test.must_exist([ obj ])
+for f in files:
+    test.must_exist([ subdir, f ])
+
+test.run(arguments = ['-c'])
+
+test.must_not_exist([ obj ])
+for f in files:
+    test.must_not_exist([ subdir, f ])
+
+test.must_exist(['foo.c'])
+test.must_exist(['SConstruct'])
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/VersionedLib.py b/test/LINK/VersionedLib.py
index a2345d6..3f4a912 100644
--- a/test/LINK/VersionedLib.py
+++ b/test/LINK/VersionedLib.py
@@ -29,131 +29,253 @@ import sys
 import TestSCons

 

 import SCons.Platform

+import SCons.Defaults

 

-_exe = TestSCons._exe

+env = SCons.Defaults.DefaultEnvironment()

+platform = SCons.Platform.platform_default()

+tool_list = SCons.Platform.DefaultToolList(platform, env)

 

-test = TestSCons.TestSCons()

+if 'gnulink' in tool_list:

+    test_plan = [

+      {

+          'libversion' : '2',

+          'files'      : [ 'libtest.so', 'libtest.so.2', 'test.os' ],

+          'instfiles'  : [ 'libtest.so', 'libtest.so.2' ],

+          'symlinks'   : [ ('libtest.so', 'libtest.so.2') ],

+      },

+      {

+          'libversion' : '2.5',

+          'files'      : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.5', 'test.os' ],

+          'instfiles'  : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.5' ],

+          'symlinks'   : [ ('libtest.so', 'libtest.so.2.5'), ('libtest.so.2', 'libtest.so.2.5') ],

+      },

+      {

+          'libversion' : '2.5.4',

+          'files'      : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.5.4', 'test.os' ],

+          'instfiles'  : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.5.4' ],

+          'symlinks'   : [ ('libtest.so', 'libtest.so.2.5.4'), ('libtest.so.2', 'libtest.so.2.5.4') ],

+      },

+      {

+          'libversion' : '2.5.4.7.8',

+          'files'      : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.5.4.7.8', 'test.os' ],

+          'instfiles'  : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.5.4.7.8' ],

+          'symlinks'   : [ ('libtest.so', 'libtest.so.2.5.4.7.8'), ('libtest.so.2', 'libtest.so.2.5.4.7.8') ],

+      },

+      {

+          'libversion' : 'aabf114f',

+          'files'      : [ 'libtest.so', 'libtest.so.aabf114f', 'test.os' ],

+          'instfiles'  : [ 'libtest.so', 'libtest.so.aabf114f' ],

+          'symlinks'   : [ ('libtest.so', 'libtest.so.aabf114f') ],

+      },

+      {

+          'libversion' : '2.dfffa11',

+          'files'      : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.dfffa11', 'test.os' ],

+          'instfiles'  : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.dfffa11' ],

+          'symlinks'   : [ ('libtest.so', 'libtest.so.2.dfffa11'), ('libtest.so.2', 'libtest.so.2.dfffa11') ],

+      },

+    ]

+elif 'applelink' in tool_list:

+    # All (?) the files we expect will get created in the current directory

+    test_plan = [

+      {

+          'libversion' : '2.5.4',

+          'files'      : [ 'libtest.dylib', 'libtest.2.5.4.dylib', 'test.os' ],

+          'instfiles'  : [ 'libtest.dylib', 'libtest.2.5.4.dylib' ],

+          'symlinks'   : [],

+      },

+    ]

+elif 'cyglink' in tool_list:

+    test_plan = [

+      {

+          'libversion' : '2',

+          'files'      : [ 'cygtest-2.dll', 'libtest-2.dll.a', 'libtest.dll.a', 'test.os' ],

+          'instfiles'  : [ 'cygtest-2.dll', 'libtest-2.dll.a', 'libtest.dll.a' ],

+          'symlinks'   : [ ('libtest.dll.a', 'libtest-2.dll.a') ],

+      },

+      {

+          'libversion' : '2.5',

+          'files'      : [ 'cygtest-2-5.dll', 'libtest-2-5.dll.a', 'libtest.dll.a', 'test.os' ],

+          'instfiles'  : [ 'cygtest-2-5.dll', 'libtest-2-5.dll.a', 'libtest.dll.a' ],

+          'symlinks'   : [ ('libtest.dll.a', 'libtest-2-5.dll.a') ],

+      },

+      {

+          'libversion' : '2.5.4',

+          'files'      : [ 'cygtest-2-5-4.dll', 'libtest-2-5-4.dll.a', 'libtest.dll.a', 'test.os' ],

+          'instfiles'  : [ 'cygtest-2-5-4.dll', 'libtest-2-5-4.dll.a', 'libtest.dll.a' ],

+          'symlinks'   : [ ('libtest.dll.a', 'libtest-2-5-4.dll.a') ],

+      },

+      {

+          'libversion' : '2.5.4.7.8',

+          'files'      : [ 'cygtest-2-5-4-7-8.dll', 'libtest-2-5-4-7-8.dll.a', 'libtest.dll.a', 'test.os' ],

+          'instfiles'  : [ 'cygtest-2-5-4-7-8.dll', 'libtest-2-5-4-7-8.dll.a', 'libtest.dll.a' ],

+          'symlinks'   : [ ('libtest.dll.a', 'libtest-2-5-4-7-8.dll.a') ],

+      },

+      {

+          'libversion' : 'aabf114f',

+          'files'      : [ 'cygtest-aabf114f.dll', 'libtest-aabf114f.dll.a', 'libtest.dll.a', 'test.os' ],

+          'instfiles'  : [ 'cygtest-aabf114f.dll', 'libtest-aabf114f.dll.a', 'libtest.dll.a' ],

+          'symlinks'   : [ ('libtest.dll.a', 'libtest-aabf114f.dll.a') ],

+      },

+      {

+          'libversion' : '2.dfffa11',

+          'files'      : [ 'cygtest-2-dfffa11.dll', 'libtest-2-dfffa11.dll.a', 'libtest.dll.a', 'test.os' ],

+          'instfiles'  : [ 'cygtest-2-dfffa11.dll', 'libtest-2-dfffa11.dll.a', 'libtest.dll.a' ],

+          'symlinks'   : [ ('libtest.dll.a', 'libtest-2-dfffa11.dll.a') ],

+      },

+    ]

+elif 'mslink' in tool_list:

+    test_plan = [

+        {

+          'libversion' : '2.5.4',

+          'files'      : [ 'test.dll', 'test.lib', 'test.obj' ],

+          'instfiles'  : [ 'test.dll', 'test.lib' ],

+          'symlinks'   : [],

+        },

+    ]

+elif 'sunlink' in tool_list:

+    test_plan = [

+      {

+          'libversion' : '2',

+          'files'      : [ 'libtest.so', 'libtest.so.2', 'so_test.os' ],

+          'instfiles'  : [ 'libtest.so', 'libtest.so.2' ],

+          'symlinks'   : [ ('libtest.so', 'libtest.so.2') ],

+      },

+      {

+          'libversion' : '2.5',

+          'files'      : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.5', 'so_test.os' ],

+          'instfiles'  : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.5' ],

+          'symlinks'   : [ ('libtest.so', 'libtest.so.2.5'), ('libtest.so.2', 'libtest.so.2.5') ],

+      },

+      {

+          'libversion' : '2.5.4',

+          'files'      : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.5.4', 'so_test.os' ],

+          'instfiles'  : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.5.4' ],

+          'symlinks'   : [ ('libtest.so', 'libtest.so.2.5.4'), ('libtest.so.2', 'libtest.so.2.5.4') ],

+      },

+      {

+          'libversion' : '2.5.4.7.8',

+          'files'      : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.5.4.7.8', 'so_test.os' ],

+          'instfiles'  : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.5.4.7.8' ],

+          'symlinks'   : [ ('libtest.so', 'libtest.so.2.5.4.7.8'), ('libtest.so.2', 'libtest.so.2.5.4.7.8') ],

+      },

+      {

+          'libversion' : 'aabf114f',

+          'files'      : [ 'libtest.so', 'libtest.so.aabf114f', 'so_test.os' ],

+          'instfiles'  : [ 'libtest.so', 'libtest.so.aabf114f' ],

+          'symlinks'   : [ ('libtest.so', 'libtest.so.aabf114f') ],

+      },

+      {

+          'libversion' : '2.dfffa11',

+          'files'      : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.dfffa11', 'so_test.os' ],

+          'instfiles'  : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.dfffa11' ],

+          'symlinks'   : [ ('libtest.so', 'libtest.so.2.dfffa11'), ('libtest.so.2', 'libtest.so.2.dfffa11') ],

+      },

+    ]

+else:

+    test_plan = [

+        {

+          'libversion' : '2.5.4',

+          'files'      : [ 'libtest.so', 'test.os' ],

+          'instfiles'  : [ ],

+        },

+    ]

 

-test.write('SConstruct', """\

-import os

-env = Environment()

-objs = env.SharedObject('test.c')

-mylib = env.SharedLibrary('test', objs, SHLIBVERSION = '2.5.4')

-env.Program(source=['testapp.c',mylib])

-env.Program(target=['testapp2'],source=['testapp.c','libtest.dylib'])

-instnode = env.InstallVersionedLib("#/installtest",mylib)

-env.Default(instnode)

-""")

+test_c_src = """\

+#if _WIN32

+__declspec(dllexport)

+#endif

+int testlib(int n) { return n+1 ; }

+"""

 

-test.write('test.c', """\

+test_c_src2 = """\

 #if _WIN32

 __declspec(dllexport)

 #endif

-int testlib(int n)

-{

-return n+1 ;

-}

-""")

+int testlib(int n) { return n+11 ; }

+"""

 

-test.write('testapp.c', """\

+testapp_c_src = """\

+#if _WIN32

+__declspec(dllimport)

+#endif

+int testlib(int n);

 #include <stdio.h>

 int main(int argc, char **argv)

 {

 int itest ;

 

 itest = testlib(2) ;

-printf("results: testlib(2) = %d\n",itest) ;

+printf("results: testlib(2) = %d\\n",itest) ;

 return 0 ;

 }

-""")

+"""

 

-platform = SCons.Platform.platform_default()

+for t in test_plan:

 

+    test = TestSCons.TestSCons()

 

-test.run()

+    libversion  = t['libversion']

+    files       = t['files']

+    symlinks    = t['symlinks']

+    instfiles   = t['instfiles']

 

-if platform == 'posix':

-    # All (?) the files we expect will get created in the current directory

-    files = [

-    'libtest.so',

-    'libtest.so.2',

-    'libtest.so.2.5.4',

-    'test.os',

-    ]

-    # All (?) the files we expect will get created in the 'installtest' directory

-    instfiles = [

-    'libtest.so',

-    'libtest.so.2',

-    'libtest.so.2.5.4',

-    ]

-elif platform == 'darwin':

-    # All (?) the files we expect will get created in the current directory

-    files = [

-    'libtest.dylib',

-    'libtest.2.5.4.dylib',

-    'test.os',

-    ]

-    # All (?) the files we expect will get created in the 'installtest' directory

-    instfiles = [

-    'libtest.dylib',

-    'libtest.2.5.4.dylib',

-    ]

-elif platform == 'cygwin':

-    # All (?) the files we expect will get created in the current directory

-    files = [

-    'cygtest-2-5-4.dll',

-    'libtest-2-5-4.dll.a',

-    'test.os',

-    ]

-    # All (?) the files we expect will get created in the 'installtest' directory

-    instfiles = [

-    'cygtest-2-5-4.dll',

-    'libtest-2-5-4.dll.a',

-    ]

-elif platform == 'win32':

-    # All (?) the files we expect will get created in the current directory

-    files = [

-    'test.dll',

-    'test.lib',

-    'test.obj',

-    ]

-    # All (?) the files we expect will get created in the 'installtest' directory

-    instfiles = [

-    'test.dll',

-    'test.lib',

-    ]

-else:

-    # All (?) the files we expect will get created in the current directory

-    files= [

-    'libtest.so',

-    'test.os']

-    # All (?) the files we expect will get created in the 'installtest' directory

-    instfiles = []

-

-for f in files:

-    test.must_exist([ f])

-for f in instfiles:

-    test.must_exist(['installtest', f])

-

-# modify test.c and make sure it can recompile when links already exist

-test.write('test.c', """\

-#if _WIN32

-__declspec(dllexport)

-#endif

-int testlib(int n)

-{

-return n+11 ;

-}

-""")

+    test.write('SConstruct', """\

+import os

+env = Environment()

+objs = env.SharedObject('test.c')

+mylib = env.SharedLibrary('test', objs, SHLIBVERSION = '%s')

+env.Program('testapp1.c', LIBS = mylib, LIBPATH='.')

+env.Program('testapp2.c', LIBS = ['test'], LIBPATH='.')

+instnode = env.InstallVersionedLib("#/installtest",mylib)

+env.Default(instnode)

+

+# Extra test to ensure that InstallVersionedLib can be called from the DefaultEnvironment

+# Ensures orthogonality where InstallVersionedLib wasn't previously available: SCons gave NameError.

+instnode = InstallVersionedLib("defaultenv-installtest",mylib)

+Default(instnode)

+

+""" % libversion)

+

+    test.write('test.c', test_c_src)

+    test.write('testapp1.c', testapp_c_src)

+    test.write('testapp2.c', testapp_c_src)

+

+    test.run(arguments = ['--tree=all'])

+

+    for f in files:

+        test.must_exist([ f])

+    for f in instfiles:

+        test.must_exist(['installtest', f])

+        test.must_exist(['defaultenv-installtest', f])

+

+    wrong_symlinks = []

+    for (linkname,expected) in symlinks:

+        try:

+            endpoint = os.readlink(linkname)

+        except OSError, err:

+            print "%s (expected symlink %r -> %r)" % (err, linkname, expected)

+            wrong_symlinks.append(linkname)

+        else:

+            if endpoint != expected:

+                print "Wrong symlink: %r -> %r (expected symlink: %r -> %r)" % (linkname, endpoint, linkname, expected)

+                wrong_symlinks.append(linkname)

+

+    if wrong_symlinks:

+        test.fail_test(wrong_symlinks)

+

+    # modify test.c and make sure it can recompile when links already exist

+    test.write('test.c', test_c_src2)

+

+    test.run()

 

-test.run()

+    test.run(arguments = ['-c'])

 

-test.run(arguments = '-c')

+    for f in files:

+        test.must_not_exist([ f])

 

-for f in files:

-    test.must_not_exist([ f])

-for f in instfiles:

-    test.must_not_exist(['installtest', f])

+    for f in instfiles:

+        test.must_not_exist(['installtest', f])

+        test.must_not_exist(['defaultenv-installtest', f])

 

 test.pass_test()