Skip to content

Commit

Permalink
cpc: Clean up err.D_PDESC_ZERO* tests imported from Solaris
Browse files Browse the repository at this point in the history
Among other things, change the Solaris generic event PAPI_tot_ins
to cpu_clock.

Signed-off-by: Eugene Loh <eugene.loh@oracle.com>
Reviewed-by: Kris Van Hees <kris.van.hees@oracle.com>
  • Loading branch information
euloh authored and kvanhees committed Feb 26, 2023
1 parent 8653d23 commit e209984
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
7 changes: 4 additions & 3 deletions test/unittest/cpc/err.D_PDESC_ZERO.lowfrequency.d
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
* Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 2023, 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.
*/
Expand All @@ -10,9 +10,10 @@
* lower than the default platform limit will fail.
*
* This test will fail if:
* 1) The system under test does not define the 'PAPI_tot_ins' event.
* 1) The system under test does not define the 'cpu_clock' event.
* 2) The 'dcpc-min-overflow' variable in dcpc.conf has been modified.
*/
/* @@xfail: test was imported from Solaris, but eBPF port does not bound period */

#pragma D option quiet

Expand All @@ -21,6 +22,6 @@ BEGIN
exit(0);
}

cpc:::PAPI_tot_ins-all-100
cpc:::cpu_clock-all-100
{
}
4 changes: 2 additions & 2 deletions test/unittest/cpc/err.D_PDESC_ZERO.malformedoverflow.d
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
* Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 2023, 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.
*/
Expand All @@ -15,7 +15,7 @@ BEGIN
exit(0);
}

cpc:::PAPI_tot_ins-all-10000bonehead
cpc:::cpu_clock-all-10000bonehead
{
@[probename] = count();
}
4 changes: 2 additions & 2 deletions test/unittest/cpc/err.D_PDESC_ZERO.nonexistentevent.d
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
* Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 2023, 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.
*/
Expand All @@ -15,7 +15,7 @@ BEGIN
exit(0);
}

cpc:::PAPI_cpc_bad-all-10000
cpc:::nonexistentevent-all-10000
{
@[probename] = count();
}

0 comments on commit e209984

Please sign in to comment.