From: Ben Elliston <bje@au.ibm.com>
Date: Tue, 18 Nov 2008 22:00:42 +0000 (+0000)
Subject: dg-cmp-results.sh: Do not print usage if either .sum file cannot be opened...
X-Git-Tag: releases/gcc-4.4.0~1606
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a401a0df37dd6d55bf20b75ddf977f1b14c98f7;p=thirdparty%2Fgcc.git

dg-cmp-results.sh: Do not print usage if either .sum file cannot be opened...

	* dg-cmp-results.sh: Do not print usage if either .sum file cannot
	be opened; print a more meaningful error instead.

From-SVN: r141979
---

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 5bdf4a2c9bfa..4f49364ef3d1 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-18  Ben Elliston  <bje@au.ibm.com>
+
+	* dg-cmp-results.sh: Do not print usage if either .sum file cannot
+	be opened; print a more meaningful error instead.
+
 2008-10-24  Janis Johnson  <janis187@us.ibm.com>
 	    Jakub Jelinek  <jakub@redhat.com>
 
diff --git a/contrib/dg-cmp-results.sh b/contrib/dg-cmp-results.sh
index 753005db2048..d291769547dc 100755
--- a/contrib/dg-cmp-results.sh
+++ b/contrib/dg-cmp-results.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (C) 2006 Free Software Foundation
+# Copyright (C) 2006, 2008 Free Software Foundation
 #
 # Analyze changes in GCC DejaGNU test logs for binutils, gcc, gdb, etc.
 # Original version written in 2005 by James Lemke <jwlemke@wasabisystems.com>.
@@ -27,11 +27,21 @@ while test "$1" = "-v"; do
     shift
 done
 
-if test $# -ne 3 -o ! -f "$2" -o ! -f "$3"; then
+if test $# -ne 3 ; then
     usage
     exit 1
 fi
 
+if test ! -f "$2"; then
+    echo "unable to open $2" >&2
+    exit 1
+fi
+
+if test ! -f "$3"; then
+    echo "unable to open $3" >&2
+    exit 1
+fi
+
 # Command differences for various platforms.
 case `uname -s` in
 Darwin|NetBSD)