[DTrace-devel] [PATCH 09/16] cpc: Clean up err.D_PDESC_ZERO* tests imported from Solaris

[eugene.loh at oracle.com]

From: Eugene Loh <eugene.loh at oracle.com>

Among other things, change the Solaris generic event PAPI_tot_ins
to cpu_clock.

Signed-off-by: Eugene Loh <eugene.loh at oracle.com>
---
 test/unittest/cpc/err.D_PDESC_ZERO.lowfrequency.d      | 7 ++++---
 test/unittest/cpc/err.D_PDESC_ZERO.malformedoverflow.d | 4 ++--
 test/unittest/cpc/err.D_PDESC_ZERO.nonexistentevent.d  | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/test/unittest/cpc/err.D_PDESC_ZERO.lowfrequency.d b/test/unittest/cpc/err.D_PDESC_ZERO.lowfrequency.d
index e825dd15..68ee5456 100644
--- a/test/unittest/cpc/err.D_PDESC_ZERO.lowfrequency.d
+++ b/test/unittest/cpc/err.D_PDESC_ZERO.lowfrequency.d
@@ -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.
  */
@@ -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
 
@@ -21,6 +22,6 @@ BEGIN
 	exit(0);
 }
 
-cpc:::PAPI_tot_ins-all-100
+cpc:::cpu_clock-all-100
 {
 }
diff --git a/test/unittest/cpc/err.D_PDESC_ZERO.malformedoverflow.d b/test/unittest/cpc/err.D_PDESC_ZERO.malformedoverflow.d
index c72d0b16..444ee0ab 100644
--- a/test/unittest/cpc/err.D_PDESC_ZERO.malformedoverflow.d
+++ b/test/unittest/cpc/err.D_PDESC_ZERO.malformedoverflow.d
@@ -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.
  */
@@ -15,7 +15,7 @@ BEGIN
 	exit(0);
 }
 
-cpc:::PAPI_tot_ins-all-10000bonehead
+cpc:::cpu_clock-all-10000bonehead
 {
 	@[probename] = count();
 }
diff --git a/test/unittest/cpc/err.D_PDESC_ZERO.nonexistentevent.d b/test/unittest/cpc/err.D_PDESC_ZERO.nonexistentevent.d
index abff7b64..bc9868ae 100644
--- a/test/unittest/cpc/err.D_PDESC_ZERO.nonexistentevent.d
+++ b/test/unittest/cpc/err.D_PDESC_ZERO.nonexistentevent.d
@@ -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.
  */
@@ -15,7 +15,7 @@ BEGIN
 	exit(0);
 }
 
-cpc:::PAPI_cpc_bad-all-10000
+cpc:::nonexistentevent-all-10000
 {
 	@[probename] = count();
 }
-- 
2.18.4