Mercurial > hg > release > icedtea7-forest-2.6 > jdk
changeset 8965:1e1f7f645ab9
8028479, PR3162: runNameEquals still cannot precisely detect if a usable native krb5 is available
Reviewed-by: xuelei
| author | weijun |
|---|---|
| date | Tue, 19 Nov 2013 14:14:14 +0800 |
| parents | b03ecf9d57c9 |
| children | e97831e64ad3 |
| files | test/sun/security/krb5/runNameEquals.sh |
| diffstat | 1 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/test/sun/security/krb5/runNameEquals.sh Mon Sep 09 11:08:20 2013 +0800 +++ b/test/sun/security/krb5/runNameEquals.sh Tue Nov 19 14:14:14 2013 +0800 @@ -53,10 +53,10 @@ FILESEP="/" NATIVE=true # Not all *nix has native GSS libs installed - krb5-config --libs gssapi 2> /dev/null + krb5-config --libs 2> /dev/null if [ $? != 0 ]; then # Fedora has a different path - /usr/kerberos/bin/krb5-config --libs gssapi 2> /dev/null + /usr/kerberos/bin/krb5-config --libs 2> /dev/null if [ $? != 0 ]; then NATIVE=false fi @@ -101,6 +101,15 @@ if [ $? != 0 ] ; then echo "Native provider fails" EXIT_STATUS=1 + if [ "$OS" = "Linux" -a `arch` = "x86_64" ]; then + ${TESTJAVA}${FILESEP}bin${FILESEP}java -XshowSettings:properties -version 2> allprop + cat allprop | grep sun.arch.data.model | grep 32 + if [ "$?" = "0" ]; then + echo "Running 32-bit JDK on 64-bit Linux. Maybe only 64-bit library is installed." + echo "Please manually check if this is the case. Treated as PASSED now." + EXIT_STATUS=0 + fi + fi fi fi