blob: fce66b96aec00d0899922dc2199dcf932f475b4b [file] [log] [blame]
Patrick Williams213cb262021-08-07 19:21:33 -05001From 6da22a4d246519cd1a638cfc7eff00cdd74413c4 Mon Sep 17 00:00:00 2001
2From: Mark Wielaard <mark@klomp.org>
3Date: Fri, 16 Jul 2021 21:37:21 +0200
4Subject: [PATCH] gdbserver_tests: update filters for newer glibc/gdb
5
6With newer glibc/gdb we might see a __select call without anything
7following on the line. Also when gdb cannot find a file it might
8now print "Inappropriate ioctl for device" instead of the message
9"No such file or directory"
10
11Upstream-Status: Backport
12---
13 gdbserver_tests/filter_gdb | 1 +
14 gdbserver_tests/filter_vgdb | 1 +
15 2 files changed, 2 insertions(+)
16
17diff --git a/gdbserver_tests/filter_gdb b/gdbserver_tests/filter_gdb
18index 3bcd26d86c..4a5b5d7a5b 100755
19--- a/gdbserver_tests/filter_gdb
20+++ b/gdbserver_tests/filter_gdb
21@@ -111,6 +111,7 @@ s/\(0x........\) in ?? ()$/\1 in syscall .../
22 # If select.c sources are present, we can also get a line containing:
23 # return SYSCALL_CANCEL....
24 s/in __select .*/in syscall .../
25+s/in __select$/in syscall .../
26 /exceptfds/d
27 /sysv\/linux\/select\.c/d
28 /return SYSCALL_CANCEL /d
29diff --git a/gdbserver_tests/filter_vgdb b/gdbserver_tests/filter_vgdb
30index f8028a39ad..679ca4b31c 100755
31--- a/gdbserver_tests/filter_vgdb
32+++ b/gdbserver_tests/filter_vgdb
33@@ -18,6 +18,7 @@ sed -e '/relaying data between gdb and process/d' \
34
35 # filter some debuginfo problems with ld.so and SLES11
36 sed -e '/^1 rtld.c: No such file or directory\./d' |
37+sed -e '/rtld.c: Inappropriate ioctl for device\./d' |
38
39 # and filter out any remaining empty lines
40 sed -e '/^$/d'
41--
422.27.0
43