OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Rainer Orth 2010-06-04 14:01:22 +00:00 committed by Rainer Orth
parent f251709af5
commit fb340c3c7f
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/ChangeLog
View File

@ -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.

6
contrib/test_summary
View File

@ -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

5
libjava/classpath/ChangeLog
View File

@ -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.

12
libjava/classpath/scripts/check_jni_methods.sh.in
View File

@ -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.