[DTrace-devel] [PATCH 7/9] tests: delete the kernel build dir stuff

Kris Van Hees kris.van.hees at oracle.com
Wed Jul 31 19:22:51 UTC 2024


The subject line does not (to me) convey what this patch actually does.  It
would be more clear to perhaps say something like "test: remove obsolete
kernel coverage data collection'

On Fri, May 31, 2024 at 07:59:26PM +0100, Nick Alcock via DTrace-devel wrote:
> The DTrace kernel module is long dead: we don't need kernel coverage any
> more.  Delete the example runtest.conf as well (but do not delete the
> loading runtest.conf: we are about to use it for another purpose).
> 
> Signed-off-by: Nick Alcock <nick.alcock at oracle.com>
> ---
>  runtest.conf.example | 10 ----------
>  runtest.sh           | 26 --------------------------
>  2 files changed, 36 deletions(-)
>  delete mode 100644 runtest.conf.example
> 
> diff --git a/runtest.conf.example b/runtest.conf.example
> deleted file mode 100644
> index c92aa6b96cff6..0000000000000
> --- 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 817f4a90487d9..d9b7c02c06a3e 100755
> --- a/runtest.sh
> +++ b/runtest.sh
> @@ -644,15 +644,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 +1583,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.45.1.275.g567cb0950c
> 
> 
> _______________________________________________
> DTrace-devel mailing list
> DTrace-devel at oss.oracle.com
> https://oss.oracle.com/mailman/listinfo/dtrace-devel



More information about the DTrace-devel mailing list