X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=bin%2Fdiffgdb;h=e34b9c870d5987d232c4162005821e7470b25dd3;hp=260cbce3c530980f230931a5530cd63047fea0cf;hb=0bf9511669dad2f4c8e36c9ec9d19e000ffe456d;hpb=6cd572959fdcc6961773eb49c86dd23c95643fb9

diff --git a/bin/diffgdb b/bin/diffgdb
index 260cbce..e34b9c8 100755
--- a/bin/diffgdb
+++ b/bin/diffgdb
@@ -1,5 +1,14 @@
 #! /bin/sh
-exec diff \
+filt=true
+if [ "$1" = "-r" ];then
+  filt=false
+  shift
+fi
+if [ "$1" = "-f" ];then
+  filt=true
+  shift
+fi
+exec diff $(if false && $filt;then echo "-U999999";else echo "-u";fi) \
 	-I '^Test Run By ' \
 	-I '^gnatbind ' \
 	-I '^gnatlink ' \
@@ -43,4 +52,18 @@ exec diff \
 	-I '^\(PASS\|FAIL\): gdb.threads/manythreads.exp: info threads$' \
 	-I 'gdb version  [0-9][^ ]* -nw -nx $' \
 	-I '^\(PASS\|FAIL\): gdb.threads/attach-stopped.exp: threaded: attach1, exit leaves process stopped$' \
--ru "$@" | grep -v '^diff '
+	-I '^\(PASS\|FAIL\): gdb.threads/local-watch-wrong-thread.exp: local watchpoint automatically deleted\(\| (timeout)\)$' \
+	-I '^\(PASS\|FAIL\): gdb.server/server-run.exp: continue to main$' \
+	-I '^\(PASS\|FAIL\): gdb.mi/mi-nonstop.exp: w1,i0 stop\(\| (timeout)\)$' \
+	-I '^\(PASS\|FAIL\): gdb.reverse/i387-env-reverse.exp: set reverse direction\(\| (timeout)\)$' \
+	-I '^\(PASS\|FAIL\): gdb.mi/mi-file-transfer.exp: compare intermediate binary file$' \
+	-I '^\(PASS\|FAIL\): gdb.mi/mi-file-transfer.exp: compare binary file$' \
+	-I '^\(PASS\|FAIL\): gdb.mi/mi-file-transfer.exp: deleted binary file$' \
+	-I '^\(PASS\|FAIL\): gdb.mi/mi-simplerun.exp: continue to end\(\| (failed to resume)\)$' \
+	-I '^\(PASS\|FAIL\): gdb.mi/mi-simplerun.exp: continue to end\(\| (unknown output after running)\)$' \
+	-I '^\(PASS\|FAIL\): gdb.server/file-transfer.exp: verified deleted binary file$' \
+	-I '^\(PASS\|FAIL\): gdb.server/file-transfer.exp: deleted binary file$' \
+	-I '^\(PASS\|FAIL\): gdb.threads/attachstop-mt.exp: attach1, post-gdb sanity check of the sleeping state - Red Hat BZ 197584$' \
+-ru "$@" | if $filt;then diffgdbfilt;else grep -v '^diff ';fi
+
+#	-I '^"uplevel #0 source .*gdb/testsuite/gdb.threads/watchthreads-thr.*\.\.\."$' \