1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout synced 2025-08-03 12:49:50 +00:00

fix testspr: add --compiler-option

This commit is contained in:
bolero-MURAKAMI 2014-01-11 20:27:55 +09:00
parent e7b8d74c0f
commit 0f5ed91e03
3 changed files with 31 additions and 10 deletions

View file

@ -23,15 +23,17 @@ def main():
parser.add_option('--clang_version', type='string', default='.')
parser.add_option('--gcc_root', type='string', default='/usr/local')
parser.add_option('--clang_root', type='string', default='/usr/local')
parser.add_option('--compile_options', type='string', default='')
parser.add_option('--all_options', type='string', default='')
parser.add_option('--test_cpp', type='string')
parser.add_option('--serialized_std_options', type='string', default='{}')
parser.add_option('--serialized_compiler_specific_options', type='string', default='{}')
parser.add_option('--serialized_version_specific_options', type='string', default='{}')
parser.add_option('--max_procs', type='int', default=0)
(opts, args) = parser.parse_args()
std_options = eval(opts.serialized_std_options)
version_specific_options = eval(opts.serialized_version_specific_options)
compiler_specific_options = eval(opts.serialized_compiler_specific_options)
def format_command(name, version, root):
base = "%s-%s" % (name, version) if version != "." else name
@ -40,11 +42,13 @@ def main():
execute_log = "%s/test.%s.execute.log" % (opts.stagedir, base.replace('.', ''))
compiler = "%s/%s/bin/%s++" % (root, base, name.rstrip('c')) if version != "." else "%s++" % name.rstrip('c')
return "%s -o %s" \
" %s %s %s" \
" %s %s" \
" %s %s" \
" %s > %s 2>&1" \
" && %s > %s 2>&1" \
% (compiler, bin,
std_options.get(base, ''), opts.compile_options, version_specific_options.get(base, ''),
std_options.get(base, ''), opts.all_options,
compiler_specific_options.get(name, ''), version_specific_options.get(base, ''),
opts.test_cpp, compile_log,
bin, execute_log
)
@ -54,11 +58,13 @@ def main():
build,
[format_command('gcc', version, opts.gcc_root)
for version in opts.gcc_version.split(' ')
]
] if opts.gcc_version != ' '
else []
+
[format_command('clang', version, opts.clang_root)
for version in opts.clang_version.split(' ')
]
] if opts.clang_version != ' '
else []
))
if __name__ == "__main__":