#! /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 ' \
-I '^ld/ld-new [0-9.]*$' \
-I '^\(PASS\|FAIL\): gdb.mi/mi-break.exp: test hitting breakpoint with commands$' \
-I '^\(PASS\|FAIL\): gdb.threads/attach-stopped.exp: threaded: attach2, exit leaves process sleeping$' \
+ -I '^\(PASS\|FAIL\): gdb.threads/attachstop-mt.exp: attach3, exit leaves process stopped$' \
-I '^\(PASS\|FAIL\): gdb.threads/attachstop-mt.exp: attach4 stop by interrupt\(\| (timeout)\)$' \
-I '^\(PASS\|FAIL\): gdb.threads/attachstop-mt.exp: attach4, exit leaves process sleeping$' \
-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.*\.\.\."$' \