stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8020448: Test closed/java/awt/font/JNICheck/JNICheck.sh fails on Solaris 11 since 7 FCS

Browse Source 
Reviewed-by: azvegint, rchamyal
This commit is contained in:
Prasanta Sadhukhan 2015-11-05 14:08:51 +03:00
parent 4e50c75aa6
commit 12667cd360
3 changed files with 93 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jdk/src/java.desktop/unix/native/common/awt/fontpath.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -178,6 +178,7 @@ jboolean isDisplayLocal(JNIEnv *env) {
"()Z");
JNU_CHECK_EXCEPTION_RETURN(env, JNI_FALSE);
isLocal = (*env)->CallBooleanMethod(env, ge, isDisplayLocal);
JNU_CHECK_EXCEPTION_RETURN(env, JNI_FALSE);
} else {
isLocal = True;
}

30
jdk/test/java/awt/font/JNICheck/JNICheck.java Normal file
View File

@ -0,0 +1,30 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import javax.swing.*;
public class JNICheck {
public static void main(String[] args) throws Exception {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
}
}

61
jdk/test/java/awt/font/JNICheck/JNICheck.sh Normal file
View File

@ -0,0 +1,61 @@
#!/bin/ksh -p
#
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation.
#
# This code is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#
#
# @test
# @bug 6430247 8130507 8020448
# @summary Tests that there are no JNI warnings.
# @compile JNICheck.java
# @run shell/timeout=300 JNICheck.sh
#
OS=`uname`
# pick up the compiled class files.
if [ -z "${TESTCLASSES}" ]; then
CP="."
else
CP="${TESTCLASSES}"
fi
if [ $OS != SunOS -a $OS != Linux ]
then
exit 0
fi
if [ -z "${TESTJAVA}" ] ; then
JAVA_HOME=../../../../../build/solaris-sparc
else
JAVA_HOME=$TESTJAVA
fi
$JAVA_HOME/bin/java ${TESTVMOPTS} \
-cp "${CP}" -Xcheck:jni JNICheck > "${CP}"/log.txt
# any messages logged may indicate a failure.
if [ -s "${CP}"/log.txt ]; then
echo "Test failed"
exit 1
fi
echo "Test passed"
exit 0