reivised code, fixed cygwin/variant-dir issue, cleaned-up some areas

2 files changed, 159 insertions, 2 deletions

diff --git a/test/LINK/VersionedLib-VariantDir.py b/test/LINK/VersionedLib-VariantDir.py
new file mode 100644
index 000000000..a3ea66039
--- /dev/null
+++ b/test/LINK/VersionedLib-VariantDir.py
@@ -0,0 +1,157 @@
+#!/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
+
+platform = SCons.Platform.platform_default()
+
+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 platform == 'posix':
+    # 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 platform == 'darwin':
+    # All (?) the files we expect will get created in the current directory
+    files = [
+    'libfoo.dylib',
+    'libfoo.0.1.2.dylib',
+    ]
+    obj = 'foo.os'
+elif platform == 'cygwin':
+    # 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 platform == 'win32':
+    # All (?) the files we expect will get created in the current directory
+    files = [
+    'foo.dll',
+    'foo.lib',
+    ]
+    obj = 'foo.obj'
+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-subdir.py b/test/LINK/VersionedLib-subdir.py
index 5fae101ec..6facd41c4 100644
--- a/test/LINK/VersionedLib-subdir.py
+++ b/test/LINK/VersionedLib-subdir.py
@@ -76,8 +76,8 @@ env.Program('main.c', LIBS=['foo'])
 
 test.run(arguments = ['--tree=all'])
 
-if platform == 'cygwin':
-    # PATH is used to search for *.dll librarier (cygfoo-0-2-1.dll in our case)
+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)