Skip to content

fix: Output parity between per-file and monolithic rule #346

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

Open
furtib wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Output parity between per-file and monolithic rule #346

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
6 changes: 3 additions & 3 deletions src/per_file.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def _run_code_checker(
compilation_context,
sources_and_headers):
# Define Plist and log file names
data_dir = ctx.attr.name + "/data"
data_dir = ctx.attr.name + "/codechecker-files/data"
file_name_params = (data_dir, src.path.replace("/", "-"))
clang_tidy_plist_file_name = "{}/{}_clang-tidy.plist".format(*file_name_params)
clangsa_plist_file_name = "{}/{}_clangsa.plist".format(*file_name_params)
Expand Down Expand Up @@ -243,8 +243,8 @@ def _per_file_impl(ctx):
# ls -la $DATA_DIR/data
# find $DATA_DIR/data -name *.plist -exec sed -i -e "s|<string>.*execroot/codechecker_bazel/|<string>|g" {{}} \\;
# cat $DATA_DIR/data/test-src-lib.cc_clangsa.plist
echo "Running: CodeChecker parse $DATA_DIR/data"
$(realpath {codechecker}) parse $DATA_DIR/data
echo "Running: CodeChecker parse $DATA_DIR/codechecker-files/data"
$(realpath {codechecker}) parse $DATA_DIR/codechecker-files/data
""".format(dirname = ctx.outputs.test_script.short_path, codechecker = info.codechecker.short_path),
)
files = depset(
Expand Down
2 changes: 1 addition & 1 deletion test/unit/config/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ unit_test(
"CC_TEST_LIST=1; 2; 3;",
],
data = [":per_file_env"],
files = "test/unit/config/per_file_env/data/test-unit-config-zero_div.cc_codechecker.log",
files = "test/unit/config/per_file_env/codechecker-files/data/test-unit-config-zero_div.cc_codechecker.log",
)

# None of these codechecker rules should find any issues
Expand Down
4 changes: 2 additions & 2 deletions test/unit/generated_files/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ unit_test(
],
data = [":per_file_genrule_header"],
excludes = "genrule_source.cc",
files = "test/unit/generated_files/per_file_genrule_header/data/test-unit-generated_files-genrule_header_consumer.cc_clangsa.plist",
files = "test/unit/generated_files/per_file_genrule_header/codechecker-files/data/test-unit-generated_files-genrule_header_consumer.cc_clangsa.plist",
)

unit_test(
Expand All @@ -148,7 +148,7 @@ unit_test(
"core.DivideZero",
],
data = [":per_file_genrule_source"],
files = "test/unit/generated_files/per_file_genrule_source/data/bazel-out-k8-fastbuild-bin-test-unit-generated_files-genrule_source.cc_clangsa.plist",
files = "test/unit/generated_files/per_file_genrule_source/codechecker-files/data/bazel-out-k8-fastbuild-bin-test-unit-generated_files-genrule_source.cc_clangsa.plist",
)

unit_test(
Expand Down
4 changes: 2 additions & 2 deletions test/unit/metadata/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ unit_test(
contains = [r"\"action_num\": 1,"],
data = [":per_file_multiple_source"],
files = [
"test/unit/metadata/per_file_multiple_source/data/test-unit-metadata-main.cc_metadata.json",
"test/unit/metadata/per_file_multiple_source/data/test-unit-metadata-other.cc_metadata.json",
"test/unit/metadata/per_file_multiple_source/codechecker-files/data/test-unit-metadata-main.cc_metadata.json",
"test/unit/metadata/per_file_multiple_source/codechecker-files/data/test-unit-metadata-other.cc_metadata.json",
],
)
6 changes: 3 additions & 3 deletions test/unit/skip/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ unit_test(
contains = ["analyzed skip2.cc successfully"],
data = [":per_file_skipfile_exact_file_path"],
excludes = ["analyzed skip.cc successfully"],
files = ["test/unit/skip/per_file_skipfile_exact_file_path/data/*.log"],
files = ["test/unit/skip/per_file_skipfile_exact_file_path/codechecker-files/data/*.log"],
require_patterns_in_each_file = False,
)

Expand All @@ -112,7 +112,7 @@ unit_test(
contains = ["analyzed skip2.cc successfully"],
data = [":per_file_skipfile_folder_skip_path"],
excludes = ["analyzed skip.cc successfully"],
files = ["test/unit/skip/per_file_skipfile_folder_skip_path/data/*.log"],
files = ["test/unit/skip/per_file_skipfile_folder_skip_path/codechecker-files/data/*.log"],
require_patterns_in_each_file = False,
)

Expand All @@ -121,6 +121,6 @@ unit_test(
contains = ["analyzed skip.cc successfully"],
data = [":per_file_skipfile_both_files_except_one"],
excludes = ["analyzed skip2.cc successfully"],
files = ["test/unit/skip/per_file_skipfile_both_files_except_one/data/*.log"],
files = ["test/unit/skip/per_file_skipfile_both_files_except_one/codechecker-files/data/*.log"],
require_patterns_in_each_file = False,
)
Loading