Skip to content
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

Jump to bottom

Rollback usage of use_jacoco attribute #1171

Merged
merged 1 commit into from
Dec 16, 2020
Merged

Rollback usage of use_jacoco attribute #1171

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
14 changes: 9 additions & 5 deletions scala/private/phases/phase_write_executable.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def phase_write_executable_scalatest(ctx, p):
"-DRULES_SCALA_MAIN_WS_NAME=%s" % ctx.workspace_name,
"-DRULES_SCALA_ARGS_FILE=%s" % p.runfiles.args_file.short_path,
] + expand_location(ctx, final_jvm_flags),
use_jacoco = ctx.configuration.coverage_enabled,
)
return _phase_write_executable_default(ctx, p, args)

Expand All @@ -55,6 +56,7 @@ def _phase_write_executable_default(ctx, p, _args = struct()):
p,
_args.rjars if hasattr(_args, "rjars") else p.compile.rjars,
_args.jvm_flags if hasattr(_args, "jvm_flags") else ctx.attr.jvm_flags,
_args.use_jacoco if hasattr(_args, "use_jacoco") else False,
_args.main_class if hasattr(_args, "main_class") else ctx.attr.main_class,
)

Expand All @@ -63,16 +65,18 @@ def _phase_write_executable(
p,
rjars,
jvm_flags,
use_jacoco,
main_class):
executable = p.declare_executable.executable
wrapper = p.java_wrapper

if (is_windows(ctx)):
return _write_executable_windows(ctx, executable, rjars, main_class, jvm_flags, wrapper)
return _write_executable_windows(ctx, executable, rjars, main_class, jvm_flags, wrapper, use_jacoco)
else:
return _write_executable_non_windows(ctx, executable, rjars, main_class, jvm_flags, wrapper)
return _write_executable_non_windows(ctx, executable, rjars, main_class, jvm_flags, wrapper, use_jacoco)

def _write_executable_windows(ctx, executable, rjars, main_class, jvm_flags, wrapper):
def _write_executable_windows(ctx, executable, rjars, main_class, jvm_flags, wrapper, use_jacoco):
# NOTE: `use_jacoco` is currently ignored on Windows.
# TODO: tests coverage support for Windows
classpath = ";".join(
[("external/%s" % (j.short_path[3:]) if j.short_path.startswith("../") else j.short_path) for j in rjars.to_list()],
Expand All @@ -93,7 +97,7 @@ def _write_executable_windows(ctx, executable, rjars, main_class, jvm_flags, wra
)
return []

def _write_executable_non_windows(ctx, executable, rjars, main_class, jvm_flags, wrapper):
def _write_executable_non_windows(ctx, executable, rjars, main_class, jvm_flags, wrapper, use_jacoco):
template = ctx.attr._java_stub_template.files.to_list()[0]

jvm_flags = " ".join(
Expand All @@ -105,7 +109,7 @@ def _write_executable_non_windows(ctx, executable, rjars, main_class, jvm_flags,
wrapper.short_path,
)

if ctx.configuration.coverage_enabled:
if use_jacoco and ctx.configuration.coverage_enabled:
classpath = ctx.configuration.host_path_separator.join(
["${RUNPATH}%s" % (j.short_path) for j in rjars.to_list() + ctx.files._jacocorunner],
)
Expand Down