errors: invalid probe IDs should return EDT_BADID, as in v1

They were returning EDT_NOPROBE, causing several tests for -i to fail. Signed-off-by: Nick Alcock <nick.alcock@oracle.com> Reviewed-by: Kris Van Hees <kris.van.hees@oracle.com>
oracle · Sep 29, 2021 · 2015eb2 · 2015eb2
1 parent 01b22a1
commit 2015eb2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/libdtrace/dt_probe.c b/libdtrace/dt_probe.c
@@ -1423,11 +1423,11 @@ dtrace_id2desc(dtrace_hdl_t *dtp, dtrace_id_t id, dtrace_probedesc_t *pdp)
 	dt_probe_t	*prp;
 
 	if (id >= dtp->dt_probe_id)
-		return dt_set_errno(dtp, EDT_NOPROBE);
+		return dt_set_errno(dtp, EDT_BADID);
 
 	prp = dtp->dt_probes[id];
 	if (!prp)
-		return dt_set_errno(dtp, EDT_NOPROBE);
+		return dt_set_errno(dtp, EDT_BADID);
 
 	memcpy(pdp, prp->desc, sizeof(dtrace_probedesc_t));
 

diff --git a/test/unittest/dtrace-util/tst.InvalidTraceID1.sh b/test/unittest/dtrace-util/tst.InvalidTraceID1.sh
@@ -1,11 +1,10 @@
 #!/bin/bash
 #
 # Oracle Linux DTrace.
-# Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2021, 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
 
 ##
 #

diff --git a/test/unittest/dtrace-util/tst.InvalidTraceID3.sh b/test/unittest/dtrace-util/tst.InvalidTraceID3.sh
@@ -1,11 +1,10 @@
 #!/bin/bash
 #
 # Oracle Linux DTrace.
-# Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2021, 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
 
 ##
 #

diff --git a/test/unittest/dtrace-util/tst.InvalidTraceID7.sh b/test/unittest/dtrace-util/tst.InvalidTraceID7.sh
@@ -1,11 +1,10 @@
 #!/bin/bash
 #
 # Oracle Linux DTrace.
-# Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2021, 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
 
 ##
 #

diff --git a/test/unittest/dtrace-util/tst.ZeroProbeIdentifier.sh b/test/unittest/dtrace-util/tst.ZeroProbeIdentifier.sh
@@ -1,11 +1,10 @@
 #!/bin/bash
 #
 # Oracle Linux DTrace.
-# Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2021, 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
 
 ##
 #