[DTrace-devel] [PATCH v2 7/9] runtest: remove obsolete kernel coverage data collection

[Nick Alcock]

The DTrace kernel module is long dead: we don't need kernel coverage any
more.  Delete the example runtest.conf as well, and drop loading it, since
it served no purpose but to point to the kernel tree used for coverage.

Signed-off-by: Nick Alcock <nick.alcock at oracle.com>
---
 runtest.conf.example | 10 ----------
 runtest.sh           | 28 ----------------------------
 2 files changed, 38 deletions(-)
 delete mode 100644 runtest.conf.example

diff --git a/runtest.conf.example b/runtest.conf.example
deleted file mode 100644
index c92aa6b96cff..000000000000
--- a/runtest.conf.example
+++ /dev/null
@@ -1,10 +0,0 @@
-# Test configuration file.
-#
-# Copy this file to runtest.conf and edit it.
-
-# Kernel build directory.
-#
-# If this is not specified, kernel test coverage information will not
-# be available.
-
-# KERNEL_BUILD_DIR=
diff --git a/runtest.sh b/runtest.sh
index 817f4a90487d..16a1a77bd394 100755
--- a/runtest.sh
+++ b/runtest.sh
@@ -21,8 +21,6 @@ export LC_COLLATE="C"
 
 arch="$(uname -m)"
 
-[[ -f ./runtest.conf ]] && . ./runtest.conf
-
 load_modules()
 {
     # If running as root, pull in appropriate modules
@@ -644,15 +642,6 @@ if [[ -n $NOBADDOF ]]; then
                  --quiet -o $logdir/coverage/initial.lcov 2>/dev/null
         fi
     done
-
-    if [[ -n $KERNEL_BUILD_DIR ]] && [[ -d $KERNEL_BUILD_DIR ]] &&
-       [[ -d /sys/kernel/debug/gcov/$KERNEL_BUILD_DIR/kernel/dtrace ]]; then
-            rm -rf $KERNEL_BUILD_DIR/coverage
-            mkdir -p $KERNEL_BUILD_DIR/coverage
-            lcov --zerocounters --quiet
-            lcov --capture --base-directory $KERNEL_BUILD_DIR --initial \
-                 --quiet -o $KERNEL_BUILD_DIR/coverage/initial.lcov 2>/dev/null
-    fi
 fi
 
 load_modules
@@ -1592,23 +1581,6 @@ for name in build*; do
     fi
 done
 
-if [[ -n $KERNEL_BUILD_DIR ]] && [[ -d $KERNEL_BUILD_DIR ]] &&
-       [[ -d /sys/kernel/debug/gcov/$KERNEL_BUILD_DIR/kernel/dtrace ]]; then
-    force_out "Coverage info for kernel:\n"
-
-    lcov --capture --base-directory $KERNEL_BUILD_DIR \
-         --quiet -o $KERNEL_BUILD_DIR/coverage/coverage.lcov
-    lcov --add-tracefile $KERNEL_BUILD_DIR/coverage/initial.lcov \
-         --add-tracefile $KERNEL_BUILD_DIR/coverage/coverage.lcov \
-         --quiet -o $KERNEL_BUILD_DIR/coverage/coverage.lcov
-
-    genhtml --frames --show-details -o $KERNEL_BUILD_DIR/coverage \
-            --title "DTrace kernel coverage" --highlight --legend \
-            $KERNEL_BUILD_DIR/coverage/coverage.lcov | \
-        awk 'BEGIN { quiet=1; } { if (!quiet) { print ($0); } } /^Overall coverage rate:$/ { quiet=0; }' | \
-        tee -a $LOGFILE $SUMFILE
-fi
-
 if [[ -n $ERRORS ]]; then
     exit 1
 fi
-- 
2.46.0.277.ge12b8151ed