[DTrace-devel] [PATCH] test: Modify fbtsafety tests that use vtimestamp unnecessarily

[eugene.loh at oracle.com]

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

Currently, we do not implement vtimestamp.

Signed-off-by: Eugene Loh <eugene.loh at oracle.com>
---
 test/stress/fbtsafety/tst.index.d             | 6 +++---
 test/stress/fbtsafety/tst.strjoin.d           | 4 ++--
 test/stress/fbtsafety/tst.strstr.d            | 4 ++--
 test/stress/fbtsafety/tst.strtok.d            | 4 ++--
 test/stress/fbtsafety/tst.substr.d            | 6 +++---
 test/unittest/variables/bvar/tst.vtimestamp.d | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/test/stress/fbtsafety/tst.index.d b/test/stress/fbtsafety/tst.index.d
index e30b94c0a..930d074ab 100644
--- a/test/stress/fbtsafety/tst.index.d
+++ b/test/stress/fbtsafety/tst.index.d
@@ -1,6 +1,6 @@
 /*
  * Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, 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.
  */
@@ -17,13 +17,13 @@ fbt:::
 fbt:::
 /on/
 {
-	trace(index((char *)rand(), (char *)(rand() ^ vtimestamp)));
+	trace(index((char *)rand(), (char *)(rand() ^ timestamp)));
 }
 
 fbt:::
 /on/
 {
-	trace(rindex((char *)rand(), (char *)(rand() ^ vtimestamp,
+	trace(rindex((char *)rand(), (char *)(rand() ^ timestamp,
 	    timestamp)));
 }
 
diff --git a/test/stress/fbtsafety/tst.strjoin.d b/test/stress/fbtsafety/tst.strjoin.d
index a22cc7943..1a9fbe733 100644
--- a/test/stress/fbtsafety/tst.strjoin.d
+++ b/test/stress/fbtsafety/tst.strjoin.d
@@ -1,6 +1,6 @@
 /*
  * Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, 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.
  */
@@ -17,7 +17,7 @@ fbt:::
 fbt:::
 /on/
 {
-	trace(strjoin((char *)rand(), (char *)(rand() ^ vtimestamp)));
+	trace(strjoin((char *)rand(), (char *)(rand() ^ timestamp)));
 }
 
 fbt:::entry
diff --git a/test/stress/fbtsafety/tst.strstr.d b/test/stress/fbtsafety/tst.strstr.d
index 13f4a9245..15c1e15e8 100644
--- a/test/stress/fbtsafety/tst.strstr.d
+++ b/test/stress/fbtsafety/tst.strstr.d
@@ -1,6 +1,6 @@
 /*
  * Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, 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.
  */
@@ -17,7 +17,7 @@ fbt:::
 fbt:::
 /on/
 {
-	trace(strstr((char *)rand(), (char *)(rand() ^ vtimestamp)));
+	trace(strstr((char *)rand(), (char *)(rand() ^ timestamp)));
 }
 
 fbt:::entry
diff --git a/test/stress/fbtsafety/tst.strtok.d b/test/stress/fbtsafety/tst.strtok.d
index bc0a707eb..edc2ec558 100644
--- a/test/stress/fbtsafety/tst.strtok.d
+++ b/test/stress/fbtsafety/tst.strtok.d
@@ -1,6 +1,6 @@
 /*
  * Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, 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.
  */
@@ -17,7 +17,7 @@ fbt:::
 fbt:::
 /on/
 {
-	trace(strtok((char *)rand(), (char *)(rand() ^ vtimestamp)));
+	trace(strtok((char *)rand(), (char *)(rand() ^ timestamp)));
 }
 
 fbt:::entry
diff --git a/test/stress/fbtsafety/tst.substr.d b/test/stress/fbtsafety/tst.substr.d
index 8cd021176..ac02584ee 100644
--- a/test/stress/fbtsafety/tst.substr.d
+++ b/test/stress/fbtsafety/tst.substr.d
@@ -1,6 +1,6 @@
 /*
  * Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, 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.
  */
@@ -17,13 +17,13 @@ fbt:::
 fbt:::
 /on/
 {
-	trace(substr((char *)rand(), rand() ^ vtimestamp));
+	trace(substr((char *)rand(), rand() ^ timestamp));
 }
 
 fbt:::
 /on/
 {
-	trace(substr((char *)rand(), -rand() ^ vtimestamp));
+	trace(substr((char *)rand(), -rand() ^ timestamp));
 }
 
 tick-1sec
diff --git a/test/unittest/variables/bvar/tst.vtimestamp.d b/test/unittest/variables/bvar/tst.vtimestamp.d
index b72eb8a7f..7d92bf4cc 100644
--- a/test/unittest/variables/bvar/tst.vtimestamp.d
+++ b/test/unittest/variables/bvar/tst.vtimestamp.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 need vtimestamp support */
+/* @@xfail: dtv2: need vtimestamp support */
 
 /*
  * ASSERTION: The 'vtimestamp' variable can be accessed and is not -1.
-- 
2.47.3