From aeb1fa3dfbf4a4b7384f8f2bc5a18a23e741396e Mon Sep 17 00:00:00 2001
From: David Steele <david@pgmasters.net>
Date: Thu, 13 Sep 2018 19:12:40 -0400
Subject: [PATCH] Don't perform valgrind when requested.

The --no-valgrind flag was not being honored.  It's not clear if this flag ever worked, but it does now.
---
 doc/xml/release.xml                       | 4 ++++
 test/lib/pgBackRestTest/Common/JobTest.pm | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index 56934835e..ba56f0439 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -105,6 +105,10 @@
                         <p>Make Valgrind return an error even when a non-fatal issue is detected.  Update some minor issues discovered in the tests as a result.</p>
                     </release-item>
 
+                    <release-item>
+                        <p>Don't perform valgrind when requested.</p>
+                    </release-item>
+
                     <release-item>
                         <p>Fix typo in unit test error messages, EXECTED => EXPECTED.</p>
                     </release-item>
diff --git a/test/lib/pgBackRestTest/Common/JobTest.pm b/test/lib/pgBackRestTest/Common/JobTest.pm
index 12b7c70bc..d552af903 100644
--- a/test/lib/pgBackRestTest/Common/JobTest.pm
+++ b/test/lib/pgBackRestTest/Common/JobTest.pm
@@ -236,8 +236,8 @@ sub run
             $strCommand =
                 'docker exec -i -u ' . TEST_USER . " ${strImage} bash -l -c '" .
                 "cd $self->{strGCovPath} && " .
-                "make -s 2>&1 && " .
-                ($self->{oTest}->{&TEST_VM} ne VM_CO6 ?
+                "make -s 2>&1 &&" .
+                ($self->{oTest}->{&TEST_VM} ne VM_CO6 && $self->{bValgrindUnit}?
                     " valgrind -q --gen-suppressions=all --suppressions=$self->{strBackRestBase}/test/src/valgrind.suppress" .
                     " --leak-check=full --leak-resolution=high --error-exitcode=25" : '') .
                 " ./test 2>&1'";