Skip to content

Adjusted valgrind-check and static-check tests to run in more environments #6039

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
craigcomstock wants to merge 3 commits into
base: master
Choose a base branch
from
+6 −3
Open

Adjusted valgrind-check and static-check tests to run in more environments #6039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
070b450
Added safeguard to static-check runner in case of 1 proc host
craigcomstock Feb 10, 2026
95843ae
Revert "Fixed NULL pointer dereference in AddSimpleUidItem() and AddS…
craigcomstock Feb 10, 2026
a7cc8f4
Adjusted startup timeout for valgrind-checks test to 4 minutes from 2
craigcomstock Feb 11, 2026
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
4 changes: 2 additions & 2 deletions libpromises/conversion.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,7 @@ static void AddSimpleUidItem(UidList ** uidlist, uid_t uid, char *uidname)

ulp->uid = uid;

if (uid == CF_UNKNOWN_OWNER && uidname != NULL) /* unknown user */
if (uid == CF_UNKNOWN_OWNER) /* unknown user */
{
ulp->uidname = xstrdup(uidname);
}
Expand Down Expand Up @@ -1019,7 +1019,7 @@ static void AddSimpleGidItem(GidList ** gidlist, gid_t gid, char *gidname)

glp->gid = gid;

if (gid == CF_UNKNOWN_GROUP && gidname != NULL) /* unknown group */
if (gid == CF_UNKNOWN_GROUP) /* unknown group */
{
glp->gidname = xstrdup(gidname);
}
Expand Down
3 changes: 3 additions & 0 deletions tests/static-check/run_checks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ set -x

n_procs="$(getconf _NPROCESSORS_ONLN)"
use_procs=$((n_procs/2))
if [ "$use_procs" -lt "0" ]; then
use_procs=1
fi

function check_with_gcc() {
# previous runs may have cached configuration based on a different CC
Expand Down
2 changes: 1 addition & 1 deletion tests/valgrind-check/valgrind.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ print_ps
# cf-serverd running under valgrind can be really slow to start, let's give it
# some time before we move on and potentially hit the wall if it's actually
# malfunctioning
tries=12 # max 2 minutes
tries=24 # max 4 minutes
while /var/cfengine/bin/cf-net -H $BOOTSTRAP_IP connect | grep Failed; do
tries=$((tries - 1))
if [ $tries -le 0 ]; then
Expand Down
Loading