summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gdb/testsuite/ChangeLog11
-rw-r--r--gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp4
-rw-r--r--gdb/testsuite/gdb.trace/ftrace-lock.exp4
-rw-r--r--gdb/testsuite/gdb.trace/ftrace.exp4
-rw-r--r--gdb/testsuite/gdb.trace/range-stepping.exp4
-rw-r--r--gdb/testsuite/gdb.trace/trace-break.exp4
-rw-r--r--gdb/testsuite/gdb.trace/trace-condition.exp4
-rw-r--r--gdb/testsuite/gdb.trace/trace-mt.exp4
8 files changed, 25 insertions, 14 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5d19eb67ea5..88f8d3d2145 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2016-04-28 Simon Marchi <simon.marchi@ericsson.com>
+
+ * gdb.arch/ftrace-insn-reloc.exp: Save gdb_load_shlib result,
+ use it in info sharedlibrary test.
+ * gdb.trace/ftrace-lock.exp: Likewise.
+ * gdb.trace/ftrace.exp: Likewise.
+ * gdb.trace/range-stepping.exp: Likewise.
+ * gdb.trace/trace-break.exp: Likewise.
+ * gdb.trace/trace-condition.exp: Likewise.
+ * gdb.trace/trace-mt.exp: Likewise.
+
2016-04-27 Simon Marchi <simon.marchi@ericsson.com>
* lib/gdb.exp (gdb_load_shlibs): Rename to...
diff --git a/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp b/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp
index 22ec90fb53d..44d195755d4 100644
--- a/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp
+++ b/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp
@@ -38,7 +38,7 @@ if ![gdb_target_supports_trace] {
}
set libipa [get_in_proc_agent]
-gdb_load_shlib $libipa
+set remote_libipa [gdb_load_shlib $libipa]
# Can't use prepare_for_testing, because that splits compiling into
# building objects and then linking, and we'd fail with "linker input
@@ -58,7 +58,7 @@ if ![runto_main] {
gdb_reinitialize_dir $srcdir/$subdir
-if { [gdb_test "info sharedlibrary" ".*[file tail ${libipa}].*" "IPA loaded"] != 0 } {
+if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 } {
untested "Could not find IPA lib loaded"
return 1
}
diff --git a/gdb/testsuite/gdb.trace/ftrace-lock.exp b/gdb/testsuite/gdb.trace/ftrace-lock.exp
index dc0174b1ce4..0b12c8d16c5 100644
--- a/gdb/testsuite/gdb.trace/ftrace-lock.exp
+++ b/gdb/testsuite/gdb.trace/ftrace-lock.exp
@@ -48,7 +48,7 @@ if ![gdb_target_supports_trace] {
# Compile the test case with the in-process agent library.
set libipa [get_in_proc_agent]
-gdb_load_shlib $libipa
+set remote_libipa [gdb_load_shlib $libipa]
lappend options shlib=$libipa
@@ -64,7 +64,7 @@ if ![runto_main] {
return -1
}
-if { [gdb_test "info sharedlibrary" ".*[file tail ${libipa}].*" "IPA loaded"] != 0 } {
+if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 } {
untested "Could not find IPA lib loaded"
return 1
}
diff --git a/gdb/testsuite/gdb.trace/ftrace.exp b/gdb/testsuite/gdb.trace/ftrace.exp
index f54228705f2..f770bf73892 100644
--- a/gdb/testsuite/gdb.trace/ftrace.exp
+++ b/gdb/testsuite/gdb.trace/ftrace.exp
@@ -38,7 +38,7 @@ if ![gdb_target_supports_trace] {
}
set libipa [get_in_proc_agent]
-gdb_load_shlib $libipa
+set remote_libipa [gdb_load_shlib $libipa]
# Can't use prepare_for_testing, because that splits compiling into
# building objects and then linking, and we'd fail with "linker input
@@ -213,7 +213,7 @@ proc test_ftrace_condition { condexp var list } \
gdb_reinitialize_dir $srcdir/$subdir
-if { [gdb_test "info sharedlibrary" ".*[file tail ${libipa}].*" "IPA loaded"] != 0 } {
+if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 } {
untested "Could not find IPA lib loaded"
return 1
}
diff --git a/gdb/testsuite/gdb.trace/range-stepping.exp b/gdb/testsuite/gdb.trace/range-stepping.exp
index b135963b124..ba8c3d21dc2 100644
--- a/gdb/testsuite/gdb.trace/range-stepping.exp
+++ b/gdb/testsuite/gdb.trace/range-stepping.exp
@@ -67,7 +67,7 @@ proc range_stepping_with_tracepoint { type } {
range_stepping_with_tracepoint "trace"
set libipa [get_in_proc_agent]
-gdb_load_shlib $libipa
+set remote_libipa [gdb_load_shlib $libipa]
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
executable [list debug nowarnings shlib=$libipa] ] != "" } {
@@ -83,7 +83,7 @@ if ![runto_main] {
}
gdb_reinitialize_dir $srcdir/$subdir
-if { [gdb_test "info sharedlibrary" ".*${libipa}.*" "IPA loaded"] != 0 } {
+if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 } {
untested "Could not find IPA lib loaded"
} else {
range_stepping_with_tracepoint "ftrace"
diff --git a/gdb/testsuite/gdb.trace/trace-break.exp b/gdb/testsuite/gdb.trace/trace-break.exp
index afa8430c767..a90d02d5d5e 100644
--- a/gdb/testsuite/gdb.trace/trace-break.exp
+++ b/gdb/testsuite/gdb.trace/trace-break.exp
@@ -349,7 +349,7 @@ break_trace_same_addr_6 "trace" "enable" "trace" "disable"
break_trace_same_addr_6 "trace" "disable" "trace" "enable"
set libipa [get_in_proc_agent]
-gdb_load_shlib $libipa
+set remote_libipa [gdb_load_shlib $libipa]
# Can't use prepare_for_testing, because that splits compiling into
# building objects and then linking, and we'd fail with "linker input
@@ -368,7 +368,7 @@ if ![runto_main] {
}
gdb_reinitialize_dir $srcdir/$subdir
-if { [gdb_test "info sharedlibrary" ".*${libipa}.*" "IPA loaded"] != 0 } {
+if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 } {
untested "Could not find IPA lib loaded"
} else {
foreach break_always_inserted { "on" "off" } {
diff --git a/gdb/testsuite/gdb.trace/trace-condition.exp b/gdb/testsuite/gdb.trace/trace-condition.exp
index 787c52f8319..b7427cac413 100644
--- a/gdb/testsuite/gdb.trace/trace-condition.exp
+++ b/gdb/testsuite/gdb.trace/trace-condition.exp
@@ -38,7 +38,7 @@ if ![gdb_target_supports_trace] {
}
set libipa [get_in_proc_agent]
-gdb_load_shlib $libipa
+set remote_libipa [gdb_load_shlib $libipa]
# Can't use prepare_for_testing, because that splits compiling into
# building objects and then linking, and we'd fail with "linker input
@@ -57,7 +57,7 @@ if ![runto_main] {
return 0
}
-if { [gdb_test "info sharedlibrary" ".*${libipa}.*" "IPA loaded"] != 0 } {
+if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 } {
untested "Could not find IPA lib loaded"
return 1
}
diff --git a/gdb/testsuite/gdb.trace/trace-mt.exp b/gdb/testsuite/gdb.trace/trace-mt.exp
index 634bd858beb..b58034499b6 100644
--- a/gdb/testsuite/gdb.trace/trace-mt.exp
+++ b/gdb/testsuite/gdb.trace/trace-mt.exp
@@ -107,7 +107,7 @@ foreach break_always_inserted { "on" "off" } {
step_over_tracepoint "trace"
set libipa [get_in_proc_agent]
-gdb_load_shlib $libipa
+set remote_libipa [gdb_load_shlib $libipa]
# Compile test case again with IPA.
if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile \
@@ -123,7 +123,7 @@ if ![runto_main] {
}
gdb_reinitialize_dir $srcdir/$subdir
-if { [gdb_test "info sharedlibrary" ".*${libipa}.*" "IPA loaded"] != 0 } {
+if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 } {
untested "Could not find IPA lib loaded"
} else {
foreach break_always_inserted { "on" "off" } {
View Lorry Controller Status