From 47683be64546814f9bf7f48e62c916d7901e336e Mon Sep 17 00:00:00 2001
From: hiramatu <hiramatu>
Date: Wed, 6 Feb 2008 22:07:42 +0000
Subject: 2008-02-06  Masami Hiramatsu <mhiramat@redhat.com>

	* stack-ia64.c (__stp_show_stack_sym): Skip printing symbol if (ip ==
	REG_IP(regs)).

2008-02-06  Masami Hiramatsu  <mhiramat@redhat.com>

	* systemtap.context/backtrace.tcl: Fixed regular expressions and Added
	new expression for return probe on ia64.
	* systemtap.context/backtrace.stp(print_all_trace_info): Added
	trace point output before calling print_stack().
---
 testsuite/systemtap.context/backtrace.stp |  2 +-
 testsuite/systemtap.context/backtrace.tcl | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'testsuite/systemtap.context')

diff --git a/testsuite/systemtap.context/backtrace.stp b/testsuite/systemtap.context/backtrace.stp
index 73781371..c14d071c 100644
--- a/testsuite/systemtap.context/backtrace.stp
+++ b/testsuite/systemtap.context/backtrace.stp
@@ -4,7 +4,7 @@ function print_all_trace_info(point:string) {
         print("--------\n")
 	bt = backtrace()
 	printf("the %s stack is %s\n", point, bt)
-        print("--------\n")
+        printf("--<%s>--\n", point)
 	print_stack(bt);
         print("--------\n")
 }
diff --git a/testsuite/systemtap.context/backtrace.tcl b/testsuite/systemtap.context/backtrace.tcl
index e35832ee..409cf693 100644
--- a/testsuite/systemtap.context/backtrace.tcl
+++ b/testsuite/systemtap.context/backtrace.tcl
@@ -5,6 +5,12 @@ set m4 0
 set m5 0
 set m6 0
 
+if {[istarget ia64-*-*]} {
+	set retexp {.*return\>--\r\n 0x[a-f0-9]+ : yyy_func3[^\[]+\[systemtap_test_module2\]\r\n}
+} else {
+	set retexp {.*return\>--\r\n 0x[a-f0-9]+ : kretprobe_trampoline_holder[^\r\n]+\r\n}
+}
+
 spawn stap backtrace.stp
 #exp_internal 1
 expect {
@@ -36,7 +42,7 @@ expect {
 	incr m2
 	expect {
 	    -timeout 5
-	    -re {.*---\r\n 0x[a-f0-9]+ : yyy_func3[^\[]+\[systemtap_test_module2\]\r\n} {
+	    -re {.*call\>--\r\n 0x[a-f0-9]+ : yyy_func3[^\[]+\[systemtap_test_module2\]\r\n} {
 		if {$m2 == 1} {incr m2}
 		exp_continue
 	    }
@@ -76,7 +82,7 @@ expect {
 	incr m4
 	expect {
 	    -timeout 5
-	    -re {.*0x[a-f0-9]+ : kretprobe_trampoline_holder[^\[]+\[\]\r\n} {
+	    -re $retexp {
 		if {$m4 == 1} {incr m4}
 		exp_continue
 	    }
@@ -104,7 +110,7 @@ expect {
 	incr m6
 	expect {
 	    -timeout 5
-	    -re {.*---\r\n 0x[a-f0-9]+[^\r\n]+\r\n} {
+	    -re {.*profile>--\r\n 0x[a-f0-9]+[^\r\n]+\r\n} {
 		if {$m6 == 1} {incr m6}
 	    }
 	}
-- 
cgit