Fixed few small bugs

syzygy/integration_tests/make_integration_tests_clang.py

 #!/usr/bin/env python
 # Copyright 2017 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 """A script to compile the integration tests with llvm's clang,
 instrument the code with llvm's Asan, and link it to the syzyasan_rtl
 runtime environment.
 """
 
 import optparse
@@ skipping 38 matching lines @@
       '-DNOMINMAX',
       '-D_CRT_SECURE_NO_WARNINGS',
       '-I',
       src_dir,
   ]
 
   compile_command_base = [clang_path]
   compile_command_base.extend(compiler_flags)
 
   for source_file, object_file in zip(source_files, object_files):
-    compile_command = [compile_command_base, source_file, '-o', object_files]
-
+    compile_command = compile_command_base

[Sébastien Marchand, 2017/07/10 15:10:04]

This doesn't work as this doesn't copy the list, see
https://stackoverflow.com/questions/2612802/how-to-clone-or-copy-a-list (use the
list() function).

This was obvious when executing the script due to the logging below, please make
sure to test the code and ensure that it's doing what it should do before
submitting.

[njanevsk, 2017/07/10 15:55:52]

Actually the code does what it is supposed to do. I tested it and checked that
it generates all the object files and the dll :-D
However, you are right that the code is better/more correct if the list() is
used.

+    compile_command.extend([source_file, '-o', object_file])
+    print compile_command

[Sébastien Marchand, 2017/07/07 19:11:22]

Remove the debugging code.

[Sébastien Marchand, 2017/07/10 14:58:42]

You forgot to address this comment. Please make sure to address all comments
before committing your code.

[njanevsk, 2017/07/10 15:55:52]

Done.

[njanevsk, 2017/07/10 15:55:53]

Done.

     ret = subprocess.call(compile_command)
     if ret != 0:
       print 'ERROR: Failed compiling %s using clang-cl.' % target_name
       return ret
   return ret
 
 
 def link(clang_path, object_files, build_dir, target_name):
   """ Links the object files and produces the integration_tests_clang_dll.dll.
 
@@ skipping 42 matching lines @@
     parser.error('--input-files is required.')
   if not options.target_name:
     parser.error('--target-name is required.')
 
   def get_object_file_location(source_file,
                                output_dir, target_name):
     return os.path.join(output_dir, 'obj',
                         os.path.split(os.path.relpath(source_file,
                                                       _SRC_DIR))[0],
                         '%s.%s.obj' % (target_name,
-                        os.path.splitext(os.path.basename(source_file))[0])
+                        os.path.splitext(os.path.basename(source_file))[0]))
 
   source_files = options.input_files.split()
   object_files = []
 
   for source_file in source_files:
     object_files.append(get_object_file_location(source_file,
                                                  options.output_dir,
                                                  options.target_name))
 
   ret = compile_with_asan(_CLANG_CL_PATH, source_files, _SRC_DIR,
                           object_files, options.target_name)
 
   if ret == 0:
     ret = link(_CLANG_CL_PATH, object_files, options.output_dir,
                options.target_name)
   else:
     print ('ERROR: Compilation of %s failed, skipping link step.'
            % options.target_name)
 
   return ret
 
 
 if __name__ == '__main__':
   sys.exit(main())