From a06d79aaedc0f0f6166569bbe7765ecc101d28cf Mon Sep 17 00:00:00 2001
From: David Smith <dsmith@redhat.com>
Date: Tue, 11 Feb 2014 12:07:57 -0600
Subject: [PATCH] Small scheduler tapset testsuite fixes.

* testsuite/buildok/scheduler-cpu_on.stp: New file.
* testsuite/buildok/scheduler-detailed.stp: Moved 'scheduler.cpu_on' test
  to scheduler-cpu_on.stp.
* testsuite/buildok/scheduler-migrate.stp: Removed unneeded
  '__scheduler.migrate.kp' test.
---
 testsuite/buildok/scheduler-cpu_on.stp   | 16 ++++++++++++++++
 testsuite/buildok/scheduler-detailed.stp |  5 +----
 testsuite/buildok/scheduler-migrate.stp  |  5 -----
 3 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 testsuite/buildok/scheduler-cpu_on.stp

diff --git a/testsuite/buildok/scheduler-cpu_on.stp b/testsuite/buildok/scheduler-cpu_on.stp
new file mode 100644
index 000000000..16b6d3be7
--- /dev/null
+++ b/testsuite/buildok/scheduler-cpu_on.stp
@@ -0,0 +1,16 @@
+#! stap -p4
+
+# This test fails on some kernels because we can't find the arguments to
+# this inline function (PR 1155).
+
+probe scheduler.cpu_on ?
+{
+	printf("%s: %p %d\n", name, task_prev, idle)
+}
+
+# Make sure this file compiles on kernels where scheduler.cpu_on
+# doesn't exist.
+probe begin
+{
+	printf("begin\n")
+}
diff --git a/testsuite/buildok/scheduler-detailed.stp b/testsuite/buildok/scheduler-detailed.stp
index 0a73270ae..920c6118a 100755
--- a/testsuite/buildok/scheduler-detailed.stp
+++ b/testsuite/buildok/scheduler-detailed.stp
@@ -7,10 +7,7 @@
 
 # scheduler.cpu_off test moved to scheduler-cpu_off.stp
 
-probe scheduler.cpu_on ?
-{
-	printf("%s: %p %d\n", name, task_prev, idle)
-}
+# scheduler.cpu_on test moved to scheduler-cpu_on.stp
 
 probe scheduler.tick
 {
diff --git a/testsuite/buildok/scheduler-migrate.stp b/testsuite/buildok/scheduler-migrate.stp
index 6b5cf3525..ef3736551 100755
--- a/testsuite/buildok/scheduler-migrate.stp
+++ b/testsuite/buildok/scheduler-migrate.stp
@@ -6,11 +6,6 @@ probe scheduler.migrate ?
 	printf("pid = %d, priority = %d\n", pid, priority)
 	printf("%p %d/%d\n", task, cpu_from, cpu_to)	
 }
-probe __scheduler.migrate.kp ?
-{
-	printf("pid = %d, priority = %d\n", pid, priority)
-	printf("%p %d/%d\n", task, cpu_from, cpu_to)	
-}
 
 # Make sure this file compiles on kernels where scheduler.migrate
 # doesn't exist.
-- 
2.43.5