Skip to content

Commit fc7faaf

Browse files
committed
configure: Fail iff valgrind is explicitly requested but not available
1 parent b982a75 commit fc7faaf

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

configure

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -737,8 +737,14 @@ fi
737737
# only disabled if you opt out.
738738
if [ -z "$CFG_VALGRIND" ]
739739
then
740-
CFG_DISABLE_VALGRIND_RPASS=1
741-
putvar CFG_DISABLE_VALGRIND_RPASS
740+
# If the user has explicitly asked for valgrind tests, then fail
741+
if [ -n "$CFG_ENABLE_VALGRIND" ] && [ -n "$CFG_ENABLE_VALGRIND_PROVIDED" ]
742+
then
743+
err "No valgrind present, but valgrind tests explicitly requested"
744+
else
745+
CFG_DISABLE_VALGRIND_RPASS=1
746+
putvar CFG_DISABLE_VALGRIND_RPASS
747+
fi
742748
fi
743749

744750
if [ ! -z "$CFG_GDB" ]

0 commit comments

Comments
 (0)