check_jni_methods.sh.in: Don't use diff -U.

	libjava/classpath:
	* scripts/check_jni_methods.sh.in: Don't use diff -U.
	Adapt grep regex, ignore file and problem message.

	contrib:
	* test_summary: Don't use diff -u.
	Adapt egrep regex.

From-SVN: r160264

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index ee039071bf132ce4aea87350122c5c91988fe7c3..f03daf82766b6a6e47b7102faafab3eb77ee7017 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-04  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * test_summary: Don't use diff -u.
+       Adapt egrep regex.
+
 2010-06-02  Andrew Haley  <aph@redhat.com>
 
        * download_prerequisites: New script.

diff --git a/contrib/test_summary b/contrib/test_summary
index c4b3c2c9369b3748a41b0f27ce47cb7683fce384..5fc49f52bda7a7ab0eedef0e9f6f96924b69f4bd 100755 (executable)
--- a/contrib/test_summary
+++ b/contrib/test_summary
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# (C) 1998, 1999, 2000, 2002, 2003, 2004, 2007, 2009
+# (C) 1998, 1999, 2000, 2002, 2003, 2004, 2007, 2009, 2010
 # Free Software Foundation
 # Originally by Alexandre Oliva <oliva@dcc.unicamp.br>
 
@@ -75,9 +75,9 @@ for file in $files; do
     [ -f $file ] &&
     anyfile=true &&
     { $anychange ||
-      anychange=`diff -u $file.sent $file 2>/dev/null |
+      anychange=`diff $file.sent $file 2>/dev/null |
        if test ! -f $file.sent ||
-          egrep '^[-+](XPASS|FAIL)' >/dev/null; then
+          egrep '^[<>] (XPASS|FAIL)' >/dev/null; then
            echo true
        else
            echo false

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 920bc8201a8b5b46537ddb20a7a99f1663b7cac3..b7a9a4c92cdba19c517fcb9721510896c3741ff7 100644 (file)
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-04  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * scripts/check_jni_methods.sh.in: Don't use diff -U.
+       Adapt grep regex, ignore file and problem message.
+
 2010-06-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * configure: Regenerate.

diff --git a/libjava/classpath/scripts/check_jni_methods.sh.in b/libjava/classpath/scripts/check_jni_methods.sh.in
index cf30094187606b8289bc4b603f5ad27a261b02e1..facf34b345bce976c450632a219b970866d7e8bb 100644 (file)
--- a/libjava/classpath/scripts/check_jni_methods.sh.in
+++ b/libjava/classpath/scripts/check_jni_methods.sh.in
@@ -36,23 +36,23 @@ rm $TMPFILE3
 
 # Write temporary ignore file.
 cat > $TMPFILE3 << EOF
--Java_gnu_java_awt_peer_gtk_GtkMenuComponentPeer_dispose
--Java_java_lang_VMSystem_arraycopy
--Java_java_lang_VMSystem_identityHashCode
+< Java_gnu_java_awt_peer_gtk_GtkMenuComponentPeer_dispose
+< Java_java_lang_VMSystem_arraycopy
+< Java_java_lang_VMSystem_identityHashCode
 EOF
 
 # Compare again silently.
 # Use fgrep and direct the output to /dev/null for compatibility with older
 # grep instead of using the non portable -q.
-if diff -U 0 $TMPFILE $TMPFILE2 | grep '^[+-]Java' | \
+if diff $TMPFILE $TMPFILE2 | grep '^[<>] Java' | \
     fgrep -v -f $TMPFILE3 > /dev/null;
 then
   PROBLEM=1
   echo "Found a problem with the JNI methods declared and implemented."
-  echo "(-) missing in implementation, (+) missing in header files"
+  echo "(<) missing in implementation, (>) missing in header files"
 
   # Compare the found method lists.
-  diff -U 0 $TMPFILE $TMPFILE2  | grep '^[+-]Java' | fgrep -v -f $TMPFILE3
+  diff $TMPFILE $TMPFILE2  | grep '^[<>] Java' | fgrep -v -f $TMPFILE3
 fi
 
 # Cleanup.