Update 2 buildok tests for kernel-3.5.0-0.rc0.git9.2.fc18.

* testsuite/buildok/twentytwo.stp: Add '.call' to the
  'kernel.function("vfs_llseek")' so that we can avoid inlined versions
  that don't have $offset.
* testsuite/buildok/xtime.stp: Update for kernel-3.5.0-0.rc0.git9.2.fc18,
  where the old xtime global variable got moved into a structure.

diff --git a/testsuite/buildok/twentytwo.stp b/testsuite/buildok/twentytwo.stp
index ef73ad764d536a97b2bd5dd57d1e94094ac33ce9..0cc0c1e9cdcf6e92a683b1ea901ffb6ec0204fdd 100755 (executable)
--- a/testsuite/buildok/twentytwo.stp
+++ b/testsuite/buildok/twentytwo.stp
@@ -7,7 +7,7 @@ probe kernel.function("deactivate_super")
        printf("s_maxbytes %d\n", $s->s_maxbytes)
 }
 
-probe kernel.function("vfs_llseek")
+probe kernel.function("vfs_llseek").call
 { 
        printf("offset %d\n", $offset)
 }

diff --git a/testsuite/buildok/xtime.stp b/testsuite/buildok/xtime.stp
index e41f9b16465ab59bd736e12c0b50d694ffa46d3b..1673111b5e0900f912a58a95240fada46b60cb7f 100755 (executable)
--- a/testsuite/buildok/xtime.stp
+++ b/testsuite/buildok/xtime.stp
@@ -3,5 +3,8 @@
 # Test for getting at an external global variable PR10622
 probe kernel.function("do_gettimeofday")
 {
-  printf("xtime.tv_sec:%d\n", $xtime->tv_sec); exit();
+  printf("xtime.tv_sec:%d\n",
+        (@defined($timekeeper->xtime->tv_sec) ? $timekeeper->xtime->tv_sec
+         : $xtime->tv_sec))
+  exit();
 }