Index: gdb/testsuite/gdb.trace/tracecmd.exp |
diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace/tracecmd.exp |
index b4fc3e2c02d2b2c7ef286c2ef4d6722ac57e1a20..81dc1ed84a7b7c906bd8cb3496edabcfdcab518e 100644 |
--- a/gdb/testsuite/gdb.trace/tracecmd.exp |
+++ b/gdb/testsuite/gdb.trace/tracecmd.exp |
@@ -1,4 +1,4 @@ |
-# Copyright 1998, 2007-2012 Free Software Foundation, Inc. |
+# Copyright 1998-2013 Free Software Foundation, Inc. |
# |
# This program is free software; you can redistribute it and/or modify |
# it under the terms of the GNU General Public License as published by |
@@ -15,7 +15,7 @@ |
# This file was written by Michael Snyder (msnyder@cygnus.com) |
-load_lib "trace-support.exp"; |
+load_lib "trace-support.exp" |
gdb_exit |
@@ -35,10 +35,10 @@ gdb_file_cmd $binfile |
# define relative source line numbers: |
# all subsequent line numbers are relative to this first one (baseline) |
-set baseline [gdb_find_recursion_test_baseline $srcfile]; |
+set baseline [gdb_find_recursion_test_baseline $srcfile] |
if { $baseline == -1 } then { |
fail "Could not find gdb_recursion_test function" |
- return; |
+ return |
} |
set testline1 [expr $baseline + 1] |
@@ -48,7 +48,7 @@ set testline2 [expr $baseline + 3] |
# test "help tracepoints" |
# |
-set helpcnt 0; |
+set helpcnt 0 |
test_class_help "tracepoints" { |
"Tracing of program execution without stopping the program\.[\r\n\]+" |
} "1.0: help tracepoints" |
@@ -62,7 +62,8 @@ gdb_delete_tracepoints |
gdb_test "trace $srcfile:$testline2" \ |
"Tracepoint $decimal at $hex: file.*$srcfile, line $testline2." \ |
"1.1a: set tracepoint at sourceline" |
-gdb_test "info trace" "in gdb_recursion_test.*$srcfile:$testline2" \ |
+gdb_test "info trace" "in gdb_recursion_test.*$srcfile:$testline2. |
+\[\t \]+not installed on target." \ |
"1.1b: trace sourcefile:line" |
# 1.2 trace invalid source line |
@@ -85,7 +86,8 @@ gdb_delete_tracepoints |
gdb_test "trace gdb_recursion_test" \ |
"Tracepoint $decimal at $hex: file.*$srcfile, line $testline1." \ |
"1.4a: trace function by name" |
-gdb_test "info trace" "in gdb_recursion_test.*$srcfile:$testline1" \ |
+gdb_test "info trace" "in gdb_recursion_test.*$srcfile:$testline1. |
+\[\t \]+not installed on target." \ |
"1.4b: trace function by name" |
# 1.5 trace non-existant function |
@@ -122,7 +124,8 @@ gdb_delete_tracepoints |
gdb_test "trace \*gdb_recursion_test" \ |
"Tracepoint $decimal at .*$c_test_addr.*" \ |
"1.7a: trace at function label (before prologue)" |
-gdb_test "info trace" "$c_test_addr.*in gdb_recursion_test.*:$baseline" \ |
+gdb_test "info trace" "$c_test_addr.*in gdb_recursion_test.*:$baseline. |
+\[\t \]+not installed on target." \ |
"1.7b: verify trace at specific address" |
# 1.8 trace at invalid address |
@@ -139,7 +142,9 @@ gdb_delete_tracepoints |
gdb_test "trace gdb_recursion_test if q1 > 0" \ |
"Tracepoint $decimal at $hex: file.*$srcfile, line $testline1." \ |
"1.11a: conditional tracepoint" |
-gdb_test "info trace" "in gdb_recursion_test.*$srcfile:$testline1.*trace only if q1 > 0" \ |
+gdb_test "info trace" "in gdb_recursion_test.*$srcfile:$testline1. |
+\[\t \]+trace only if q1 > 0. |
+\[\t \]+not installed on target." \ |
"1.11b: verify conditional tracepoint" |
# 1.12 set tracepoint in prologue |