diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2010-06-04 14:01:22 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2010-06-04 14:01:22 +0000 |
| commit | fb340c3c7f23b51e71c54a92b9f6d5c7e00d6044 (patch) | |
| tree | e58f12302bd24ab6edf6ea15ae3242e5b272abc0 /libjava | |
| parent | f251709af54dc788d21dd2c6a7d7e74d7167acef (diff) | |
| download | gcc-fb340c3c7f23b51e71c54a92b9f6d5c7e00d6044.tar.gz | |
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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/classpath/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/classpath/scripts/check_jni_methods.sh.in | 12 |
2 files changed, 11 insertions, 6 deletions
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. |