Skip to content

csmock --embed-context: use csgrep-static in chroot #216

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

Closed
kdudka wants to merge 1 commit into from
Closed

csmock --embed-context: use csgrep-static in chroot #216

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
9 changes: 6 additions & 3 deletions csmock/csmock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ CSMOCK_DATADIR = "/usr/share/csmock"

CWE_MAP_FILE = CSMOCK_DATADIR + "/cwe-map.csv"

# path to the csgrep-static executable
CSGREP_STATIC = "/usr/libexec/csgrep-static"

CSMOCK_SCRIPTS = CSMOCK_DATADIR + "/scripts"

CHROOT_FIXUPS = CSMOCK_SCRIPTS + "/chroot-fixups"
Expand Down Expand Up @@ -958,8 +961,8 @@ exceeds the specified limit (defaults to 1024).")
props.kfp_git_url = args.kfp_git_url

if props.embed_context > 0:
# we need 'csgrep --embed-context' to work in the chroot for --embed-context
props.install_opt_pkgs += ["csdiff"]
# we need csgrep-static in the chroot for --embed-context
props.copy_in_files += [CSGREP_STATIC]

if args.warning_rate_limit > 0:
props.results_limits_opts += [f"--warning-rate-limit={args.warning_rate_limit}"]
Expand Down Expand Up @@ -1289,7 +1292,7 @@ cd %%s*/ || cd *\n\
if props.embed_context > 0:
# embed context lines from source program files
tmp_file = f"{all_file}.tmp"
csgrep_cmd = f"csgrep --mode=json --embed-context {props.embed_context}"
csgrep_cmd = f"{CSGREP_STATIC} --mode=json --embed-context {props.embed_context}"

if props.results_limits_opts:
# apply results limits already while embedding context to avoid creating excessively huge output
Expand Down
1 change: 1 addition & 0 deletions make-srpm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ Tool for plugging static analyzers into the build process, free of mock.
%package common
Summary: Core of csmock (a mock wrapper for Static Analysis tools)
Requires: csdiff > 3.5.1
Requires: csdiff-static
Requires: csgcca
Requires: cswrap
Requires: mock >= 5.7
Expand Down