File tree Expand file tree Collapse file tree 2 files changed +9
-3
lines changed Expand file tree Collapse file tree 2 files changed +9
-3
lines changed Original file line number Diff line number Diff line change 2
2
refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
4
refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
5
- refs/heads/try: b982a751f41c2611dff66c62a03384eafb109ed5
5
+ refs/heads/try: fc7faafae714e713bbe77ea6c784ae400bc0e95d
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
8
8
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
Original file line number Diff line number Diff line change 737
737
# only disabled if you opt out.
738
738
if [ -z " $CFG_VALGRIND " ]
739
739
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
742
748
fi
743
749
744
750
if [ ! -z " $CFG_GDB " ]
You can’t perform that action at this time.
0 commit comments