From ae1647d03ba6f15603d9c3e7f9050e982c9b4bb0 Mon Sep 17 00:00:00 2001 From: David Smith Date: Fri, 1 Jun 2012 16:15:33 -0500 Subject: [PATCH] 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. --- testsuite/buildok/twentytwo.stp | 2 +- testsuite/buildok/xtime.stp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/testsuite/buildok/twentytwo.stp b/testsuite/buildok/twentytwo.stp index ef73ad764..0cc0c1e9c 100755 --- 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 e41f9b164..1673111b5 100755 --- 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(); } -- 2.43.5