[gdb/testsuite] Fix check-libthread-db.exp FAILs with glibc 2.33

When running test-case gdb.threads/check-libthread-db.exp on openSUSE
Tumbleweed with glibc 2.33, I get:
...
(gdb) maint check libthread-db^M
Running libthread_db integrity checks:^M
  Got thread 0x7ffff7c79b80 => 9354 => 0x7ffff7c79b80; errno = 0 ... OK^M
libthread_db integrity checks passed.^M
(gdb) FAIL: gdb.threads/check-libthread-db.exp: user-initiated check: \
  libpthread.so not initialized (pattern 2)
...

The test-case expects instead:
...
  Got thread 0x0 => 9354 => 0x0 ... OK^M
...
which is what I get on openSUSE Leap 15.2 with glibc 2.26, and what is
described in the test-case like this:
...
    # libthread_db should fake a single thread with th_unique == NULL.
...

Using a breakpoint on check_thread_db_callback we can compare the two
scenarios, and find that in the latter case we hit this code in glibc function
iterate_thread_list in nptl_db/td_ta_thr_iter.c:
...
  if (next == 0 && fake_empty)
    {
      /* __pthread_initialize_minimal has not run.  There is just the main
         thread to return.  We cannot rely on its thread register.  They
         sometimes contain garbage that would confuse us, left by the
         kernel at exec.  So if it looks like initialization is incomplete,
         we only fake a special descriptor for the initial thread.  */
      td_thrhandle_t th = { ta, 0 };
      return callback (&th, cbdata_p) != 0 ? TD_DBERR : TD_OK;
    }
...
while in the former case we don't because this preceding statement doesn't
result in next == 0:
...
  err = DB_GET_FIELD (next, ta, head, list_t, next, 0);
...

Note that the comment mentions __pthread_initialize_minimal, but in both cases
it has already run before we hit the callback, so it's possible the comment is
no longer accurate.

The change in behaviour bisect to glibc commit 1daccf403b "nptl: Move stack
list variables into _rtld_global", which moves the initialization of stack
list variables such as __stack_user to an earlier moment, which explains well
enough the observed difference.

Fix this by updating the regexp patterns to agree with what libthread-db is
telling us.

Tested on x86_64-linux, both with glibc 2.33 and 2.26.

gdb/testsuite/ChangeLog:

2021-07-13  Tom de Vries  <tdevries@suse.de>

	PR testsuite/27690
	* gdb.threads/check-libthread-db.exp: Update patterns for glibc 2.33.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b4fb5e8e20f823aca651e7fc0e0eae07b3e43bc4..38fc4128f26a6eb747bb76b0bcb6d4a8b31a84e8 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2021-07-13  Tom de Vries  <tdevries@suse.de>
+
+       PR testsuite/27690
+       * gdb.threads/check-libthread-db.exp: Update patterns for glibc 2.33.
+
 2021-07-13  Simon Marchi  <simon.marchi@polymtl.ca>
 
        * gdb.mi/interrupt-thread-group.c: New.

diff --git a/gdb/testsuite/gdb.threads/check-libthread-db.exp b/gdb/testsuite/gdb.threads/check-libthread-db.exp
index dfb3bad3712eb7fe8b28dc62e6daed7e63c7817e..6ecf40db6a973bc5e9fc71882679caac508038ea 100644 (file)
--- a/gdb/testsuite/gdb.threads/check-libthread-db.exp
+++ b/gdb/testsuite/gdb.threads/check-libthread-db.exp
@@ -32,6 +32,13 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
     return -1
 }
 
+# Case 1: libthread_db fakes a single thread with th_unique == NULL.
+set thread_re1 "0 => $decimal => 0"
+# Case 2: libthread_db already initialized.
+set thread_re2 "$hex => $decimal => ${hex}(; errno = 0)?"
+# Match either of the two cases.
+set initial_thread_re "($thread_re1|$thread_re2)"
+
 with_test_prefix "user-initiated check" {
 
     # User-initiated check with libthread_db not loaded.
@@ -49,18 +56,16 @@ with_test_prefix "user-initiated check" {
        "No libthread_db loaded" \
        "no libpthread.so loaded"
 
-
-    # User-initiated check with NPTL uninitialized.
-    # libthread_db should fake a single thread with th_unique == NULL.
+    # User-initiated check with NPTL possibly uninitialized.
     gdb_test "continue" \
        ".*Stopped due to shared library event.*Inferior loaded .*libpthread.*"
 
     gdb_test_sequence "maint check libthread-db" \
-       "libpthread.so not initialized" {
-           "\[\r\n\]+Running libthread_db integrity checks:"
-           "\[\r\n\]+\[ \]+Got thread 0x0 => \[0-9\]+ => 0x0 ... OK"
-           "\[\r\n\]+libthread_db integrity checks passed."
-       }
+       "libpthread.so possibly not initialized" \
+       [list \
+            "\[\r\n\]+Running libthread_db integrity checks:" \
+            "\[\r\n\]+\[ \]+Got thread $initial_thread_re ... OK" \
+            "\[\r\n\]+libthread_db integrity checks passed."]
 
     # User-initiated check with NPTL fully operational.
     gdb_test_no_output "set stop-on-solib-events 0"
@@ -78,8 +83,8 @@ with_test_prefix "user-initiated check" {
 
 with_test_prefix "automated load-time check" {
 
-    # Automated load-time check with NPTL uninitialized.
-    with_test_prefix "libpthread.so not initialized" {
+    # Automated load-time check with NPTL possibly uninitialized.
+    with_test_prefix "libpthread.so possibly not initialized" {
        clean_restart ${binfile}
 
        gdb_test_no_output "maint set check-libthread-db 1"
@@ -88,12 +93,12 @@ with_test_prefix "automated load-time check" {
        gdb_run_cmd
 
        gdb_test_sequence "" \
-           "check debug libthread-db output" {
-               "\[\r\n\]+Running libthread_db integrity checks:"
-               "\[\r\n\]+\[ \]+Got thread 0x0 => \[0-9\]+ => 0x0 ... OK"
-               "\[\r\n\]+libthread_db integrity checks passed."
-               "\[\r\n\]+[Thread debugging using libthread_db enabled]"
-           }
+           "check debug libthread-db output" \
+           [list \
+                "\[\r\n\]+Running libthread_db integrity checks:" \
+                "\[\r\n\]+\[ \]+Got thread $initial_thread_re ... OK" \
+                "\[\r\n\]+libthread_db integrity checks passed." \
+                "\[\r\n\]+\\\[Thread debugging using libthread_db enabled\\\]"]
     }
 
     # Automated load-time check with NPTL fully operational.