Re: [DTrace-devel] [PATCH v2 26/38] test: Clean up zero-size speculation + chill()

Kris Van Hees
2024-10-31T05:34:44Z

On Tue, Oct 29, 2024 at 05:16:43PM -0400, eugene.loh--- via DTrace-devel wrote:
> From: Eugene Loh <eugene.loh@oracle.com>
>
> The chill() action is not yet supported, but it also is not needed
> for the test. Therefore, remove the chill() from the legacy test.
>
> But we do not want to diminish test coverage. Therefore, make a
> copy of the test that keeps the chill (and annotates its XFAIL
> more clearly).
>
> Signed-off-by: Eugene Loh <eugene.loh@oracle.com>

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

> ---
> .../unittest/speculation/tst.zerosize-chill.d | 34 +++++++++++++++++++
> .../unittest/speculation/tst.zerosize-chill.r | 6 ++++
> test/unittest/speculation/tst.zerosize.d | 7 +---
> test/unittest/speculation/tst.zerosize.r | 1 -
> 4 files changed, 41 insertions(+), 7 deletions(-)
> create mode 100644 test/unittest/speculation/tst.zerosize-chill.d
> create mode 100644 test/unittest/speculation/tst.zerosize-chill.r
>
> diff --git a/test/unittest/speculation/tst.zerosize-chill.d b/test/unittest/speculation/tst.zerosize-chill.d
> new file mode 100644
> index 000000000..ac63bbfa6
> --- /dev/null
> +++ b/test/unittest/speculation/tst.zerosize-chill.d
> @@ -0,0 +1,34 @@
> +/*
> + * Oracle Linux DTrace.
> + * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
> + * Licensed under the Universal Permissive License v 1.0 as shown at
> + * http://oss.oracle.com/licenses/upl.
> + */
> +
> +/* @@xfail: dtv2, chill not implemented yet */
> +
> +#pragma D option destructive
> +
> +BEGIN
> +{
> + self->spec = speculation();
> + speculate(self->spec);
> +}
> +
> +BEGIN
> +{
> + this->one = 1;
> + this->two = 2;
> + chill(1);
> + speculate(self->spec);
> +}
> +
> +BEGIN
> +{
> + speculate(self->spec);
> +}
> +
> +BEGIN
> +{
> + exit(0);
> +}
> diff --git a/test/unittest/speculation/tst.zerosize-chill.r b/test/unittest/speculation/tst.zerosize-chill.r
> new file mode 100644
> index 000000000..4fe802e01
> --- /dev/null
> +++ b/test/unittest/speculation/tst.zerosize-chill.r
> @@ -0,0 +1,6 @@
> + FUNCTION:NAME
> + :BEGIN
> +
> +-- @@stderr --
> +dtrace: script 'test/unittest/speculation/tst.zerosize-chill.d' matched 4 probes
> +dtrace: allowing destructive actions
> diff --git a/test/unittest/speculation/tst.zerosize.d b/test/unittest/speculation/tst.zerosize.d
> index 56c1fcea3..ec75381e4 100644
> --- a/test/unittest/speculation/tst.zerosize.d
> +++ b/test/unittest/speculation/tst.zerosize.d
> @@ -1,14 +1,10 @@
> /*
> * Oracle Linux DTrace.
> - * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
> + * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
> * Licensed under the Universal Permissive License v 1.0 as shown at
> * http://oss.oracle.com/licenses/upl.
> */
>
> -/* @@xfail: dtv2 */
> -
> -#pragma D option destructive
> -
> BEGIN
> {
> self->spec = speculation();
> @@ -19,7 +15,6 @@ BEGIN
> {
> this->one = 1;
> this->two = 2;
> - chill(1);
> speculate(self->spec);
> }
>
> diff --git a/test/unittest/speculation/tst.zerosize.r b/test/unittest/speculation/tst.zerosize.r
> index 7dfba9727..5ed9cb183 100644
> --- a/test/unittest/speculation/tst.zerosize.r
> +++ b/test/unittest/speculation/tst.zerosize.r
> @@ -3,4 +3,3 @@
>
> -- @@stderr --
> dtrace: script 'test/unittest/speculation/tst.zerosize.d' matched 4 probes
> -dtrace: allowing destructive actions
> --
> 2.43.5
>
>
> _______________________________________________
> DTrace-devel mailing list
> DTrace-devel@oss.oracle.com
> https://oss.oracle.com/mailman/listinfo/dtrace-devel