* lib/future.exp (gdb_find_ldd): New proc.

	* lib/prelink-support.exp (build_executable_own_libs): Call it.
	Make "/usr/sbin/" in prelink path optional.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 0b681f45cdef52368fadf5603bb7047b02bc48f4..7a43b73e18af0f20b2ee59fc445edd16c3fb9cb6 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-09  Doug Evans  <dje@google.com>
+
+       * lib/future.exp (gdb_find_ldd): New proc.
+       * lib/prelink-support.exp (build_executable_own_libs): Call it.
+       Make "/usr/sbin/" in prelink path optional.
+
 2013-08-09  Yao Qi  <yao@codesourcery.com>
 
        * gdb.trace/collection.exp (gdb_collect_args_test): Set

diff --git a/gdb/testsuite/lib/future.exp b/gdb/testsuite/lib/future.exp
index 5d53e9352b1d70fe90ee20a441b6a8ae296687ff..422342b2f3753219d780ea96963864837aa99fb3 100644 (file)
--- a/gdb/testsuite/lib/future.exp
+++ b/gdb/testsuite/lib/future.exp
@@ -84,6 +84,16 @@ proc gdb_find_go_linker {} {
     return [find_go]
 }
 
+proc gdb_find_ldd {} {
+    global LDD_FOR_TARGET
+    if [info exists LDD_FOR_TARGET] {
+       set ldd $LDD_FOR_TARGET
+    } else {
+       set ldd "ldd"
+    }
+    return $ldd
+}
+
 proc gdb_default_target_compile {source destfile type options} {
     global target_triplet
     global tool_root_dir

diff --git a/gdb/testsuite/lib/prelink-support.exp b/gdb/testsuite/lib/prelink-support.exp
index ef9978369526277ef203ae78a9eab8b517e44ce3..fca7aa4c2cdee5af2fa3e74ffb586d133537f095 100644 (file)
--- a/gdb/testsuite/lib/prelink-support.exp
+++ b/gdb/testsuite/lib/prelink-support.exp
@@ -124,7 +124,8 @@ proc build_executable_own_libs {testname executable sources options {interp ""}
     }
     set binfile ${objdir}/${subdir}/${executable}
 
-    set command "ldd $binfile"
+    set ldd [gdb_find_ldd]
+    set command "$ldd $binfile"
     set test "ldd $executable"
     set result [catch "exec $command" output]
     verbose -log "result of $command is $result"
@@ -235,7 +236,7 @@ proc prelink_no {arg {name {}}} {
     }
     # Last line does miss the trailing \n.  There can be multiple such messages
     # as ARG may list multiple files.
-    if {$result == 1 && [regexp {^(/usr/sbin/prelink[^\r\n]*: [^ ]* does not have .gnu.prelink_undo section\n?)*$} $output]} {
+    if {$result == 1 && [regexp {^([^\r\n]*prelink[^\r\n]*: [^ ]* does not have .gnu.prelink_undo section\n?)*$} $output]} {
        pass $test
        return 1
     } else {