Skip to content

[util] Remove --merge-coverage option from run-test #4597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 2, 2016
Merged

[util] Remove --merge-coverage option from run-test #4597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e1095b
[util] Remove --merge-coverage option from run-test
rintaro Aug 29, 2016
0d98087
[gardening] fix 80-column violation in Python script
rintaro Sep 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion utils/resolve-crashes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
26 changes: 2 additions & 24 deletions utils/run-test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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()