[DTrace-devel] [PATCH v2 5/5] Mark tests expected to PASS with basic aggregation support
Kris Van Hees
kris.van.hees at oracle.com
Mon Nov 30 14:00:13 PST 2020
On Mon, Nov 30, 2020 at 03:44:27PM -0500, Kris Van Hees wrote:
> On Mon, Nov 30, 2020 at 12:13:11PM -0800, Eugene Loh wrote:
> > First of all, this patch should be squashed into the previous one so
> > that there is not a "regression" in testing between two consecutive
> > patches that go together. Also...
> >
> > On 11/24/2020 01:50 PM, Kris Van Hees wrote:
> >
> > > Signed-off-by: Kris Van Hees <kris.van.hees at oracle.com>
> > > ---
> > > test/unittest/aggs/err.D_AGG_NULL.bad.d | 4 +---
> > > test/unittest/aggs/err.D_AGG_REDEF.redef.d | 3 +--
> > > test/unittest/aggs/err.D_AGG_SCALAR.avgtoofew.d | 3 +--
> > > test/unittest/aggs/err.D_AGG_SCALAR.maxnoarg.d | 3 +--
> > > test/unittest/aggs/err.D_AGG_SCALAR.mintoofew.d | 3 +--
> > > test/unittest/aggs/err.D_AGG_SCALAR.quantizetoofew.d | 3 +--
> > > test/unittest/aggs/err.D_AGG_SCALAR.sumtoofew.d | 3 +--
> > > test/unittest/aggs/err.D_LLQUANT_MATCHFACTOR.d | 3 +--
> > > test/unittest/aggs/err.D_LLQUANT_MATCHHMAG.d | 3 +--
> > > test/unittest/aggs/err.D_LLQUANT_MATCHLMAG.d | 3 +--
> > > test/unittest/aggs/err.D_LLQUANT_MATCHSTEPS.d | 3 +--
> > > test/unittest/aggs/err.D_LQUANT_MATCHBASE.d | 3 +--
> > > test/unittest/aggs/err.D_LQUANT_MATCHBASE.order.d | 3 +--
> > > test/unittest/aggs/err.D_LQUANT_MATCHLIM.d | 3 +--
> > > test/unittest/aggs/err.D_LQUANT_MATCHLIM.order.d | 3 +--
> > > test/unittest/aggs/err.D_LQUANT_MATCHSTEP.d | 3 +--
> > > test/unittest/aggs/err.D_PROTO_LEN.llquantizetoomany.d | 3 +--
> > > test/unittest/aggs/err.D_PROTO_LEN.lquantizetoomany.d | 3 +--
> > > test/unittest/aggs/err.D_PROTO_LEN.quantizetoomany.d | 3 +--
> > > test/unittest/printf/err.D_PRINTF_ARG_TYPE.aggarg.d | 2 +-
> > > 20 files changed, 20 insertions(+), 40 deletions(-)
> > >
> > > diff --git a/test/unittest/aggs/err.D_AGG_NULL.bad.d b/test/unittest/aggs/err.D_AGG_NULL.bad.d
> > > index 8ebedff9..1be86b28 100644
> > > --- a/test/unittest/aggs/err.D_AGG_NULL.bad.d
> > > +++ b/test/unittest/aggs/err.D_AGG_NULL.bad.d
> > > @@ -1,10 +1,9 @@
> > > /*
> > > * Oracle Linux DTrace.
> > > - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
> > > + * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
> >
> > Why is 2020 being added? No IP is changing.
> >
> > Further, all that's happening is that an xfail annotation, which itself
> > was added in 2020, is being backed out. The content remains the same as
> > before 2020.
> >
> > Same for a number of other files.
>
> The file was edited in 2020. Customary practice has been that when a file is
> modified in any way (or copied or whatever) the copyright data is updated to
> indicate the year the file was touched last.
>
> > > * Licensed under the Universal Permissive License v 1.0 as shown at
> > > * http://oss.oracle.com/licenses/upl.
> > > */
> > > -/* @@xfail: dtv2 */
> > >
> > > /*
> > > * ASSERTION:
> > > @@ -16,7 +15,6 @@
> > >
> > > BEGIN
> > > {
> > > -
> > > @a[1];
> > > }
> >
> > My impression was that, since those indices were not currently working,
> > you wanted to remove them from aggregation tests. We can discussion
> > whether or not that's a good change to make for a temporary limitation,
> > but if it's a good idea then why isn't it applied here. (I understand
> > that this err test doesn't require such a change. It's just that if
> > removing indices elsewhere is a good idea, I would think one would
> > believe the same here too.)
>
> Yes, I think I mentioned elsewhere (though I have misremember) that indexed
> aggregations were used in many tests and that I still wanted to go through the
> tests to get rid of those in places where they are not needed. So, yes, this
> is an oversight. Corrected.
Actually, I was wrong on this one. The indexing was left in on purpose
because in this case it *is* needed to ensure we trigger the correct
error condition.
I'll add two tests though to cover two additional cases.
> > > diff --git a/test/unittest/aggs/err.D_AGG_REDEF.redef.d b/test/unittest/aggs/err.D_AGG_REDEF.redef.d
> > > index 09f35d3e..d009628d 100644
> > > --- a/test/unittest/aggs/err.D_AGG_REDEF.redef.d
> > > +++ b/test/unittest/aggs/err.D_AGG_REDEF.redef.d
> > > @@ -1,10 +1,9 @@
> > > /*
> > > * Oracle Linux DTrace.
> > > - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
> > > + * Copyright (c) 2006, 2020, 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 */
> > >
> > > /*
> > > * ASSERTION:
> > > diff --git a/test/unittest/aggs/err.D_AGG_SCALAR.avgtoofew.d b/test/unittest/aggs/err.D_AGG_SCALAR.avgtoofew.d
> > > index b85ed4ec..9ea1640e 100644
> > > --- a/test/unittest/aggs/err.D_AGG_SCALAR.avgtoofew.d
> > > +++ b/test/unittest/aggs/err.D_AGG_SCALAR.avgtoofew.d
> > > @@ -1,10 +1,9 @@
> > > /*
> > > * Oracle Linux DTrace.
> > > - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
> > > + * Copyright (c) 2006, 2020, 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 */
> > >
> > > /*
> > > * ASSERTION:
> > > diff --git a/test/unittest/aggs/err.D_AGG_SCALAR.maxnoarg.d b/test/unittest/aggs/err.D_AGG_SCALAR.maxnoarg.d
> > > index 55a833b8..d8ba6881 100644
> > > --- a/test/unittest/aggs/err.D_AGG_SCALAR.maxnoarg.d
> > > +++ b/test/unittest/aggs/err.D_AGG_SCALAR.maxnoarg.d
> > > @@ -1,10 +1,9 @@
> > > /*
> > > * Oracle Linux DTrace.
> > > - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
> > > + * Copyright (c) 2006, 2020, 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 */
> > >
> > > /*
> > > * ASSERTION:
> > > diff --git a/test/unittest/aggs/err.D_AGG_SCALAR.mintoofew.d b/test/unittest/aggs/err.D_AGG_SCALAR.mintoofew.d
> > > index 97d0fe44..97bf1ea7 100644
> > > --- a/test/unittest/aggs/err.D_AGG_SCALAR.mintoofew.d
> > > +++ b/test/unittest/aggs/err.D_AGG_SCALAR.mintoofew.d
> > > @@ -1,10 +1,9 @@
> > > /*
> > > * Oracle Linux DTrace.
> > > - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
> > > + * Copyright (c) 2006, 2020, 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 */
> > >
> > > /*
> > > * ASSERTION:
> > > diff --git a/test/unittest/aggs/err.D_AGG_SCALAR.quantizetoofew.d b/test/unittest/aggs/err.D_AGG_SCALAR.quantizetoofew.d
> > > index 08a7dd0a..a9b9804d 100644
> > > --- a/test/unittest/aggs/err.D_AGG_SCALAR.quantizetoofew.d
> > > +++ b/test/unittest/aggs/err.D_AGG_SCALAR.quantizetoofew.d
> > > @@ -1,10 +1,9 @@
> > > /*
> > > * Oracle Linux DTrace.
> > > - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
> > > + * Copyright (c) 2006, 2020, 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 */
> > >
> > > /*
> > > * ASSERTION:
> > > diff --git a/test/unittest/aggs/err.D_AGG_SCALAR.sumtoofew.d b/test/unittest/aggs/err.D_AGG_SCALAR.sumtoofew.d
> > > index 3a18fe2c..306902b2 100644
> > > --- a/test/unittest/aggs/err.D_AGG_SCALAR.sumtoofew.d
> > > +++ b/test/unittest/aggs/err.D_AGG_SCALAR.sumtoofew.d
> > > @@ -1,10 +1,9 @@
> > > /*
> > > * Oracle Linux DTrace.
> > > - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
> > > + * Copyright (c) 2006, 2020, 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 */
> > >
> > > /*
> > > * ASSERTION:
> > > diff --git a/test/unittest/aggs/err.D_LLQUANT_MATCHFACTOR.d b/test/unittest/aggs/err.D_LLQUANT_MATCHFACTOR.d
> > > index 5e1f4f29..92c29cc9 100644
> > > --- a/test/unittest/aggs/err.D_LLQUANT_MATCHFACTOR.d
> > > +++ b/test/unittest/aggs/err.D_LLQUANT_MATCHFACTOR.d
> > > @@ -1,10 +1,9 @@
> > > /*
> > > * Oracle Linux DTrace.
> > > - * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
> > > + * Copyright (c) 2013, 2020, 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 */
> > >
> > > /*
> > > * ASSERTION:
> > > diff --git a/test/unittest/aggs/err.D_LLQUANT_MATCHHMAG.d b/test/unittest/aggs/err.D_LLQUANT_MATCHHMAG.d
> > > index d8ecefe5..449900bb 100644
> > > --- a/test/unittest/aggs/err.D_LLQUANT_MATCHHMAG.d
> > > +++ b/test/unittest/aggs/err.D_LLQUANT_MATCHHMAG.d
> > > @@ -1,10 +1,9 @@
> > > /*
> > > * Oracle Linux DTrace.
> > > - * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
> > > + * Copyright (c) 2013, 2020, 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 */
> > >
> > > /*
> > > * ASSERTION:
> > > diff --git a/test/unittest/aggs/err.D_LLQUANT_MATCHLMAG.d b/test/unittest/aggs/err.D_LLQUANT_MATCHLMAG.d
> > > index c51c74a2..2c0476e5 100644
> > > --- a/test/unittest/aggs/err.D_LLQUANT_MATCHLMAG.d
> > > +++ b/test/unittest/aggs/err.D_LLQUANT_MATCHLMAG.d
> > > @@ -1,10 +1,9 @@
> > > /*
> > > * Oracle Linux DTrace.
> > > - * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
> > > + * Copyright (c) 2013, 2020, 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 */
> > >
> > > /*
> > > * ASSERTION:
> > > diff --git a/test/unittest/aggs/err.D_LLQUANT_MATCHSTEPS.d b/test/unittest/aggs/err.D_LLQUANT_MATCHSTEPS.d
> > > index da404354..75dd479b 100644
> > > --- a/test/unittest/aggs/err.D_LLQUANT_MATCHSTEPS.d
> > > +++ b/test/unittest/aggs/err.D_LLQUANT_MATCHSTEPS.d
> > > @@ -1,10 +1,9 @@
> > > /*
> > > * Oracle Linux DTrace.
> > > - * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
> > > + * Copyright (c) 2013, 2020, 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 */
> > >
> > > /*
> > > * ASSERTION:
> > > diff --git a/test/unittest/aggs/err.D_LQUANT_MATCHBASE.d b/test/unittest/aggs/err.D_LQUANT_MATCHBASE.d
> > > index 5a614bbc..7ca9ec68 100644
> > > --- a/test/unittest/aggs/err.D_LQUANT_MATCHBASE.d
> > > +++ b/test/unittest/aggs/err.D_LQUANT_MATCHBASE.d
> > > @@ -1,10 +1,9 @@
> > > /*
> > > * Oracle Linux DTrace.
> > > - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
> > > + * Copyright (c) 2006, 2020, 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 */
> > >
> > > BEGIN
> > > {
> > > diff --git a/test/unittest/aggs/err.D_LQUANT_MATCHBASE.order.d b/test/unittest/aggs/err.D_LQUANT_MATCHBASE.order.d
> > > index 22371551..e125100d 100644
> > > --- a/test/unittest/aggs/err.D_LQUANT_MATCHBASE.order.d
> > > +++ b/test/unittest/aggs/err.D_LQUANT_MATCHBASE.order.d
> > > @@ -1,10 +1,9 @@
> > > /*
> > > * Oracle Linux DTrace.
> > > - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
> > > + * Copyright (c) 2006, 2020, 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 */
> > >
> > > BEGIN
> > > {
> > > diff --git a/test/unittest/aggs/err.D_LQUANT_MATCHLIM.d b/test/unittest/aggs/err.D_LQUANT_MATCHLIM.d
> > > index ba39fa96..3ae02586 100644
> > > --- a/test/unittest/aggs/err.D_LQUANT_MATCHLIM.d
> > > +++ b/test/unittest/aggs/err.D_LQUANT_MATCHLIM.d
> > > @@ -1,10 +1,9 @@
> > > /*
> > > * Oracle Linux DTrace.
> > > - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
> > > + * Copyright (c) 2006, 2020, 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 */
> > >
> > > BEGIN
> > > {
> > > diff --git a/test/unittest/aggs/err.D_LQUANT_MATCHLIM.order.d b/test/unittest/aggs/err.D_LQUANT_MATCHLIM.order.d
> > > index ee333c44..848d6fbe 100644
> > > --- a/test/unittest/aggs/err.D_LQUANT_MATCHLIM.order.d
> > > +++ b/test/unittest/aggs/err.D_LQUANT_MATCHLIM.order.d
> > > @@ -1,10 +1,9 @@
> > > /*
> > > * Oracle Linux DTrace.
> > > - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
> > > + * Copyright (c) 2006, 2020, 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 */
> > >
> > > BEGIN
> > > {
> > > diff --git a/test/unittest/aggs/err.D_LQUANT_MATCHSTEP.d b/test/unittest/aggs/err.D_LQUANT_MATCHSTEP.d
> > > index e1453e36..cc21864a 100644
> > > --- a/test/unittest/aggs/err.D_LQUANT_MATCHSTEP.d
> > > +++ b/test/unittest/aggs/err.D_LQUANT_MATCHSTEP.d
> > > @@ -1,10 +1,9 @@
> > > /*
> > > * Oracle Linux DTrace.
> > > - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
> > > + * Copyright (c) 2006, 2020, 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 */
> > >
> > > BEGIN
> > > {
> > > diff --git a/test/unittest/aggs/err.D_PROTO_LEN.llquantizetoomany.d b/test/unittest/aggs/err.D_PROTO_LEN.llquantizetoomany.d
> > > index 10551bf5..77ab94cc 100644
> > > --- a/test/unittest/aggs/err.D_PROTO_LEN.llquantizetoomany.d
> > > +++ b/test/unittest/aggs/err.D_PROTO_LEN.llquantizetoomany.d
> > > @@ -4,7 +4,6 @@
> > > * Licensed under the Universal Permissive License v 1.0 as shown at
> > > * http://oss.oracle.com/licenses/upl.
> > > */
> > > -/* @@xfail: dtv2 */
> > >
> > > /*
> > > * ASSERTION:
> > > @@ -16,5 +15,5 @@
> > >
> > > BEGIN
> > > {
> > > - @a[1] = llquantize(10, 10, 2, 4, 10, 3, 5);
> > > + @ = llquantize(10, 10, 2, 4, 10, 3, 5);
> > > }
> > > diff --git a/test/unittest/aggs/err.D_PROTO_LEN.lquantizetoomany.d b/test/unittest/aggs/err.D_PROTO_LEN.lquantizetoomany.d
> > > index f46848aa..71da3741 100644
> > > --- a/test/unittest/aggs/err.D_PROTO_LEN.lquantizetoomany.d
> > > +++ b/test/unittest/aggs/err.D_PROTO_LEN.lquantizetoomany.d
> > > @@ -4,7 +4,6 @@
> > > * Licensed under the Universal Permissive License v 1.0 as shown at
> > > * http://oss.oracle.com/licenses/upl.
> > > */
> > > -/* @@xfail: dtv2 */
> > >
> > > /*
> > > * ASSERTION:
> > > @@ -16,5 +15,5 @@
> > >
> > > BEGIN
> > > {
> > > - @[1] = lquantize(10, 0, 100, 1, 10, 20);
> > > + @ = lquantize(10, 0, 100, 1, 10, 20);
> > > }
> > > diff --git a/test/unittest/aggs/err.D_PROTO_LEN.quantizetoomany.d b/test/unittest/aggs/err.D_PROTO_LEN.quantizetoomany.d
> > > index ae17cb22..f0a25609 100644
> > > --- a/test/unittest/aggs/err.D_PROTO_LEN.quantizetoomany.d
> > > +++ b/test/unittest/aggs/err.D_PROTO_LEN.quantizetoomany.d
> > > @@ -4,7 +4,6 @@
> > > * Licensed under the Universal Permissive License v 1.0 as shown at
> > > * http://oss.oracle.com/licenses/upl.
> > > */
> > > -/* @@xfail: dtv2 */
> > >
> > > /*
> > > * ASSERTION:
> > > @@ -16,6 +15,6 @@
> > >
> > > BEGIN
> > > {
> > > - @a[1] = quantize(1, 2, 3);
> > > + @ = quantize(1, 2, 3);
> > > }
> > >
> > > diff --git a/test/unittest/printf/err.D_PRINTF_ARG_TYPE.aggarg.d b/test/unittest/printf/err.D_PRINTF_ARG_TYPE.aggarg.d
> > > index 343ea88d..4d855d67 100644
> > > --- a/test/unittest/printf/err.D_PRINTF_ARG_TYPE.aggarg.d
> > > +++ b/test/unittest/printf/err.D_PRINTF_ARG_TYPE.aggarg.d
> > > @@ -4,7 +4,7 @@
> > > * Licensed under the Universal Permissive License v 1.0 as shown at
> > > * http://oss.oracle.com/licenses/upl.
> > > */
> > > -/* @@xfail: dtv2 */
> > > +
> > > /*
> > > * ASSERTION:
> > > * Test printf() with a bad aggregation arg.
> >
> >
> > _______________________________________________
> > DTrace-devel mailing list
> > DTrace-devel at oss.oracle.com
> > https://oss.oracle.com/mailman/listinfo/dtrace-devel
>
> _______________________________________________
> 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