Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(462)

Unified Diff: syzygy/integration_tests/make_integration_tests_clang.py

Issue 2974783002: Fixed some nits based on reviewer comments. (Closed)
Patch Set: Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: syzygy/integration_tests/make_integration_tests_clang.py
diff --git a/syzygy/integration_tests/make_integration_tests_clang.py b/syzygy/integration_tests/make_integration_tests_clang.py
index 0e1731fc6efef0a73a4b2669bf39cdc9fdc32177..b9d7ade77a158cc5844f77358b280ecd8abe9045 100644
--- a/syzygy/integration_tests/make_integration_tests_clang.py
+++ b/syzygy/integration_tests/make_integration_tests_clang.py
@@ -56,9 +56,8 @@ def compile_with_asan(clang_path, source_files, src_dir, object_files,
compile_command_base.extend(compiler_flags)
for source_file, object_file in zip(source_files, object_files):
- compile_command = compile_command_base
+ compile_command = list(compile_command_base)
compile_command.extend([source_file, '-o', object_file])
- print compile_command
ret = subprocess.call(compile_command)
if ret != 0:
print 'ERROR: Failed compiling %s using clang-cl.' % target_name
@@ -84,8 +83,8 @@ def link(clang_path, object_files, build_dir, target_name):
os.path.join(build_dir, target_name + '.dll'),
'/link',
'/dll',
- build_dir + '\export_dll.dll.lib',
- build_dir + '\syzyasan_rtl.dll.lib',
+ os.path.join(build_dir, 'export_dll.dll.lib'),
+ os.path.join(build_dir, 'syzyasan_rtl.dll.lib'),
'-defaultlib:libcmt'
]
@@ -118,8 +117,8 @@ def main():
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],
+ os.path.dirname(os.path.relpath(source_file,
+ _SRC_DIR)),
'%s.%s.obj' % (target_name,
os.path.splitext(os.path.basename(source_file))[0]))
Sébastien Marchand 2017/07/10 16:46:10 This should be aligned with the 'target_name' argu
njanevsk 2017/07/10 18:44:25 Done.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698