Fiddle dwarfcmp test failure output.

2 files changed, 11 insertions, 5 deletions

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 1e5db4aa..b988cfec 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,6 +1,7 @@
 2009-07-01  Roland McGrath  <roland@redhat.com>
 
 	* run-dwarfcmp-self.sh: Run on dwarflint too.
+	Fiddle failure output.
 
 2009-06-15  Roland McGrath  <roland@redhat.com>
 
diff --git a/tests/run-dwarfcmp-self.sh b/tests/run-dwarfcmp-self.sh
index f108d060..cce6641a 100755
--- a/tests/run-dwarfcmp-self.sh
+++ b/tests/run-dwarfcmp-self.sh
@@ -26,15 +26,20 @@
 . $srcdir/test-subr.sh
 
 status=0
+run_one()
+{
+  file="$1"; shift
+  testrun ../src/dwarfcmp "$@" "$file" "$file" ||
+  { echo "*** failure in dwarfcmp-self $* on $file"; status=1; }
+}
+
 runtest()
 {
   for file; do
     if [ -f $file ]; then
-      { testrun ../src/dwarfcmp -q -i $file $file &&
-	testrun ../src/dwarfcmp -i $file $file &&
-	testrun ../src/dwarfcmp -T -q -i $file $file
-      } ||
-      { echo "*** failure in $file"; status=1; }
+      run_one "$file" -i -q
+      run_one "$file" -i
+      run_one "$file" -i -q -T
     fi
   done
 }