[PATCH v12 29/32] testcase: Test also locating shlibs by build-id

[Jan Kratochvil <jan.kratochvil@redhat.com>]

Hi,

testcase from the previous patch tests verification of build-id in shared
libraries found by their name.  This test adds testing that a library can be
found by its build-id (debug-file-directory/.build-id/XX/YYYYY...YYYYY).


Jan


gdb/testsuite/ChangeLog
2015-08-20  Jan Kratochvil  <jan.kratochvil@redhat.com>

	* gdb.base/solib-mismatch.exp (nocrlf, expected_header): Make them
	global.
	(solib_locate_test): New function.
---
 gdb/testsuite/gdb.base/solib-mismatch.exp |   46 ++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/gdb.base/solib-mismatch.exp b/gdb/testsuite/gdb.base/solib-mismatch.exp
index 4983429..4ae8ac8 100644
--- a/gdb/testsuite/gdb.base/solib-mismatch.exp
+++ b/gdb/testsuite/gdb.base/solib-mismatch.exp
@@ -59,6 +59,10 @@ set binlibfilegdb ${binlibfiledirgdb}/${binlibfilebase}
 set srcfile ${testfile}.c
 set executable ${testfile}
 
+# Pattern matching for 'info sharedlibrary'.
+set nocrlf "\[^\r\n\]*"
+set expected_header "From${nocrlf}To${nocrlf}Syms${nocrlf}Read${nocrlf}Shared${nocrlf}"
+
 file delete -force -- "${binlibfiledirrun}"
 file mkdir "${binlibfiledirrun}"
 
@@ -91,6 +95,8 @@ proc solib_matching_test { solibfile symsloaded } {
   global binlibfiledirrun
   global binlibfiledirgdb
   global srcfile
+  global expected_header
+  global nocrlf
 
   clean_restart ${binlibfiledirrun}/${executable}
 
@@ -110,8 +116,6 @@ proc solib_matching_test { solibfile symsloaded } {
 
   gdb_test "sharedlibrary" "" ""
 
-  set nocrlf "\[^\r\n\]*"
-  set expected_header "From${nocrlf}To${nocrlf}Syms${nocrlf}Read${nocrlf}Shared${nocrlf}"
   set expected_line "${symsloaded}${nocrlf}${solibfile}"
 
   gdb_test "info sharedlibrary ${solibfile}" \
@@ -121,6 +125,23 @@ proc solib_matching_test { solibfile symsloaded } {
   return 0
 }
 
+proc solib_locate_test { solibfile symsloaded } {
+  global binlibfiledirrun
+  global binlibfilerun
+  global nocrlf
+  global expected_header
+
+  gdb_test_no_output "set debug-file-directory ${binlibfiledirrun}" ""
+  gdb_test_no_output "nosharedlibrary" ""
+  gdb_test "sharedlibrary" "" ""
+
+  set expected_line "${symsloaded}${nocrlf}${solibfile}"
+
+  gdb_test "info sharedlibrary ${solibfile}" \
+    "${expected_header}\r\n.*${expected_line}.*" \
+    "Symbols for ${solibfile} loaded: expected '${symsloaded}'"
+}
+
 # Copy binary to working dir so it pulls in the library from that dir
 # (by the virtue of $ORIGIN).
 file copy -force "${binlibfiledirgdb}/${executable}" \
@@ -144,9 +165,30 @@ with_test_prefix "test --only-keep-debug" {
   solib_matching_test "${binlibfilebase}" "No"
 }
 
+# Test locating file by its build-id - if the regular filename does not match.
+# build-id file has to be a symlink - otherwise so_list->so_name shown in 'info
+# sharedlibrary' would contain the build-id hash and not the library name.
+set build_id_debug_relative [build_id_debug_filename_get $binlibfilerun]
+if { ![regexp {^(.*)\.debug$} $build_id_debug_relative trash build_id_relative] } {
+    fail "strip debug $build_id_debug_relative"
+    return
+}
+set build_id_filename "${binlibfiledirrun}/$build_id_relative"
+file mkdir [file dirname $build_id_filename]
+remote_exec host "ln -sf $binlibfilerun $build_id_filename"
+with_test_prefix "locate non-matching shared library" {
+  solib_locate_test "${binlibfilebase}" "Yes"
+}
+
 # Keep previous so for debugging puroses
 file copy -force "${binlibfilegdb}" "${binlibfilegdb}-orig1"
 
+# Test locating file by its build-id - if the regular filename does not exist.
+file delete -force "${binlibfilegdb}"
+with_test_prefix "locate non-existing shared library" {
+  solib_locate_test "${binlibfilebase}" "Yes"
+}
+
 # Copy loaded so over the one gdb will find
 file copy -force "${binlibfilerun}" "${binlibfilegdb}"