Merge 50f4fe4 into e8d4f01

SCons · Nov 26, 2018 · 1424843 · 1424843
2 parents e8d4f01 + 50f4fe4
commit 1424843
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 6 deletions.
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
@@ -176,6 +176,7 @@ RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
     - Update (pep8) configure-cache script, add a --show option.
     - Fix for a couple of "what if tool not found" exceptions in framework.
     - Add Textfile/Substfile to default environment. (issue #3147)
+    - Make the clang StaticLibrary tests work on win32.
 
   From Bernhard M. Wiedemann:
     - Update SCons' internal scons build logic to allow overriding build date 

diff --git a/test/Clang/clang_static_library.py b/test/Clang/clang_static_library.py
@@ -24,6 +24,8 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
+import sys
+
 import TestSCons
 
 _exe = TestSCons._exe
@@ -32,11 +34,23 @@
 if not test.where_is('clang'):
     test.skip_test("Could not find 'clang', skipping test.\n")
 
+if sys.platform == 'win32':
+    foo_lib = 'foo.lib'
+    archiver = 'mslib'
+    import SCons.Tool.MSCommon as msc
+    if not msc.msvc_exists():
+        foo_lib = 'libfoo.a'
+        archiver = 'ar'
+else:
+    foo_lib = 'libfoo.a'
+    archiver = 'ar'
+
+
 test.write('SConstruct', """\
 DefaultEnvironment(tools=[])
-env = Environment(tools=['mingw','clang', 'ar'])
+env = Environment(tools=['mingw','clang', '%s'])
 env.StaticLibrary('foo', 'foo.c')
-""")
+""" % archiver)
 
 test.write('foo.c', """\
 int bar() {
@@ -46,7 +60,7 @@
 
 test.run()
 
-test.must_exist(test.workpath('libfoo.a'))
+test.must_exist(test.workpath(foo_lib))
 
 test.pass_test()
 

diff --git a/test/Clang/clangxx_static_library.py b/test/Clang/clangxx_static_library.py
@@ -24,6 +24,8 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
+import sys
+
 import TestSCons
 
 _exe = TestSCons._exe
@@ -32,11 +34,23 @@
 if not test.where_is('clang'):
     test.skip_test("Could not find 'clang++', skipping test.\n")
 
+if sys.platform == 'win32':
+    foo_lib = 'foo.lib'
+    archiver = 'mslib'
+    import SCons.Tool.MSCommon as msc
+    if not msc.msvc_exists():
+        foo_lib = 'libfoo.a'
+        archiver = 'ar'
+else:
+    foo_lib = 'libfoo.a'
+    archiver = 'ar'
+
+
 test.write('SConstruct', """\
 DefaultEnvironment(tools=[])
-env = Environment(tools=['mingw','clang++', 'ar'])
+env = Environment(tools=['mingw','clang++', '%s'])
 env.StaticLibrary('foo', 'foo.cpp')
-""")
+""" % archiver)
 
 test.write('foo.cpp', """\
 int bar() {
@@ -46,7 +60,7 @@
 
 test.run()
 
-test.must_exist(test.workpath('libfoo.a'))
+test.must_exist(test.workpath(foo_lib))
 
 test.pass_test()