Thu, 06 Mar 2008 10:07:25 -0800
4741726: allow Object += String
Summary: remove code in line with restriction removed from JLS
Reviewed-by: mcimadamore
Contributed-by: michaelbailey0@gmail.com
duke@1 | 1 | #!/bin/sh |
duke@1 | 2 | |
duke@1 | 3 | # |
duke@1 | 4 | # Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. |
duke@1 | 5 | # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@1 | 6 | # |
duke@1 | 7 | # This code is free software; you can redistribute it and/or modify it |
duke@1 | 8 | # under the terms of the GNU General Public License version 2 only, as |
duke@1 | 9 | # published by the Free Software Foundation. |
duke@1 | 10 | # |
duke@1 | 11 | # This code is distributed in the hope that it will be useful, but WITHOUT |
duke@1 | 12 | # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@1 | 13 | # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@1 | 14 | # version 2 for more details (a copy is included in the LICENSE file that |
duke@1 | 15 | # accompanied this code). |
duke@1 | 16 | # |
duke@1 | 17 | # You should have received a copy of the GNU General Public License version |
duke@1 | 18 | # 2 along with this work; if not, write to the Free Software Foundation, |
duke@1 | 19 | # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@1 | 20 | # |
duke@1 | 21 | # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
duke@1 | 22 | # CA 95054 USA or visit www.sun.com if you need additional information or |
duke@1 | 23 | # have any questions. |
duke@1 | 24 | # |
duke@1 | 25 | |
duke@1 | 26 | # @test |
duke@1 | 27 | # |
duke@1 | 28 | # @bug 4942232 |
duke@1 | 29 | |
duke@1 | 30 | # |
duke@1 | 31 | # Verifies that javah won't attempt to generate a header file |
duke@1 | 32 | # if a native method in a supplied class contains a parameter |
duke@1 | 33 | # type whose corresponding class is missing or not in the |
duke@1 | 34 | # classpath |
duke@1 | 35 | |
duke@1 | 36 | TMP1=OUTPUT.txt |
duke@1 | 37 | |
duke@1 | 38 | if [ "${TESTSRC}" = "" ] |
duke@1 | 39 | then |
duke@1 | 40 | echo "TESTSRC not set. Test cannot execute. Failed." |
duke@1 | 41 | exit 1 |
duke@1 | 42 | fi |
duke@1 | 43 | echo "TESTSRC=${TESTSRC}" |
duke@1 | 44 | if [ "${TESTJAVA}" = "" ] |
duke@1 | 45 | then |
duke@1 | 46 | echo "TESTJAVA not set. Test cannot execute. Failed." |
duke@1 | 47 | exit 1 |
duke@1 | 48 | fi |
duke@1 | 49 | echo "TESTJAVA=${TESTJAVA}" |
duke@1 | 50 | if [ "${TESTCLASSES}" = "" ] |
duke@1 | 51 | then |
duke@1 | 52 | echo "TESTCLASSES not set. Test cannot execute. Failed." |
duke@1 | 53 | exit 1 |
duke@1 | 54 | fi |
duke@1 | 55 | echo "TESTCLASSES=${TESTCLASSES}" |
duke@1 | 56 | echo "CLASSPATH=${CLASSPATH}" |
duke@1 | 57 | |
duke@1 | 58 | # set platform-dependent variables |
duke@1 | 59 | OS=`uname -s` |
duke@1 | 60 | case "$OS" in |
duke@1 | 61 | SunOS | Linux ) |
duke@1 | 62 | NULL=/dev/null |
duke@1 | 63 | PS=":" |
duke@1 | 64 | FS="/" |
duke@1 | 65 | ;; |
duke@1 | 66 | Windows* ) |
duke@1 | 67 | NULL=NUL |
duke@1 | 68 | PS=";" |
duke@1 | 69 | FS="\\" |
duke@1 | 70 | ;; |
duke@1 | 71 | * ) |
duke@1 | 72 | echo "Unrecognized system!" |
duke@1 | 73 | exit 1; |
duke@1 | 74 | ;; |
duke@1 | 75 | esac |
duke@1 | 76 | |
duke@1 | 77 | GENERATED_HEADER_FILE=ParamClassTest.h |
duke@1 | 78 | |
duke@1 | 79 | rm -f ParamClassTest.class MissingParamClassException.class ParamClassTest.h |
duke@1 | 80 | rm -f ${TMP1} |
duke@1 | 81 | |
duke@1 | 82 | cp ${TESTSRC}${FS}ParamClassTest.java . |
duke@1 | 83 | cp ${TESTSRC}${FS}MissingParamClassException.java . |
duke@1 | 84 | |
duke@1 | 85 | "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . "${TESTSRC}${FS}ParamClassTest.java" |
duke@1 | 86 | |
duke@1 | 87 | # Before running javah remove dependent class file |
duke@1 | 88 | rm -f MissingParamClassException.class |
duke@1 | 89 | |
duke@1 | 90 | "${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} ParamClassTest 2>${TMP1} |
duke@1 | 91 | |
duke@1 | 92 | if [ -f $GENERATED_HEADER_FILE ]; then |
duke@1 | 93 | echo "Failed" |
duke@1 | 94 | exit 1 |
duke@1 | 95 | fi |
duke@1 | 96 | if [ ! -f ${TMP1} ]; then |
duke@1 | 97 | echo "Failed" |
duke@1 | 98 | exit 1 |
duke@1 | 99 | else |
duke@1 | 100 | echo "Passed" |
duke@1 | 101 | exit 0 |
duke@1 | 102 | fi |
duke@1 | 103 | |
duke@1 | 104 | # Clean out work dir |
duke@1 | 105 | rm -f MissingParamClassException.class ParamClassTest.class |
duke@1 | 106 | rm -f $GENERATED_HEADER_FILE $TMP1 |
duke@1 | 107 | |
duke@1 | 108 | # Re-compile everything |
duke@1 | 109 | "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . ${TESTSRC}${FS}ParamClassTest.java |
duke@1 | 110 | |
duke@1 | 111 | # Before re-run of javah remove dependent class file Param.class |
duke@1 | 112 | rm -f Param.class |
duke@1 | 113 | |
duke@1 | 114 | "${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} ParamClassTest 2>${TMP1} |
duke@1 | 115 | |
duke@1 | 116 | if [ -f $GENERATED_HEADER_FILE ]; then |
duke@1 | 117 | echo "Failed" |
duke@1 | 118 | exit 1 |
duke@1 | 119 | fi |
duke@1 | 120 | if [ ! -f ${TMP1} ]; then |
duke@1 | 121 | echo "Failed" |
duke@1 | 122 | exit 1 |
duke@1 | 123 | else |
duke@1 | 124 | echo "Passed" |
duke@1 | 125 | exit 0 |
duke@1 | 126 | fi |