Illumos regtest: improve filters

filter_fdleak - move the Solaris filters earlier, there is a multiline awk filter
that was being affected by the arm/FreeBSD filters

coredump filter is different between Solaris and Illumos

diff --git a/none/tests/filter_fdleak b/none/tests/filter_fdleak
index 260c6e24c06d4703ce611e45cba295672dce8665..f84008b6db5e417f68c091cdbb53985d4bd35d52 100755 (executable)
--- a/none/tests/filter_fdleak
+++ b/none/tests/filter_fdleak
@@ -16,6 +16,16 @@ perl -p -e 's/^Open file descriptor [0-9]*:$/Open file descriptor ...:/' |
 perl -p -e 's/File descriptor [0-9]*: .* is already closed/File descriptor ...: ... is already closed/' |
 perl -p -e 's/127.0.0.1:[0-9]*/127.0.0.1:.../g' |
 perl -p -e 's/socket\.c:[1-9][0-9]*/in \/...libc.../' |
+
+# Solaris specific fdleak filters
+perl -p -e 's/ __close / close /' |
+perl -p -e 's/ __write / write /' |
+sed '/ _so_socket /d;' |
+awk '/ socket /{sub(/ by /, " at "); print; next}{print}' |
+awk '/ at .* _syscall6 /{getline; getline; sub(/ by /, " at "); print; next}{print}' |
+sed '/__open/d' |
+sed 's/__systemcall6/creat/' |
+
 # arm systems substitute open for creat
 perl -p -e 's/open \(open64\.c:[1-9][0-9]*\)/creat (in \/...libc...)/' |
 perl -p -e "s/: open \(/: creat (/" |
@@ -28,15 +38,6 @@ sed '/by 0x........: close (in \/...libc...)/d' |
 sed '/by 0x........: creat (in \/...libc...)/d' |
 sed '/by 0x........: write (in \/...libc...)/d' |
 
-# Solaris specific fdleak filters
-perl -p -e 's/ __close / close /' |
-perl -p -e 's/ __write / write /' |
-sed '/ _so_socket /d;' |
-awk '/ socket /{sub(/ by /, " at "); print; next}{print}' |
-awk '/ at .* _syscall6 /{getline; getline; sub(/ by /, " at "); print; next}{print}' |
-sed '/__open/d' |
-sed 's/__systemcall6/creat/' |
-
 # Stack traces showing where fds were created have lots of variations:
 # different numbers of entries, line numbers or not depending on whether
 # libc debug info is present, 'main' vs. '(below main)', etc.  

diff --git a/none/tests/solaris/filter_coredump_many_threads_post b/none/tests/solaris/filter_coredump_many_threads_post
index 2d033700ef6d3df3bddaa4a86046408afa6ab770..e8284d1977c3c05bffdef01ce0ce77e385192f11 100755 (executable)
--- a/none/tests/solaris/filter_coredump_many_threads_post
+++ b/none/tests/solaris/filter_coredump_many_threads_post
@@ -16,4 +16,5 @@ perl -p -e 's/^(THREAD)\s+(STATE)\s+(SOBJ)\s+(COUNT)\s*$/$1 $2 $3 $4\n/' | \
 perl -p -e 's/^(\d+)\s+(UNPARKED)\s+(\S+)\s+(\d+)/$1 $2 $3 $4/g' | \
 perl -p -e 's/^\s*libc.*.so.1/libc.so.1/g' | \
 perl -p -e 's/\+0x[0-9A-Fa-f]+//g' |
-sed 's/^ *//g'
+sed 's/^ *//g' |
+sed '/_start_crt/d'