From 8e1095bdf46a46b90ffd102400f8cd0970b9076a Mon Sep 17 00:00:00 2001 From: Rintaro Ishizaki Date: Mon, 29 Aug 2016 19:31:01 +0900 Subject: [PATCH 1/2] [util] Remove --merge-coverage option from run-test --- utils/run-test | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/utils/run-test b/utils/run-test index 9d49387cf4450..b72820a628b88 100755 --- a/utils/run-test +++ b/utils/run-test @@ -47,8 +47,6 @@ VALIDATION_TEST_SOURCE_DIR = os.path.join(SWIFT_SOURCE_DIR, 'validation-test') LIT_BIN_DEFAULT = os.path.join(SWIFT_SOURCE_ROOT, 'llvm', 'utils', 'lit', 'lit.py') -PROFDATA_MERGE = os.path.join(SWIFT_SOURCE_DIR, - 'utils', 'profdata_merge', 'main.py') host_target = StdlibDeploymentTarget.host_target().name @@ -130,19 +128,12 @@ def main(): "`subset`. Accept multiple.") parser.add_argument("--result-dir", type=os.path.realpath, metavar="PATH", help="directory to store test results (default: none)") - parser.add_argument("--merge-coverage", - action=arguments.action.optional_bool, - help="set to merge coverage profile") parser.add_argument("--lit", default=LIT_BIN_DEFAULT, metavar="PATH", help="lit.py executable path " "(default: ${LLVM_SOURCE_DIR}/utils/lit/lit.py)") args = parser.parse_args() - if args.merge_coverage: - if args.result_dir is None: - error_exit('Coverage needs --result-dir') - targets = args.targets if targets is None: targets = [host_target] @@ -244,27 +235,14 @@ def main(): test_args += ['--param', param] if args.result_dir: - test_args += ['--xunit-xml-output=%s' % os.path.join(args.result_dir, + test_args += ['--param', 'swift_test_results_dir=%s' % args.result_dir, + '--xunit-xml-output=%s' % os.path.join(args.result_dir, 'lit-tests.xml')] test_cmd = [sys.executable, args.lit] + test_args + paths - # Start merge worker - if args.merge_coverage: - merge_log = os.path.join(args.result_dir, 'profdata_merge.log') - profdata_merge_start = [sys.executable, PROFDATA_MERGE, - '-l', merge_log, - 'start', - '-o', args.result_dir] - shell.call(profdata_merge_start, echo=False) - # Do execute test shell.call(test_cmd) - # Stop merge worker - if args.merge_coverage: - profdata_merge_start = [sys.executable, PROFDATA_MERGE, 'stop'] - shell.call(shell.call, echo=False) - if __name__ == "__main__": main() From 0d980879885593fffcac54989870dc8fe7dccd45 Mon Sep 17 00:00:00 2001 From: Rintaro Ishizaki Date: Fri, 2 Sep 2016 13:49:21 +0900 Subject: [PATCH 2/2] [gardening] fix 80-column violation in Python script --- utils/resolve-crashes.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/resolve-crashes.py b/utils/resolve-crashes.py index 5935e3dcfb8e5..94c09acca4817 100755 --- a/utils/resolve-crashes.py +++ b/utils/resolve-crashes.py @@ -16,7 +16,8 @@ def execute_cmd(cmd): # The regular expression we use to match compiler-crasher lines. regex = re.compile( '.*Swift(.*) :: ' - '(compiler_crashers|compiler_crashers_2|IDE/crashers|SIL/crashers)/(.*\.swift|.*\.sil).*') + '(compiler_crashers|compiler_crashers_2|IDE/crashers|SIL/crashers)' + '/(.*\.swift|.*\.sil).*') # Take the output of lit as standard input. for line in sys.stdin: