Skip to content

configure: Disable rpass-valgrind when there's no valgrind #24859

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

Merged
merged 4 commits into from
May 9, 2015
Merged

configure: Disable rpass-valgrind when there's no valgrind #24859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8ea78b
configure: generic run command
richo Apr 27, 2015
b982a75
configure: Disable valgrind-rpass if there's no valgrind
richo Apr 27, 2015
fc7faaf
configure: Fail iff valgrind is explicitly requested but not available
richo Apr 28, 2015
01fc026
mk: Log that valgrind tests are disabled
richo May 8, 2015
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
28 changes: 22 additions & 6 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ err() {
exit 1
}

run() {
msg "$@"
"$@"
}

need_ok() {
if [ $? -ne 0 ]
then
Expand All @@ -36,8 +41,7 @@ need_cmd() {
make_dir() {
if [ ! -d $1 ]
then
msg "mkdir -p $1"
mkdir -p $1
run mkdir -p $1
fi
}

Expand All @@ -46,8 +50,7 @@ copy_if_changed() {
then
msg "leaving $2 unchanged"
else
msg "cp $1 $2"
cp -f $1 $2
run cp -f $1 $2
chmod u-w $2 # make copied artifact read-only
fi
}
Expand All @@ -57,8 +60,7 @@ move_if_changed() {
then
msg "leaving $2 unchanged"
else
msg "mv $1 $2"
mv -f $1 $2
run mv -f $1 $2
chmod u-w $2 # make moved artifact read-only
fi
}
Expand Down Expand Up @@ -731,6 +733,20 @@ then
probe CFG_JAVAC javac
fi

# the valgrind rpass tests will fail if you don't have a valgrind, but they're
# only disabled if you opt out.
if [ -z "$CFG_VALGRIND" ]
then
# If the user has explicitly asked for valgrind tests, then fail
if [ -n "$CFG_ENABLE_VALGRIND" ] && [ -n "$CFG_ENABLE_VALGRIND_PROVIDED" ]
then
err "No valgrind present, but valgrind tests explicitly requested"
else
CFG_DISABLE_VALGRIND_RPASS=1
putvar CFG_DISABLE_VALGRIND_RPASS
fi
fi

if [ ! -z "$CFG_GDB" ]
then
# Store GDB's version
Expand Down
1 change: 1 addition & 0 deletions mk/main.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ ifndef CFG_DISABLE_VALGRIND_RPASS
$(info cfg: valgrind-rpass command set to $(CFG_VALGRIND))
CFG_VALGRIND_RPASS :=$(CFG_VALGRIND)
else
$(info cfg: disabling valgrind run-pass tests)
CFG_VALGRIND_RPASS :=
endif

Expand Down