Add .def file for the clang instrumented integration tests dll.

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 47 matching lines @@
   for source_file, object_file in zip(source_files, object_files):
     compile_command = list(compile_command_base)
     compile_command.extend([source_file, '-o', object_file])
     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):
+def link(clang_path, object_files, build_dir, target_name, def_file):
   """ Links the object files and produces the integration_tests_clang_dll.dll.
 
   Links the object files and produces the dll. The object files have to be
   produced by the compile method above.
 
   Args:
     clang_path: Path to the clang-cl compiler in the syzygy project.
     source_files: The source file names which are converted to obj filenames.
     build_dir: The directory where to produce the linked dll.
     target_name: The name of the target being build.
   """
 
   linker_flags = [
       '-o',
       os.path.join(build_dir, target_name + '.dll'),
       '/link',
       '/dll',
       os.path.join(build_dir, 'export_dll.dll.lib'),
       os.path.join(build_dir, 'syzyasan_rtl.dll.lib'),
-      '-defaultlib:libcmt'
+      '-defaultlib:libcmt',
+      '/debug:full',

[Sébastien Marchand, 2017/07/19 15:27:26]

You also need to specify /Zi during the compile step for the debug information
to be emitted in the obj files.

There's no need to specify :full, "/DEBUG" is enough as full is the default
value.

+      '/def:' + def_file,
   ]
 
   linker_command = [clang_path, '-m32']
   linker_command.extend(object_files)
   linker_command.extend(linker_flags)
+  print linker_command

[Sébastien Marchand, 2017/07/19 15:27:26]

Remove the debugging code.

[njanevsk, 2017/07/19 16:00:35]

Done.

   ret = subprocess.call(linker_command)
 
   if ret != 0:
     print 'ERROR: Failed to link %s using clang-cl.' % target_name
   return ret
 
 
 def main():
   parser = optparse.OptionParser(usage='%prog [options]')
   parser.add_option('--output-dir',
       help='Path to the Syzygy Release directory.')
   parser.add_option('--input-files', help='Files to be compiled and linked.')
   parser.add_option('--target-name', help='Name of the target to be compiled.')
+  parser.add_option('--def-file', help='Definition file for the dll.')
 
   options, _ = parser.parse_args()
 
   if not options.output_dir:
     parser.error('--output-dir is required.')
   if not options.input_files:
     parser.error('--input-files is required.')
   if not options.target_name:
     parser.error('--target-name is required.')
+  if not options.def_file:
+    parser.error('--def-file is required.')
 
   def get_object_file_location(source_file,
                                output_dir, target_name):
     return os.path.join(output_dir, 'obj',
         os.path.dirname(os.path.relpath(source_file, _SRC_DIR)),
         '%s.%s.obj' % (target_name,
                        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)
+               options.target_name, options.def_file)
   else:
     print ('ERROR: Compilation of %s failed, skipping link step.'
            % options.target_name)
 
   return ret
 
 
 if __name__ == '__main__':
   sys.exit(main())