Remove support for running system tests under Valgrind

Valgrind support has been scarcely used.

(cherry picked from commit 658d62a6f49b0322c02f162d55468a5e7af0869f)

diff --git a/bin/tests/system/README b/bin/tests/system/README
index 00146be307a8377b6feb38b2ed25241dfc03054e..58e6048ae02a9de033378df3e7dde8b862f27841 100644 (file)
--- a/bin/tests/system/README
+++ b/bin/tests/system/README
@@ -710,14 +710,6 @@ or SEQUENTIAL variables.
 need to edit multiple files to add a test.)
 
 
-Valgrind
----
-When running system tests, named can be run under Valgrind.  The output from
-Valgrind are sent to per-process files that can be reviewed after the test has
-completed.  To enable this, set the USE_VALGRIND environment variable to
-"helgrind" to run the Helgrind tool, or any other value to run the Memcheck
-tool.  To use "helgrind" effectively, build BIND with --disable-atomic.
-
 Developer Notes for pytest runner
 ===
 

diff --git a/bin/tests/system/cleanall.sh b/bin/tests/system/cleanall.sh
index 21d1c040b96df8ddf97da2ae22122c900bc34da8..a7e48ad7bd66e1c56cd961608bc24fa42dc43a51 100644 (file)
--- a/bin/tests/system/cleanall.sh
+++ b/bin/tests/system/cleanall.sh
@@ -20,8 +20,7 @@
 find . -type f \( \
   -name '*~' -o -name 'core' -o -name '*.core' \
   -o -name '*.log' -o -name '*.pid' -o -name '*.keyset' \
-  -o -name named.run -o -name ans.run \
-  -o -name '*-valgrind-*.log' \) -print | xargs rm -f
+  -o -name named.run -o -name ans.run \) -print | xargs rm -f
 
 status=0
 

diff --git a/bin/tests/system/start.pl b/bin/tests/system/start.pl
index 2a2d7809f7d059e972d74af958a1916aeb01def1..c0163a2a2300b053b68ab1187031351d0a20c6d3 100755 (executable)
--- a/bin/tests/system/start.pl
+++ b/bin/tests/system/start.pl
@@ -230,22 +230,10 @@ sub construct_ns_command {
 
        my $command;
 
-       if ($ENV{'USE_VALGRIND'}) {
-               $command = "valgrind -q --gen-suppressions=all --num-callers=48 --fullpath-after= --log-file=named-$server-valgrind-%p.log ";
-
-               if ($ENV{'USE_VALGRIND'} eq 'helgrind') {
-                       $command .= "--tool=helgrind ";
-               } else {
-                       $command .= "--tool=memcheck --track-origins=yes --leak-check=full ";
-               }
-
-               $command .= "$NAMED -m none ";
+       if ($taskset) {
+               $command = "taskset $taskset $NAMED ";
        } else {
-               if ($taskset) {
-                       $command = "taskset $taskset $NAMED ";
-               } else {
-                       $command = "$NAMED ";
-               }
+               $command = "$NAMED ";
        }
 
        my $args_file = $testdir . "/" . $server . "/" . "named.args";