Skip to content

Commit 02af127

Browse files
committed
---
yaml --- r: 210467 b: refs/heads/try c: fc7faaf h: refs/heads/master i: 210465: f724a1d 210463: 8ebf168 v: v3
1 parent 4d70888 commit 02af127

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
5-
refs/heads/try: b982a751f41c2611dff66c62a03384eafb109ed5
5+
refs/heads/try: fc7faafae714e713bbe77ea6c784ae400bc0e95d
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/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)