diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl index 2f1ef9ed66d6ed..4701a1c8f4bf21 100644 --- a/src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl +++ b/src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl @@ -182,7 +182,7 @@ def _add(ctx, linking_statically): def _get_file_content(objects): result = [] for obj in objects: - result.append(obj.short_path) + result.append(obj.path) result.append("\n") return "".join(result) @@ -192,7 +192,7 @@ def _add_transitive_info_providers(ctx, cc_toolchain, cpp_config, feature_config runtime_objects_list = ctx.actions.declare_file(ctx.label.name + "runtime_objects_list.txt") file_content = _get_file_content(runtime_objects_for_coverage) ctx.actions.write(output = runtime_objects_list, content = file_content, is_executable = False) - additional_meta_data = [runtime_objects_list] + additional_meta_data = [runtime_objects_list] + runtime_objects_for_coverage instrumented_files_provider = cc_helper.create_cc_instrumented_files_info( ctx = ctx, diff --git a/src/test/shell/bazel/bazel_coverage_cc_test_llvm.sh b/src/test/shell/bazel/bazel_coverage_cc_test_llvm.sh index d2cf0dab910e94..6f12bbc6be2f8a 100755 --- a/src/test/shell/bazel/bazel_coverage_cc_test_llvm.sh +++ b/src/test/shell/bazel/bazel_coverage_cc_test_llvm.sh @@ -27,6 +27,41 @@ if [[ "${COVERAGE_GENERATOR_DIR}" != "released" ]]; then add_to_bazelrc "build --override_repository=remote_coverage_tools=${COVERAGE_GENERATOR_DIR}" fi +# Configures Bazel to emit coverage using LLVM tools, returning a non-zero exit +# code if the tools are not available. +function setup_llvm_coverage_tools_for_lcov() { + local -r clang=$(which clang || true) + if [[ ! -x "${clang}" ]]; then + echo "clang not installed. Skipping test." + return 1 + fi + local -r clang_version=$(clang --version | grep -o "clang version [0-9]*" | cut -d " " -f 3) + if [ "$clang_version" -lt 9 ]; then + # No lcov produced with <9.0. + echo "clang versions <9.0 are not supported, got $clang_version. Skipping test." + return 1 + fi + + local -r llvm_profdata=$(which llvm-profdata || true) + if [[ ! -x "${llvm_profdata}" ]]; then + echo "llvm-profdata not installed. Skipping test." + return 1 + fi + + local -r llvm_cov=$(which llvm-cov || true) + if [[ ! -x "${llvm_cov}" ]]; then + echo "llvm-cov not installed. Skipping test." + return 1 + fi + + add_to_bazelrc "common --repo_env=BAZEL_LLVM_COV=${llvm_cov}" + add_to_bazelrc "common --repo_env=BAZEL_LLVM_PROFDATA=${llvm_profdata}" + add_to_bazelrc "common --repo_env=BAZEL_USE_LLVM_NATIVE_COVERAGE=1" + add_to_bazelrc "common --repo_env=CC=${clang}" + add_to_bazelrc "common --repo_env=GCOV=${llvm_profdata}" + add_to_bazelrc "common --experimental_generate_llvm_lcov" +} + # Writes the C++ source files and a corresponding BUILD file for which to # collect code coverage. The sources are a.cc, a.h and t.cc. function setup_a_cc_lib_and_t_cc_test() { @@ -109,31 +144,37 @@ function test_cc_test_llvm_coverage_doesnt_fail() { } function test_cc_test_llvm_coverage_produces_lcov_report() { - local -r clang="/usr/bin/clang" - if [[ ! -x ${clang} ]]; then - return - fi - local -r clang_version=$(clang --version | grep -o "clang version [0-9]*" | cut -d " " -f 3) - if [ "$clang_version" -lt 9 ] || [ "$clang_version" -eq 10 ] || [ "$clang_version" -eq 11 ]; then - # No lcov produced with <9.0, no branch coverage with 10.0 and 11.0. - echo "clang versions <9.0 as well as 10.0 and 11.0 are not supported." && return - fi + setup_llvm_coverage_tools_for_lcov || return 0 + setup_a_cc_lib_and_t_cc_test - local -r llvm_profdata="/usr/bin/llvm-profdata" - if [[ ! -x ${llvm_profdata} ]]; then - return - fi + bazel coverage --test_output=all //:t &>$TEST_log || fail "Coverage for //:t failed" - local -r llvm_cov="/usr/bin/llvm-cov" - if [[ ! -x ${llvm_cov} ]]; then - return - fi + local expected_result="SF:a.cc +FN:3,_Z1ab +FNDA:1,_Z1ab +FNF:1 +FNH:1 +DA:3,1 +DA:4,1 +DA:5,1 +DA:6,1 +DA:7,0 +DA:8,0 +DA:9,1 +LH:5 +LF:7 +end_of_record" + assert_equals "$expected_result" "$(cat $(get_coverage_file_path_from_test_log) | grep -v '^BR')" +} + +function test_cc_test_llvm_coverage_produces_lcov_report_with_split_postprocessing() { + setup_llvm_coverage_tools_for_lcov || return 0 setup_a_cc_lib_and_t_cc_test - BAZEL_USE_LLVM_NATIVE_COVERAGE=1 GCOV=$llvm_profdata CC=$clang \ - BAZEL_LLVM_COV=$llvm_cov bazel coverage --experimental_generate_llvm_lcov \ - --test_output=all //:t &>$TEST_log || fail "Coverage for //:t failed" + bazel coverage \ + --experimental_split_coverage_postprocessing --experimental_fetch_all_coverage_outputs \ + --test_env=VERBOSE_COVERAGE=1 --test_output=all //:t &>$TEST_log || fail "Coverage for //:t failed" local expected_result="SF:a.cc FN:3,_Z1ab @@ -151,29 +192,11 @@ LH:5 LF:7 end_of_record" - assert_equals "$expected_result" "$(cat $(get_coverage_file_path_from_test_log))" + assert_equals "$expected_result" "$(cat $(get_coverage_file_path_from_test_log) | grep -v '^BR')" } function test_cc_test_with_runtime_objects_not_in_runfiles() { - local -r clang="/usr/bin/clang" - if [[ ! -x ${clang} ]]; then - return - fi - local -r clang_version=$(clang --version | grep -o "clang version [0-9]*" | cut -d " " -f 3) - if [ "$clang_version" -lt 9 ] || [ "$clang_version" -eq 10 ] || [ "$clang_version" -eq 11 ]; then - # No lcov produced with <9.0, no branch coverage with 10.0 and 11.0. - echo "clang versions <9.0 as well as 10.0 and 11.0 are not supported." && return - fi - - local -r llvm_profdata="/usr/bin/llvm-profdata" - if [[ ! -x ${llvm_profdata} ]]; then - return - fi - - local -r llvm_cov="/usr/bin/llvm-cov" - if [[ ! -x ${llvm_cov} ]]; then - return - fi + setup_llvm_coverage_tools_for_lcov || return 0 cat << EOF > BUILD cc_test( @@ -206,10 +229,8 @@ int main(int argc, char const *argv[]) EOF - BAZEL_USE_LLVM_NATIVE_COVERAGE=1 GCOV=$llvm_profdata CC=$clang \ - BAZEL_LLVM_COV=$llvm_cov bazel coverage --experimental_generate_llvm_lcov \ - --test_output=all --instrument_test_targets \ - //:main &>$TEST_log || fail "Coverage for //:main failed" + bazel coverage --test_output=all --instrument_test_targets \ + //:main &>$TEST_log || fail "Coverage for //:main failed" local expected_result="SF:main.cpp FN:4,main @@ -225,7 +246,7 @@ LH:5 LF:5 end_of_record" - assert_equals "$expected_result" "$(cat $(get_coverage_file_path_from_test_log))" + assert_equals "$expected_result" "$(cat $(get_coverage_file_path_from_test_log) | grep -v '^BR')" } function setup_external_cc_target() { @@ -306,42 +327,17 @@ EOF } function test_external_cc_target_can_collect_coverage() { - local -r clang="/usr/bin/clang" - if [[ ! -x ${clang} ]]; then - return - fi - local -r clang_version=$(clang --version | grep -o "clang version [0-9]*" | cut -d " " -f 3) - if [ "$clang_version" -lt 9 ] || [ "$clang_version" -eq 10 ] || [ "$clang_version" -eq 11 ]; then - # No lcov produced with <9.0, no branch coverage with 10.0 and 11.0. - echo "clang versions <9.0 as well as 10.0 and 11.0 are not supported." && return - fi - - local -r llvm_profdata="/usr/bin/llvm-profdata" - if [[ ! -x ${llvm_profdata} ]]; then - return - fi - - local -r llvm_cov="/usr/bin/llvm-cov" - if [[ ! -x ${llvm_cov} ]]; then - return - fi - + setup_llvm_coverage_tools_for_lcov || return 0 setup_external_cc_target - BAZEL_USE_LLVM_NATIVE_COVERAGE=1 GCOV=$llvm_profdata CC=$clang \ - BAZEL_LLVM_COV=$llvm_cov bazel coverage --experimental_generate_llvm_lcov \ - --combined_report=lcov --test_output=all \ - @other_repo//:t --instrumentation_filter=// &>$TEST_log || fail "Coverage for @other_repo//:t failed" + bazel coverage --combined_report=lcov --test_output=all \ + @other_repo//:t --instrumentation_filter=// &>$TEST_log || fail "Coverage for @other_repo//:t failed" local expected_result='SF:b.cc FN:1,_Z1bb FNDA:1,_Z1bb FNF:1 FNH:1 -BRDA:2,0,0,1 -BRDA:2,0,1,0 -BRF:2 -BRH:1 DA:1,1 DA:2,1 DA:3,1 @@ -357,10 +353,6 @@ FN:4,_Z1ab FNDA:1,_Z1ab FNF:1 FNH:1 -BRDA:5,0,0,1 -BRDA:5,0,1,0 -BRF:2 -BRH:1 DA:4,1 DA:5,1 DA:6,1 @@ -372,47 +364,22 @@ LH:5 LF:7 end_of_record' - assert_equals "$expected_result" "$(cat $(get_coverage_file_path_from_test_log))" - assert_equals "$expected_result" "$(cat bazel-out/_coverage/_coverage_report.dat)" + assert_equals "$expected_result" "$(cat $(get_coverage_file_path_from_test_log) | grep -v '^BR')" + assert_equals "$expected_result" "$(cat bazel-out/_coverage/_coverage_report.dat | grep -v '^BR')" } function test_external_cc_target_coverage_not_collected_by_default() { - local -r clang="/usr/bin/clang" - if [[ ! -x ${clang} ]]; then - return - fi - local -r clang_version=$(clang --version | grep -o "clang version [0-9]*" | cut -d " " -f 3) - if [ "$clang_version" -lt 9 ] || [ "$clang_version" -eq 10 ] || [ "$clang_version" -eq 11 ]; then - # No lcov produced with <9.0, no branch coverage with 10.0 and 11.0. - echo "clang versions <9.0 as well as 10.0 and 11.0 are not supported." && return - fi - - local -r llvm_profdata="/usr/bin/llvm-profdata" - if [[ ! -x ${llvm_profdata} ]]; then - return - fi - - local -r llvm_cov="/usr/bin/llvm-cov" - if [[ ! -x ${llvm_cov} ]]; then - return - fi - + setup_llvm_coverage_tools_for_lcov || return 0 setup_external_cc_target - BAZEL_USE_LLVM_NATIVE_COVERAGE=1 GCOV=$llvm_profdata CC=$clang \ - BAZEL_LLVM_COV=$llvm_cov bazel coverage --experimental_generate_llvm_lcov \ - --combined_report=lcov --test_output=all \ - @other_repo//:t &>$TEST_log || fail "Coverage for @other_repo//:t failed" + bazel coverage --combined_report=lcov --test_output=all \ + @other_repo//:t &>$TEST_log || fail "Coverage for @other_repo//:t failed" local expected_result='SF:b.cc FN:1,_Z1bb FNDA:1,_Z1bb FNF:1 FNH:1 -BRDA:2,0,0,1 -BRDA:2,0,1,0 -BRF:2 -BRH:1 DA:1,1 DA:2,1 DA:3,1 @@ -424,30 +391,12 @@ LH:5 LF:7 end_of_record' - assert_equals "$expected_result" "$(cat $(get_coverage_file_path_from_test_log))" - assert_equals "$expected_result" "$(cat bazel-out/_coverage/_coverage_report.dat)" + assert_equals "$expected_result" "$(cat $(get_coverage_file_path_from_test_log) | grep -v '^BR')" + assert_equals "$expected_result" "$(cat bazel-out/_coverage/_coverage_report.dat | grep -v '^BR')" } function test_coverage_with_tmp_in_path() { - local -r clang="/usr/bin/clang" - if [[ ! -x ${clang} ]]; then - return - fi - local -r clang_version=$(clang --version | grep -o "clang version [0-9]*" | cut -d " " -f 3) - if [ "$clang_version" -lt 9 ] || [ "$clang_version" -eq 10 ] || [ "$clang_version" -eq 11 ]; then - # No lcov produced with <9.0, no branch coverage with 10.0 and 11.0. - echo "clang versions <9.0 as well as 10.0 and 11.0 are not supported." && return - fi - - local -r llvm_profdata="/usr/bin/llvm-profdata" - if [[ ! -x ${llvm_profdata} ]]; then - return - fi - - local -r llvm_cov="/usr/bin/llvm-cov" - if [[ ! -x ${llvm_cov} ]]; then - return - fi + setup_llvm_coverage_tools_for_lcov || return 0 mkdir -p foo/tmp cat > foo/tmp/BUILD <<'EOF' @@ -490,20 +439,14 @@ int main(void) { } EOF - BAZEL_USE_LLVM_NATIVE_COVERAGE=1 GCOV=$llvm_profdata CC=$clang \ - BAZEL_LLVM_COV=$llvm_cov bazel coverage --experimental_generate_llvm_lcov \ - --combined_report=lcov --test_output=all \ - //foo/tmp:t --instrumentation_filter=// &>$TEST_log || fail "Coverage failed" + bazel coverage --combined_report=lcov --test_output=all \ + //foo/tmp:t --instrumentation_filter=// &>$TEST_log || fail "Coverage failed" local expected_result='SF:foo/tmp/a.cc FN:3,_Z1ab FNDA:1,_Z1ab FNF:1 FNH:1 -BRDA:4,0,0,1 -BRDA:4,0,1,0 -BRF:2 -BRH:1 DA:3,1 DA:4,1 DA:5,1 @@ -515,8 +458,8 @@ LH:5 LF:7 end_of_record' - assert_equals "$expected_result" "$(cat $(get_coverage_file_path_from_test_log))" - assert_equals "$expected_result" "$(cat bazel-out/_coverage/_coverage_report.dat)" + assert_equals "$expected_result" "$(cat $(get_coverage_file_path_from_test_log) | grep -v '^BR')" + assert_equals "$expected_result" "$(cat bazel-out/_coverage/_coverage_report.dat | grep -v '^BR')" } run_suite "test tests" \ No newline at end of file diff --git a/src/test/shell/bazel/remote/remote_execution_test.sh b/src/test/shell/bazel/remote/remote_execution_test.sh index 7bdcab96020deb..0d6e0af4212d5f 100755 --- a/src/test/shell/bazel/remote/remote_execution_test.sh +++ b/src/test/shell/bazel/remote/remote_execution_test.sh @@ -2457,6 +2457,150 @@ EOF fi } +# Runs coverage with `cc_test` using llvm-cov and RE, then checks that the coverage file is +# returned non-empty. +# See the above `test_java_rbe_coverage_produces_report` for more information. +function test_cc_rbe_coverage_produces_report_with_llvm() { + if [[ "$PLATFORM" == "darwin" ]]; then + # TODO(b/37355380): This test is disabled due to RemoteWorker not supporting + # setting SDKROOT and DEVELOPER_DIR appropriately, as is required of + # action executors in order to select the appropriate Xcode toolchain. + return 0 + fi + + local -r clang=$(which clang) + if [[ ! -x "${clang}" ]]; then + echo "clang not installed. Skipping" + return 0 + fi + local -r clang_version=$(clang --version | grep -o "clang version [0-9]*" | cut -d " " -f 3) + if [ "$clang_version" -lt 9 ]; then + # No lcov produced with <9.0. + echo "clang versions <9.0 are not supported, got $clang_version. Skipping." + return 0 + fi + + if ! type -P llvm-cov; then + echo "llvm-cov not found. Skipping." + return 0 + fi + if ! type -P llvm-profdata; then + echo "llvm-profdata not found. Skipping." + return 0 + fi + + local test_dir="a/cc/coverage_test" + mkdir -p $test_dir + + cat > "$test_dir"/BUILD <<'EOF' +package(default_visibility = ["//visibility:public"]) + +cc_library( + name = "hello-lib", + srcs = ["hello-lib.cc"], + hdrs = ["hello-lib.h"], +) + +cc_binary( + name = "hello-world", + srcs = ["hello-world.cc"], + deps = [":hello-lib"], +) + +cc_test( + name = "hello-test", + srcs = ["hello-world.cc"], + deps = [":hello-lib"], +) + +EOF + + cat > "$test_dir"/hello-lib.cc <<'EOF' +#include "hello-lib.h" + +#include + +using std::cout; +using std::endl; +using std::string; + +namespace hello { + +HelloLib::HelloLib(const string& greeting) : greeting_(new string(greeting)) { +} + +void HelloLib::greet(const string& thing) { + cout << *greeting_ << " " << thing << endl; +} + +} // namespace hello + +EOF + + cat > "$test_dir"/hello-lib.h <<'EOF' +#ifndef HELLO_LIB_H_ +#define HELLO_LIB_H_ + +#include +#include + +namespace hello { + +class HelloLib { + public: + explicit HelloLib(const std::string &greeting); + + void greet(const std::string &thing); + + private: + std::unique_ptr greeting_; +}; + +} // namespace hello + +#endif // HELLO_LIB_H_ + +EOF + + cat > "$test_dir"/hello-world.cc <<'EOF' +#include "hello-lib.h" + +#include + +using hello::HelloLib; +using std::string; + +int main(int argc, char** argv) { + HelloLib lib("Hello"); + string thing = "world"; + if (argc > 1) { + thing = argv[1]; + } + lib.greet(thing); + return 0; +} + +EOF + + BAZEL_USE_LLVM_NATIVE_COVERAGE=1 GCOV=llvm-profdata BAZEL_LLVM_COV=llvm-cov CC=clang \ + bazel coverage \ + --test_output=all \ + --experimental_fetch_all_coverage_outputs \ + --experimental_generate_llvm_lcov \ + --experimental_split_coverage_postprocessing \ + --spawn_strategy=remote \ + --remote_executor=grpc://localhost:${worker_port} \ + //"$test_dir":hello-test >& $TEST_log \ + || fail "Failed to run coverage for cc_test" + + # Different LLVM versions generate different outputs. + # Simply check if this is empty or not. + if [[ ! -s bazel-testlogs/a/cc/coverage_test/hello-test/coverage.dat ]]; then + echo "Coverage is empty. Failing now." + return 1 + fi +} + function test_grpc_connection_errors_are_propagated() { # Test that errors when creating grpc connection are propagated instead of crashing Bazel. # https://github.com/bazelbuild/bazel/issues/13724 diff --git a/tools/test/collect_cc_coverage.sh b/tools/test/collect_cc_coverage.sh index 91747c76521def..d043562680cddd 100755 --- a/tools/test/collect_cc_coverage.sh +++ b/tools/test/collect_cc_coverage.sh @@ -85,9 +85,7 @@ function llvm_coverage_lcov() { while read -r line; do if [[ ${line: -24} == "runtime_objects_list.txt" ]]; then while read -r line_runtime_object; do - if [[ -e "${RUNFILES_DIR}/${TEST_WORKSPACE}/${line_runtime_object}" ]]; then - object_param+=" -object ${RUNFILES_DIR}/${TEST_WORKSPACE}/${line_runtime_object}" - fi + object_param+=" -object ${line_runtime_object}" done < "${line}" fi done < "${COVERAGE_MANIFEST}"