diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-04 14:01:22 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-04 14:01:22 +0000 |
| commit | 80adfc2d4350ff1251ccb9b700a0b4a032f9a8cc (patch) | |
| tree | e58f12302bd24ab6edf6ea15ae3242e5b272abc0 | |
| parent | cbc39d5b2c70f1a1f882d7e0220f576fa1c01700 (diff) | |
| download | gcc-80adfc2d4350ff1251ccb9b700a0b4a032f9a8cc.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160264 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | contrib/ChangeLog | 5 | ||||
| -rwxr-xr-x | contrib/test_summary | 6 | ||||
| -rw-r--r-- | libjava/classpath/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/classpath/scripts/check_jni_methods.sh.in | 12 |
4 files changed, 19 insertions, 9 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index ee039071bf1..f03daf82766 100644 --- 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 c4b3c2c9369..5fc49f52bda 100755 --- 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 920bc8201a8..b7a9a4c92cd 100644 --- 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 cf300941876..facf34b345b 100644 --- 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. |