From 2b7e0f29ac8bc4ed53c960607ead69cc7a571454 Mon Sep 17 00:00:00 2001
From: William Cohen <wcohen@redhat.com>
Date: Fri, 6 Feb 2009 12:36:52 -0500
Subject: Move symbols.exp and symbols.stp to systemtap.context directory.

---
 testsuite/ChangeLog                     |  5 +++++
 testsuite/systemtap.context/symbols.exp | 14 ++++++++++++++
 testsuite/systemtap.context/symbols.stp | 11 +++++++++++
 testsuite/systemtap.samples/symbols.exp | 14 --------------
 testsuite/systemtap.samples/symbols.stp | 11 -----------
 5 files changed, 30 insertions(+), 25 deletions(-)
 create mode 100644 testsuite/systemtap.context/symbols.exp
 create mode 100644 testsuite/systemtap.context/symbols.stp
 delete mode 100644 testsuite/systemtap.samples/symbols.exp
 delete mode 100644 testsuite/systemtap.samples/symbols.stp

diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index 4c0a85a9..25d6b002 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-06  Will Cohen  <wcohen@redhat.com>
+
+	* systemtap.samples/symbols.exp:
+	* systemtap.samples/symbols.sstp: Move to systemtap.context directory.
+	
 2009-02-02  Will Cohen  <wcohen@redhat.com>
 
 	* systemtap.samples/topsys.stp: Revised and moved to examples.
diff --git a/testsuite/systemtap.context/symbols.exp b/testsuite/systemtap.context/symbols.exp
new file mode 100644
index 00000000..0c599b58
--- /dev/null
+++ b/testsuite/systemtap.context/symbols.exp
@@ -0,0 +1,14 @@
+set test "symbols"
+if {![installtest_p]} { untested $test; return }
+
+spawn stap -g $srcdir/$subdir/symbols.stp
+set ok 0
+expect {
+    -timeout 120
+    -re { 0x[a-f0-9]+[^\r]*\r} { incr ok; exp_continue }
+    timeout { fail "$test (timeout)" }
+    eof { }
+}
+#FIXME does not handle case of hanging symbols.stp correctly
+wait
+if {$ok == 11} { pass "$test ($ok)" } { fail "$test ($ok)" }
diff --git a/testsuite/systemtap.context/symbols.stp b/testsuite/systemtap.context/symbols.stp
new file mode 100644
index 00000000..040c3444
--- /dev/null
+++ b/testsuite/systemtap.context/symbols.stp
@@ -0,0 +1,11 @@
+#! stap
+
+probe begin {
+  # a spectrum of figures for 32-bit x86
+  print_stack ("0x0 0x80000000 0xc0000000 0xe0000000 0xf0000000 0xffffffff")
+  # for x86_64
+  print_stack ("0xffffffff00000000 0xffffffff80000000 0xffffffff80120000")
+  print_stack ("0xffffffff88000000 0xffffffffffffffff")
+  # ... for a total of 11 lines, which symbols.exp counts
+  exit ()
+}
diff --git a/testsuite/systemtap.samples/symbols.exp b/testsuite/systemtap.samples/symbols.exp
deleted file mode 100644
index 0c599b58..00000000
--- a/testsuite/systemtap.samples/symbols.exp
+++ /dev/null
@@ -1,14 +0,0 @@
-set test "symbols"
-if {![installtest_p]} { untested $test; return }
-
-spawn stap -g $srcdir/$subdir/symbols.stp
-set ok 0
-expect {
-    -timeout 120
-    -re { 0x[a-f0-9]+[^\r]*\r} { incr ok; exp_continue }
-    timeout { fail "$test (timeout)" }
-    eof { }
-}
-#FIXME does not handle case of hanging symbols.stp correctly
-wait
-if {$ok == 11} { pass "$test ($ok)" } { fail "$test ($ok)" }
diff --git a/testsuite/systemtap.samples/symbols.stp b/testsuite/systemtap.samples/symbols.stp
deleted file mode 100644
index 040c3444..00000000
--- a/testsuite/systemtap.samples/symbols.stp
+++ /dev/null
@@ -1,11 +0,0 @@
-#! stap
-
-probe begin {
-  # a spectrum of figures for 32-bit x86
-  print_stack ("0x0 0x80000000 0xc0000000 0xe0000000 0xf0000000 0xffffffff")
-  # for x86_64
-  print_stack ("0xffffffff00000000 0xffffffff80000000 0xffffffff80120000")
-  print_stack ("0xffffffff88000000 0xffffffffffffffff")
-  # ... for a total of 11 lines, which symbols.exp counts
-  exit ()
-}
-- 
cgit