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 fc9294dc99e1bb2980d186846a9c4fbf447e5198..b15ad94db90c009d833e8d0fb5899bc4e066bd39 100644 (file)
--- a/bin/tests/system/README
+++ b/bin/tests/system/README
@@ -662,15 +662,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.
-
-
 Maintenance Notes
 ===
 This section is aimed at developers maintaining BIND's system test framework.

diff --git a/bin/tests/system/cleanall.sh b/bin/tests/system/cleanall.sh
index 80fc3e0e1c64f60d24b1b8d11b145a0fb9cb1ad7..1ef2fcfc68cb1c39c842dce4e9c0ca0801d88db1 100644 (file)
--- a/bin/tests/system/cleanall.sh
+++ b/bin/tests/system/cleanall.sh
@@ -21,8 +21,7 @@ SYSTEMTESTTOP=.
 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 80d25eea82f5889e4981c6d509cef8a0e8e48428..8003d048b4bcc8b5ac422031df3d751d248761d8 100755 (executable)
--- a/bin/tests/system/start.pl
+++ b/bin/tests/system/start.pl
@@ -229,22 +229,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 -M external ";
+       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";