procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
Download patch file Download diff file Expand all files Collapse all files

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.