- fixes for MinGW under Windows, mainly skipping MSVS-specific tests

3 files changed, 20 insertions, 9 deletions

diff --git a/test/CC/CC.py b/test/CC/CC.py
index dd93674e..73dc4e6f 100644
--- a/test/CC/CC.py
+++ b/test/CC/CC.py
@@ -69,7 +69,7 @@ while args:
         args = args[2:]
         continue
     args = args[1:]
-    if a[0] != '/':
+    if not a[0] in '-/':
         if not inf:
             inf = a
         continue
diff --git a/test/CC/CCFLAGS.py b/test/CC/CCFLAGS.py
index e273bfd7..069b4294 100644
--- a/test/CC/CCFLAGS.py
+++ b/test/CC/CCFLAGS.py
@@ -27,12 +27,18 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 import sys
 import TestSCons
 
+_obj = TestSCons._obj
+
 if sys.platform == 'win32':
-    _obj = '.obj'
-    fooflags = '/nologo -DFOO'
-    barflags = '/nologo -DBAR'
+    import SCons.Tool.MSCommon as msc
+    
+    if not msc.msvc_exists():
+        fooflags = '-DFOO'
+        barflags = '-DBAR'
+    else:
+        fooflags = '/nologo -DFOO'
+        barflags = '/nologo -DBAR'
 else:
-    _obj = '.o'
     fooflags = '-DFOO'
     barflags = '-DBAR'
 
diff --git a/test/CC/CFLAGS.py b/test/CC/CFLAGS.py
index d5efa1a3..6ea87adb 100644
--- a/test/CC/CFLAGS.py
+++ b/test/CC/CFLAGS.py
@@ -41,14 +41,19 @@ test.run(arguments = '.')
 test.must_not_contain_any_line(test.stdout(), ["-xyz"])
 test.must_contain_all_lines(test.stdout(), ["-abc"])
 
+_obj = TestSCons._obj
 
 # Test passing CFLAGS to C compiler by actually compiling programs
 if sys.platform == 'win32':
-    _obj = '.obj'
-    fooflags = '/nologo -DFOO'
-    barflags = '/nologo -DBAR'
+    import SCons.Tool.MSCommon as msc
+    
+    if not msc.msvc_exists():
+        fooflags = '-DFOO'
+        barflags = '-DBAR'
+    else:
+        fooflags = '/nologo -DFOO'
+        barflags = '/nologo -DBAR'
 else:
-    _obj = '.o'
     fooflags = '-DFOO'
     barflags = '-DBAR'