From ec4aca9abe6712786a716df5f5d54df02f48e011cd56bb8ac47e1715da92361f Mon Sep 17 00:00:00 2001
From: Tom de Vries <tdevries@suse.com>
Date: Thu, 18 Nov 2021 11:54:30 +0000
Subject: [PATCH] Accepting request 932239 from
 home:tomdevries:branches:devel:gcc-gdb-sle-11-librpm-v2

- Maintenance script qa.sh:
  - Add internal-error KFAILs.
  - Rewrite gdb.suse check to distinguish between:
    "zypper hint printed (librpm)" and
    "zypper hint printed (no librpm)".
- Patch updated (zypper hint doesn't use librpm on SLE-11):
  * gdb-testsuite-add-gdb.suse-zypper-hint.exp.patch

OBS-URL: https://build.opensuse.org/request/show/932239
OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gdb?expand=0&rev=304
---
 ...stsuite-add-gdb.suse-zypper-hint.exp.patch | 24 ++++++++++++++-----
 gdb.changes                                   | 15 ++++++++++++
 qa.sh                                         | 15 ++++++++++--
 3 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/gdb-testsuite-add-gdb.suse-zypper-hint.exp.patch b/gdb-testsuite-add-gdb.suse-zypper-hint.exp.patch
index ef85ceb..b1d3bf2 100644
--- a/gdb-testsuite-add-gdb.suse-zypper-hint.exp.patch
+++ b/gdb-testsuite-add-gdb.suse-zypper-hint.exp.patch
@@ -1,9 +1,11 @@
+gdb-testsuite-add-gdb.suse-zypper-hint.exp
+
 [gdb/testsuite] Add gdb.suse/zypper-hint.exp
 
 ---
- gdb/testsuite/gdb.suse/zypper-hint.c   | 25 +++++++++++++++++++
- gdb/testsuite/gdb.suse/zypper-hint.exp | 45 ++++++++++++++++++++++++++++++++++
- 2 files changed, 70 insertions(+)
+ gdb/testsuite/gdb.suse/zypper-hint.c   | 25 ++++++++++++++++
+ gdb/testsuite/gdb.suse/zypper-hint.exp | 55 ++++++++++++++++++++++++++++++++++
+ 2 files changed, 80 insertions(+)
 
 diff --git a/gdb/testsuite/gdb.suse/zypper-hint.c b/gdb/testsuite/gdb.suse/zypper-hint.c
 new file mode 100644
@@ -38,10 +40,10 @@ index 00000000000..e179788f04f
 +}
 diff --git a/gdb/testsuite/gdb.suse/zypper-hint.exp b/gdb/testsuite/gdb.suse/zypper-hint.exp
 new file mode 100644
-index 00000000000..a9dc84b96f2
+index 00000000000..c2b9a1134bd
 --- /dev/null
 +++ b/gdb/testsuite/gdb.suse/zypper-hint.exp
-@@ -0,0 +1,45 @@
+@@ -0,0 +1,55 @@
 +# Copyright 2021 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -79,9 +81,19 @@ index 00000000000..a9dc84b96f2
 +    "Missing separate debuginfos, use: zypper install glibc-debuginfo-"
 +set re_32 \
 +    "Missing separate debuginfos, use: zypper install glibc-32bit-debuginfo-"
++
++set hexno0x "\[0-9A-Fa-f\]+"
++set re_nolibrpm \
++    [multi_line \
++	 "Missing separate debuginfo for .*libc.so.*" \
++	 "Try: zypper install -C \"debuginfo\\(build-id\\)=$hexno0x\""]
++
 +gdb_test_multiple "" $test {
 +    -re -wrap ($re_64|$re_32).* {
-+	pass $gdb_test_name
++	pass "$gdb_test_name (librpm)"
++    }
++    -re -wrap $re_nolibrpm.* {
++	pass "$gdb_test_name (no librpm)"
 +    }
 +}
 +
diff --git a/gdb.changes b/gdb.changes
index 7ba16c5..e014b96 100644
--- a/gdb.changes
+++ b/gdb.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Nov 18 11:45:00 UTC 2021 - Tom de Vries <tdevries@suse.com>
+
+- Maintenance script qa.sh:
+  - Add internal-error KFAILs.
+  - Rewrite gdb.suse check to distinguish between:
+    "zypper hint printed (librpm)" and
+    "zypper hint printed (no librpm)".
+
+-------------------------------------------------------------------
+Tue Nov 16 15:50:08 UTC 2021 - Tom de Vries <tdevries@suse.com>
+
+- Patch updated (zypper hint doesn't use librpm on SLE-11):
+  * gdb-testsuite-add-gdb.suse-zypper-hint.exp.patch
+
 -------------------------------------------------------------------
 Thu Nov 11 10:36:08 UTC 2021 - Tom de Vries <tdevries@suse.com>
 
diff --git a/qa.sh b/qa.sh
index 0a2bc2d..6634d24 100644
--- a/qa.sh
+++ b/qa.sh
@@ -218,6 +218,10 @@ case $n in
 	    "linux-nat.c:[0-9]*: internal-error: wait returned unexpected status"
 	    # https://sourceware.org/bugzilla/show_bug.cgi?id=28553
 	    "infrun.c:[0-9]*: internal-error: thread .* needs a step-over, but not in step-over queue"
+	    # https://sourceware.org/bugzilla/show_bug.cgi?id=19675
+	    "linux-nat.c:[0-9]*: internal-error: wait returned unexpected"
+	    # https://sourceware.org/bugzilla/show_bug.cgi?id=28604
+	    "x86-linux-dregs.c:[0-9]*: internal-error: void x86_linux_update_debug_registers\(lwp_info\*\): Assertion \`lwp_is_stopped \(lwp\)' failed."
 	)
 
 	kfail_re=$(join "|" "${kfail[@]}")
@@ -276,8 +280,15 @@ case $n in
 	;;
 
     5)
-	grep -c "PASS: gdb.suse/zypper-hint.exp: zypper hint printed" \
-	     binaries-testsuite*/gdb-testresults/*.sum \
+	librpm=$(ls -1 binaries-testsuite*/gdb-testresults/*.sum \
+		     | grep -v SLE-11)
+	nolibrpm=$(ls -1 binaries-testsuite*/gdb-testresults/*.sum \
+		     | grep SLE-11)
+	grep -c "PASS: gdb.suse/zypper-hint.exp: zypper hint printed (librpm)" \
+	     $librpm \
+	    | grep -E -v ":1"
+	grep -c "PASS: gdb.suse/zypper-hint.exp: zypper hint printed (no librpm)" \
+	     $nolibrpm \
 	    | grep -E -v ":1"
 	;;