Skip to content

[coverage] Add a preset for generating coverage data and have coverag… #7882

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 1 commit into from
Mar 3, 2017
Merged

[coverage] Add a preset for generating coverage data and have coverag… #7882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 20 additions & 0 deletions utils/build-presets.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1475,3 +1475,23 @@ dash-dash
swift-stdlib-build-type=RelWithDebInfo
swift-stdlib-enable-assertions=true
build-serialized-stdlib-unittest

#===------------------------------------------------------------------------===#
# Swift Coverage Preset
#===------------------------------------------------------------------------===#

[preset: buildbot_incremental,tools=RDA,stdlib=RDA,coverage]
build-subdir=buildbot_incremental_coverage
release-debuginfo
assertions
swift-analyze-code-coverage=not-merged
test
validation-test
skip-test-ios
skip-test-tvos
skip-test-watchos
skip-build-benchmark
verbose-build
lit-args=-v
reconfigure
build-ninja
29 changes: 4 additions & 25 deletions utils/coverage/coverage-generate-data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,6 @@ def main():
parser = argparse.ArgumentParser(
description='Generate, parse test run profdata')
parser.add_argument('swift_dir', metavar='swift-dir')
parser.add_argument('--build-dir')
parser.add_argument('--build-subdir', default='coverage')
parser.add_argument('--log',
help='the level of information to log (default: info)',
metavar='LEVEL',
Expand All @@ -208,36 +206,17 @@ def main():
logging.debug(args)

swift_dir = os.path.realpath(os.path.abspath(args.swift_dir))
if args.build_dir:
build_dir = os.path.realpath(os.path.abspath(args.build_dir))
else:
build_dir = os.path.realpath(os.path.join(os.path.dirname(swift_dir),
'build'))
build_subdir = os.path.join(build_dir, args.build_subdir)
build_dir = os.path.realpath(os.path.join(os.path.dirname(swift_dir),
'build'))
build_subdir = os.path.join(build_dir, 'buildbot_incremental_coverage')

global_build_subdir = build_subdir

build_script_cmd = [
os.path.join(swift_dir, 'utils/build-script'),
'--release',
'--no-assertions',
'--swift-analyze-code-coverage', 'not-merged',
'--test',
'--validation-test',
'--skip-test-ios',
'--skip-test-tvos',
'--skip-test-watchos',
'--skip-build-benchmark',
'--verbose-build',
'--lit-args=-v',
'--reconfigure',
'--build-ninja',
'--build-subdir', build_subdir
'--preset=buildbot_incremental,tools=RDA,stdlib=RDA,coverage',
]

if args.build_dir:
build_script_cmd += ['--build-dir', build_dir]

call(build_script_cmd)

assert global_build_subdir
Expand Down