[DTrace-devel] [PATCH 4/4] Move raise() tests to unittest/actions/raise with updates
Kris Van Hees
kris.van.hees at oracle.com
Tue Jun 8 20:37:24 PDT 2021
Tests have been updated to not depend on trace() with a string argument.
Signed-off-by: Kris Van Hees <kris.van.hees at oracle.com>
---
test/unittest/{ => actions}/raise/tst.raise1.d | 8 +++-----
test/unittest/actions/raise/tst.raise1.r | 7 +++++++
test/unittest/{ => actions}/raise/tst.raise2.d | 8 +++-----
test/unittest/actions/raise/tst.raise2.r | 7 +++++++
test/unittest/{ => actions}/raise/tst.raise3.d | 8 +++-----
test/unittest/actions/raise/tst.raise3.r | 7 +++++++
test/unittest/{ => actions}/raise/tst.sigdefs.sh | 2 +-
test/unittest/raise/tst.raise1.r | 7 -------
test/unittest/raise/tst.raise2.r | 7 -------
test/unittest/raise/tst.raise3.r | 7 -------
10 files changed, 31 insertions(+), 37 deletions(-)
rename test/unittest/{ => actions}/raise/tst.raise1.d (85%)
create mode 100644 test/unittest/actions/raise/tst.raise1.r
rename test/unittest/{ => actions}/raise/tst.raise2.d (84%)
create mode 100644 test/unittest/actions/raise/tst.raise2.r
rename test/unittest/{ => actions}/raise/tst.raise3.d (84%)
create mode 100644 test/unittest/actions/raise/tst.raise3.r
rename test/unittest/{ => actions}/raise/tst.sigdefs.sh (94%)
delete mode 100644 test/unittest/raise/tst.raise1.r
delete mode 100644 test/unittest/raise/tst.raise2.r
delete mode 100644 test/unittest/raise/tst.raise3.r
diff --git a/test/unittest/raise/tst.raise1.d b/test/unittest/actions/raise/tst.raise1.d
similarity index 85%
rename from test/unittest/raise/tst.raise1.d
rename to test/unittest/actions/raise/tst.raise1.d
index 67609b7c..684a18a8 100644
--- a/test/unittest/raise/tst.raise1.d
+++ b/test/unittest/actions/raise/tst.raise1.d
@@ -1,10 +1,10 @@
/*
* 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 */
+
/* @@trigger: raise-tst-raise1 */
/* @@trigger-timing: after */
/* @@runtest-opts: $_pid */
@@ -30,7 +30,6 @@ BEGIN
syscall::ioctl:entry
/pid == $1 && !self->raised/
{
- trace("raised");
raise(SIGINT);
/*
* Wait no more than three seconds for the process to die.
@@ -48,6 +47,5 @@ syscall::exit_group:entry
profile:::tick-4
/timestamp > timeout/
{
- trace("timed out");
- exit(1);
+ exit(124);
}
diff --git a/test/unittest/actions/raise/tst.raise1.r b/test/unittest/actions/raise/tst.raise1.r
new file mode 100644
index 00000000..a9dd64bc
--- /dev/null
+++ b/test/unittest/actions/raise/tst.raise1.r
@@ -0,0 +1,7 @@
+ FUNCTION:NAME
+ ioctl:entry
+ exit_group:entry
+
+-- @@stderr --
+dtrace: script 'test/unittest/actions/raise/tst.raise1.d' matched 4 probes
+dtrace: allowing destructive actions
diff --git a/test/unittest/raise/tst.raise2.d b/test/unittest/actions/raise/tst.raise2.d
similarity index 84%
rename from test/unittest/raise/tst.raise2.d
rename to test/unittest/actions/raise/tst.raise2.d
index d87210ad..4af1d8f7 100644
--- a/test/unittest/raise/tst.raise2.d
+++ b/test/unittest/actions/raise/tst.raise2.d
@@ -1,10 +1,10 @@
/*
* 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 */
+
/* @@trigger: raise-tst-raise2 */
/* @@trigger-timing: after */
/* @@runtest-opts: $_pid */
@@ -29,7 +29,6 @@ BEGIN
syscall::ioctl:return
/pid == $1/
{
- trace("raised");
raise(SIGINT);
/*
* Wait no more than three seconds for the process to die.
@@ -46,6 +45,5 @@ syscall::exit_group:entry
profile:::tick-4
/timestamp > timeout/
{
- trace("timed out");
- exit(1);
+ exit(124);
}
diff --git a/test/unittest/actions/raise/tst.raise2.r b/test/unittest/actions/raise/tst.raise2.r
new file mode 100644
index 00000000..75150193
--- /dev/null
+++ b/test/unittest/actions/raise/tst.raise2.r
@@ -0,0 +1,7 @@
+ FUNCTION:NAME
+ ioctl:return
+ exit_group:entry
+
+-- @@stderr --
+dtrace: script 'test/unittest/actions/raise/tst.raise2.d' matched 4 probes
+dtrace: allowing destructive actions
diff --git a/test/unittest/raise/tst.raise3.d b/test/unittest/actions/raise/tst.raise3.d
similarity index 84%
rename from test/unittest/raise/tst.raise3.d
rename to test/unittest/actions/raise/tst.raise3.d
index bb694561..00764814 100644
--- a/test/unittest/raise/tst.raise3.d
+++ b/test/unittest/actions/raise/tst.raise3.d
@@ -1,10 +1,10 @@
/*
* 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 */
+
/* @@trigger: raise-tst-raise3 */
/* @@trigger-timing: after */
/* @@runtest-opts: $_pid */
@@ -29,7 +29,6 @@ BEGIN
syscall::ioctl:entry
/pid == $1/
{
- trace("raised");
raise(SIGINT);
/*
* Wait no more than three seconds for the process to die.
@@ -46,6 +45,5 @@ syscall::exit_group:entry
profile:::tick-4
/timestamp > timeout/
{
- trace("timed out");
- exit(1);
+ exit(124);
}
diff --git a/test/unittest/actions/raise/tst.raise3.r b/test/unittest/actions/raise/tst.raise3.r
new file mode 100644
index 00000000..d78ee98c
--- /dev/null
+++ b/test/unittest/actions/raise/tst.raise3.r
@@ -0,0 +1,7 @@
+ FUNCTION:NAME
+ ioctl:entry
+ exit_group:entry
+
+-- @@stderr --
+dtrace: script 'test/unittest/actions/raise/tst.raise3.d' matched 4 probes
+dtrace: allowing destructive actions
diff --git a/test/unittest/raise/tst.sigdefs.sh b/test/unittest/actions/raise/tst.sigdefs.sh
similarity index 94%
rename from test/unittest/raise/tst.sigdefs.sh
rename to test/unittest/actions/raise/tst.sigdefs.sh
index 490dc41a..8eefb0c7 100755
--- a/test/unittest/raise/tst.sigdefs.sh
+++ b/test/unittest/actions/raise/tst.sigdefs.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 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.
#
diff --git a/test/unittest/raise/tst.raise1.r b/test/unittest/raise/tst.raise1.r
deleted file mode 100644
index 5c7b30fa..00000000
--- a/test/unittest/raise/tst.raise1.r
+++ /dev/null
@@ -1,7 +0,0 @@
- FUNCTION:NAME
- ioctl:entry raised
- exit_group:entry
-
--- @@stderr --
-dtrace: script 'test/unittest/raise/tst.raise1.d' matched 4 probes
-dtrace: allowing destructive actions
diff --git a/test/unittest/raise/tst.raise2.r b/test/unittest/raise/tst.raise2.r
deleted file mode 100644
index a76ca27d..00000000
--- a/test/unittest/raise/tst.raise2.r
+++ /dev/null
@@ -1,7 +0,0 @@
- FUNCTION:NAME
- ioctl:return raised
- exit_group:entry
-
--- @@stderr --
-dtrace: script 'test/unittest/raise/tst.raise2.d' matched 4 probes
-dtrace: allowing destructive actions
diff --git a/test/unittest/raise/tst.raise3.r b/test/unittest/raise/tst.raise3.r
deleted file mode 100644
index 8da6336b..00000000
--- a/test/unittest/raise/tst.raise3.r
+++ /dev/null
@@ -1,7 +0,0 @@
- FUNCTION:NAME
- ioctl:entry raised
- exit_group:entry
-
--- @@stderr --
-dtrace: script 'test/unittest/raise/tst.raise3.d' matched 4 probes
-dtrace: allowing destructive actions
--
2.31.1
More information about the DTrace-devel
mailing list