Merging pull request #62 from Dirk Baechle: fixes for MinGW tests

1 files changed, 19 insertions, 18 deletions

diff --git a/test/LINK/SHLINKCOMSTR.py b/test/LINK/SHLINKCOMSTR.py
index f97040a6..de56c2c8 100644
--- a/test/LINK/SHLINKCOMSTR.py
+++ b/test/LINK/SHLINKCOMSTR.py
@@ -29,6 +29,7 @@ Test that the $SHLINKCOMSTR construction variable allows you to customize
 the displayed linker string for programs using shared libraries.
 """
 
+import sys
 import TestSCons
 
 _python_ = TestSCons._python_
@@ -90,24 +91,24 @@ Linking shared test3.dll from test1.obj test2.obj
 
 test.must_match('test3.dll', "test1.c\ntest2.c\n")
 
-
-# Now test an actual compile and link.  Since MS Windows
-# resets the link actions, this could fail even if the above
-# test passed.
-test.write('SConstruct', """
-env = Environment(CXXCOMSTR    = 'Compiling $TARGET ...',
-                  SHLINKCOMSTR   = 'Shared-Linking $TARGET ...')
-env.SharedLibrary('test', 'test.cpp')
-""")
-test.write('test.cpp', """
-int i;
-""")
-
-test.run()
-if ("Shared-Linking" not in test.stdout()):
-    test.fail_test()
-
-
+if sys.platform == "win32":
+    import SCons.Tool.MSCommon as msc
+    if msc.msvc_exists():
+        # Now test an actual compile and link.  Since MS Windows
+        # resets the link actions, this could fail even if the above
+        # test passed.
+        test.write('SConstruct', """
+        env = Environment(CXXCOMSTR    = 'Compiling $TARGET ...',
+                          SHLINKCOMSTR   = 'Shared-Linking $TARGET ...')
+        env.SharedLibrary('test', 'test.cpp')
+        """)
+        test.write('test.cpp', """
+        int i;
+        """)
+        
+        test.run()
+        if ("Shared-Linking" not in test.stdout()):
+            test.fail_test()
 
 test.pass_test()