From 890cb11e7e87596423ec8dcc67bcb7444b6b5b90 Mon Sep 17 00:00:00 2001
From: William Cohen <wcohen@redhat.com>
Date: Mon, 9 Feb 2009 10:38:10 -0500
Subject: Move poll_map.exp and poll_map.stp to systemtap.base directory.

---
 testsuite/ChangeLog                      |  5 +++++
 testsuite/systemtap.base/poll_map.exp    | 14 ++++++++++++++
 testsuite/systemtap.base/poll_map.stp    | 33 ++++++++++++++++++++++++++++++++
 testsuite/systemtap.samples/poll_map.exp | 14 --------------
 testsuite/systemtap.samples/poll_map.stp | 33 --------------------------------
 5 files changed, 52 insertions(+), 47 deletions(-)
 create mode 100644 testsuite/systemtap.base/poll_map.exp
 create mode 100755 testsuite/systemtap.base/poll_map.stp
 delete mode 100644 testsuite/systemtap.samples/poll_map.exp
 delete mode 100755 testsuite/systemtap.samples/poll_map.stp

diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index fa8701ff..8ac6d698 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-09  Will Cohen  <wcohen@redhat.com>
+
+	* systemtap.samples/poll_map.exp:
+	* systemtap.samples/poll_map.stp: Move to systemtap.base directory.
+	
 2009-02-09  Will Cohen  <wcohen@redhat.com>
 	
 	* systemtap.samples/kmalloc-top: Removed.
diff --git a/testsuite/systemtap.base/poll_map.exp b/testsuite/systemtap.base/poll_map.exp
new file mode 100644
index 00000000..5ade48e6
--- /dev/null
+++ b/testsuite/systemtap.base/poll_map.exp
@@ -0,0 +1,14 @@
+set test "poll_map"
+if {![installtest_p]} { untested $test; return }
+
+spawn stap -g $srcdir/$subdir/poll_map.stp
+set ok 0
+expect {
+    -timeout 400
+    -ex "SUCCESS" { incr ok }
+    timeout { fail "$test (timeout)" }
+    eof { }
+}
+close
+wait
+if {$ok == 1} { pass "$test ($ok)" } { fail "$test ($ok)" }
diff --git a/testsuite/systemtap.base/poll_map.stp b/testsuite/systemtap.base/poll_map.stp
new file mode 100755
index 00000000..cd39b433
--- /dev/null
+++ b/testsuite/systemtap.base/poll_map.stp
@@ -0,0 +1,33 @@
+#! stap
+
+# test that polling loops do not exit when conflicts happen
+# see PR 1379
+
+global called, num_polls
+
+probe kernel.function( "sys_*" ).call {
+	called[execname(),probefunc()]++
+}
+
+probe timer.ms(1000)
+{
+	print("\n\n")
+	num_to_do = 10
+	foreach ([n,f] in called-) {
+		printf("%s called %s\t%d times\n", n, f, called[n,f])
+		num_to_do--
+		if (num_to_do <= 0)
+			break
+	}
+	delete called
+	num_polls++
+	if (num_polls > 30)
+		exit()
+}
+
+probe end {
+	if (num_polls <= 30)
+		print ("FAIL\n")
+	else
+		print ("SUCCESS\n")
+}
diff --git a/testsuite/systemtap.samples/poll_map.exp b/testsuite/systemtap.samples/poll_map.exp
deleted file mode 100644
index 5ade48e6..00000000
--- a/testsuite/systemtap.samples/poll_map.exp
+++ /dev/null
@@ -1,14 +0,0 @@
-set test "poll_map"
-if {![installtest_p]} { untested $test; return }
-
-spawn stap -g $srcdir/$subdir/poll_map.stp
-set ok 0
-expect {
-    -timeout 400
-    -ex "SUCCESS" { incr ok }
-    timeout { fail "$test (timeout)" }
-    eof { }
-}
-close
-wait
-if {$ok == 1} { pass "$test ($ok)" } { fail "$test ($ok)" }
diff --git a/testsuite/systemtap.samples/poll_map.stp b/testsuite/systemtap.samples/poll_map.stp
deleted file mode 100755
index cd39b433..00000000
--- a/testsuite/systemtap.samples/poll_map.stp
+++ /dev/null
@@ -1,33 +0,0 @@
-#! stap
-
-# test that polling loops do not exit when conflicts happen
-# see PR 1379
-
-global called, num_polls
-
-probe kernel.function( "sys_*" ).call {
-	called[execname(),probefunc()]++
-}
-
-probe timer.ms(1000)
-{
-	print("\n\n")
-	num_to_do = 10
-	foreach ([n,f] in called-) {
-		printf("%s called %s\t%d times\n", n, f, called[n,f])
-		num_to_do--
-		if (num_to_do <= 0)
-			break
-	}
-	delete called
-	num_polls++
-	if (num_polls > 30)
-		exit()
-}
-
-probe end {
-	if (num_polls <= 30)
-		print ("FAIL\n")
-	else
-		print ("SUCCESS\n")
-}
-- 
cgit