From 45c61d598f435d59302dea084912cd3390de1ffc Mon Sep 17 00:00:00 2001
From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Sat, 28 Jan 2023 18:27:16 +0100
Subject: [PATCH] Illumos: regtest filters and gitignore

Filter for the gdb python autoload warnings
Filter for another variation of shell abort messages
---
 .gitignore                     | 14 ++++++++++++--
 gdbserver_tests/filter_vgdb.in |  1 +
 tests/filter_stderr_basic.in   |  2 ++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2400b4571..b6c285234 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1213,15 +1213,18 @@
 /memcheck/tests/solaris/scalar_frealpathat
 /memcheck/tests/solaris/scalar_getrandom
 /memcheck/tests/solaris/scalar_ioctl
+/memcheck/tests/solaris/scalar_lwp_kill
 /memcheck/tests/solaris/scalar_lwp_name
 /memcheck/tests/solaris/scalar_lwp_sigqueue
 /memcheck/tests/solaris/scalar_lwp_sigqueue_pid
 /memcheck/tests/solaris/scalar_modctl_modnvl
+/memcheck/tests/solaris/scalar_obsolete
 /memcheck/tests/solaris/scalar_shm_new
 /memcheck/tests/solaris/scalar_spawn
 /memcheck/tests/solaris/scalar_system_stats
 /memcheck/tests/solaris/scalar_tsol_clearance
 /memcheck/tests/solaris/scalar_utimensat
+/memcheck/tests/solaris/scalar_utimesys
 /memcheck/tests/solaris/scalar_uuidsys
 /memcheck/tests/solaris/scalar_zone_defunct
 /memcheck/tests/solaris/sendfilev
@@ -1307,6 +1310,7 @@
 /memcheck/tests/x86-solaris/context_sse
 /memcheck/tests/x86-solaris/ldsoexec
 /memcheck/tests/x86-solaris/scalar
+/memcheck/tests/x86-solaris/scalar_obsolete
 
 # /memcheck/tests/freebsd/
 /memcheck/tests/freebsd/*.stderr.diff*
@@ -1657,6 +1661,8 @@
 /none/tests/amd64-solaris/*.stderr.out
 /none/tests/amd64-solaris/*.stdout.diff
 /none/tests/amd64-solaris/*.stdout.out
+/none/tests/amd64-solaris/*.post.diff
+/none/tests/amd64-solaris/*.post.out
 /none/tests/amd64-solaris/.deps
 /none/tests/amd64-solaris/Makefile
 /none/tests/amd64-solaris/Makefile.in
@@ -2051,6 +2057,8 @@
 /none/tests/solaris/*.stderr.out
 /none/tests/solaris/*.stdout.diff
 /none/tests/solaris/*.stdout.out
+/none/tests/solaris/*.post.diff
+/none/tests/solaris/*.post.out
 /none/tests/solaris/.deps
 /none/tests/solaris/Makefile
 /none/tests/solaris/Makefile.in
@@ -2095,9 +2103,9 @@
 
 # /none/tests/x86/
 /none/tests/x86/*.dSYM
-/none/tests/x86/*.stderr.diff
+/none/tests/x86/*.stderr.diff*
 /none/tests/x86/*.stderr.out
-/none/tests/x86/*.stdout.diff
+/none/tests/x86/*.stdout.diff*
 /none/tests/x86/*.stdout.out
 /none/tests/x86/.deps
 /none/tests/x86/aad_aam
@@ -2196,6 +2204,8 @@
 /none/tests/x86-solaris/*.stderr.out
 /none/tests/x86-solaris/*.stdout.diff
 /none/tests/x86-solaris/*.stdout.out
+/none/tests/x86-solaris/*.post.diff
+/none/tests/x86-solaris/*.post.out
 /none/tests/x86-solaris/.deps
 /none/tests/x86-solaris/Makefile
 /none/tests/x86-solaris/Makefile.in
diff --git a/gdbserver_tests/filter_vgdb.in b/gdbserver_tests/filter_vgdb.in
index bd593d91c..c1844e90c 100755
--- a/gdbserver_tests/filter_vgdb.in
+++ b/gdbserver_tests/filter_vgdb.in
@@ -37,6 +37,7 @@ $SED -e '/warning: File .*valgrind-monitor.py.*declined.*/d' |
 $SED -e '/warning: Missing auto-load script.*/d' |
 $SED -e '/of file .*vgpreload.*so.*/d' |
 $SED -e '/Use.*info auto-load python-scripts.*/d' |
+$SED -e '/warning: Invalid entry in .debug_gdb_scripts section/d' |
 
 # and filter out any remaining empty lines
 $SED -e '/^$/d'
diff --git a/tests/filter_stderr_basic.in b/tests/filter_stderr_basic.in
index fc1d19b35..db83e9f36 100755
--- a/tests/filter_stderr_basic.in
+++ b/tests/filter_stderr_basic.in
@@ -52,6 +52,8 @@ perl -n -e 'print if !/^(Segmentation fault|Alarm clock|Aborted|Bus error|Killed
 
 # Similar as above, but for ksh on Solaris/illumos.
 perl -n -e 'print if !/^(Memory fault|Killed) $/' |
+# bash on Illumos
+$SED '/sh: [1-9][0-9]*: Memory fault/d' |
 
 # Translate intercepted glibc functions back to their canonical name
 perl -p -e "s/: memcpy\@\@?GLIBC_[.1-9]+ \(vg_replace_strmem.c:.*?\)/: memcpy \(vg_replace_strmem.c:...\)/" |
-- 
2.11.4.GIT