[DTrace-devel] [PATCH 1/4] test: Skip lockstat prior to 5.10

Kris Van Hees kris.van.hees at oracle.com
Tue Jan 23 05:03:31 UTC 2024


On Thu, Dec 14, 2023 at 05:21:16PM -0500, eugene.loh--- via DTrace-devel wrote:
> From: Eugene Loh <eugene.loh at oracle.com>
> 
> Turn off lockstat testing prior to 5.10 due to commit 197115e2
> "lockstat: refuse to provide probes on kernels < 5.10.0".
> 
> Signed-off-by: Eugene Loh <eugene.loh at oracle.com>

Reviewed-by: Kris Van Hees <kris.van.hees at oracle.com>

... modulo 2 very tiny whitespace issues (I'll correct them as I merge)
... and on OL7 this will need to be reverted because we have a backport there
    of the kernel patches that make lockstat work right

> ---
>  test/demo/lockstat/whatlock.x | 13 +++++++++++++
>  test/unittest/lockstat/test.x | 13 +++++++++++++
>  2 files changed, 26 insertions(+)
>  create mode 100755 test/demo/lockstat/whatlock.x
>  create mode 100755 test/unittest/lockstat/test.x
> 
> diff --git a/test/demo/lockstat/whatlock.x b/test/demo/lockstat/whatlock.x
> new file mode 100755
> index 00000000..39e0e752
> --- /dev/null
> +++ b/test/demo/lockstat/whatlock.x
> @@ -0,0 +1,13 @@
> +#!/bin/bash
> +  

There are spaces rather than an empty line above.

> +read MAJOR MINOR <<< `uname -r | grep -Eo '^[0-9]+\.[0-9]+' | tr '.' ' '`
> +
> +if [ $MAJOR -gt 5 ]; then
> +	exit 0
> +fi
> +if [ $MAJOR -eq 5 -a $MINOR -ge 10 ]; then
> +	exit 0
> +fi
> +
> +echo "lockstat disabled prior to 5.10"
> +exit 1
> diff --git a/test/unittest/lockstat/test.x b/test/unittest/lockstat/test.x
> new file mode 100755
> index 00000000..39e0e752
> --- /dev/null
> +++ b/test/unittest/lockstat/test.x
> @@ -0,0 +1,13 @@
> +#!/bin/bash
> +  

There are spaces rather than an empty line above.

> +read MAJOR MINOR <<< `uname -r | grep -Eo '^[0-9]+\.[0-9]+' | tr '.' ' '`
> +
> +if [ $MAJOR -gt 5 ]; then
> +	exit 0
> +fi
> +if [ $MAJOR -eq 5 -a $MINOR -ge 10 ]; then
> +	exit 0
> +fi
> +
> +echo "lockstat disabled prior to 5.10"
> +exit 1
> -- 
> 2.18.4
> 
> 
> _______________________________________________
> 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