Merge pull request #3698 from bdbaddog/fix_broken_fixture_mylink

Fix fake mylink.py was broken on win32.

Author: bdbaddog

SCons/Tool/gcc.py

@@ -77,7 +77,7 @@ def detect_version(env, cc):
     # GCC versions older than that, we should use --version and a
     # regular expression.
     # pipe = SCons.Action._subproc(env, SCons.Util.CLVar(cc) + ['-dumpversion'],
-    pipe = SCons.Action._subproc(env, SCons.Util.CLVar(cc) + ['--version'],
+    pipe=SCons.Action._subproc(env, SCons.Util.CLVar(cc) + ['--version'],
                                  stdin='devnull',
                                  stderr='devnull',
                                  stdout=subprocess.PIPE)
@@ -94,6 +94,7 @@ def detect_version(env, cc):
         while SCons.Util.to_str(pipe.stdout.readline()):
             pass
 
+
     # -dumpversion variant:
     # if line:
     #     version = line

test/CompilationDatabase/basic.py

@@ -27,15 +27,13 @@
 """
 
 import sys
+import os
+import os.path
 import TestSCons
 
 test = TestSCons.TestSCons()
 
-if sys.platform == 'win32':
-    test.file_fixture('mylink_win32.py', 'mylink.py')
-else:
-    test.file_fixture('mylink.py')
-
+test.file_fixture('mylink.py')
 test.file_fixture('mygcc.py')
 
 test.verbose_set(1)
@@ -67,23 +65,30 @@
     }
 ]""" % (sys.executable, test.workdir)
 
+if sys.platform == 'win32':
+    example_rel_file = example_rel_file.replace('\\', '\\\\')
+
 for f in rel_files:
     # print("Checking:%s" % f)
     test.must_exist(f)
-    test.must_match(f, example_rel_file)
+    test.must_match(f, example_rel_file, mode='r')
 
 example_abs_file = """[
     {
         "command": "%s mygcc.py cc -o test_main.o -c test_main.c",
         "directory": "%s",
-        "file": "%s/test_main.c",
-        "output": "%s/test_main.o"
+        "file": "%s",
+        "output": "%s"
     }
-]""" % (sys.executable, test.workdir, test.workdir, test.workdir)
+]""" % (sys.executable, test.workdir, os.path.join(test.workdir, 'test_main.c'), os.path.join(test.workdir, 'test_main.o'))
+
+if sys.platform == 'win32':
+    example_abs_file = example_abs_file.replace('\\', '\\\\')
+
 
 for f in abs_files:
     test.must_exist(f)
-    test.must_match(f, example_abs_file)
+    test.must_match(f, example_abs_file, mode='r')
 
 
 test.pass_test()

test/CompilationDatabase/fixture/SConstruct

@@ -7,6 +7,7 @@ env = Environment(
     LINKFLAGS=[],
     CC='$PYTHON mygcc.py cc',
     CXX='$PYTHON mygcc.py c++',
+    tools=['gcc','g++','gnulink'],
 )
 env.Tool('compilation_db')
 

test/fixture/mylink.py

@@ -1,15 +1,43 @@
+"""
+Dummy linker for use by tests"
+"""
 import getopt
 import sys
 
-opts, args = getopt.getopt(sys.argv[1:], 'o:s:')
-for opt, arg in opts:
-    if opt == '-o':
-        out = arg
-
-with open(out, 'w') as ofp:
-    for f in args:
-        with open(f, 'r') as ifp:
-            for line in ifp.readlines():
-                if line[:5] != '#link':
-                    ofp.write(line)
-sys.exit(0)
+def fake_link():
+    opts, args = getopt.getopt(sys.argv[1:], 'o:s:')
+    for opt, arg in opts:
+        if opt == '-o':
+            out = arg
+
+    with open(out, 'w') as ofp:
+        for f in args:
+            with open(f, 'r') as ifp:
+                for line in ifp.readlines():
+                    if line[:5] != '#link':
+                        ofp.write(line)
+    sys.exit(0)
+
+def fake_win32_link():
+    args = sys.argv[1:]
+    while args:
+        a = args[0]
+        if a == '-o':
+            out = args[1]
+            args = args[2:]
+            continue
+        if not a[0] in '/-':
+            break
+        args = args[1:]
+        if a[:5].lower() == '/out:': out = a[5:]
+    with open(args[0], 'rb') as ifp, open(out, 'wb') as ofp:
+        for line in ifp.readlines():
+            if not line.startswith(b'#link'):
+                ofp.write(line)
+    sys.exit(0)
+
+if __name__ == '__main__':
+    if sys.platform == 'win32':
+        fake_win32_link()
+    else:
+        fake_link()