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 2005-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 | # |
duke@1 | 27 | # @test |
duke@1 | 28 | # @bug 4164450 |
duke@1 | 29 | # @summary Ensure that javah/javadoc doesn't try to read (new) source files |
duke@1 | 30 | # @author Peter von der Ah\u00e9 |
duke@1 | 31 | # @run shell ReadOldClass.sh |
duke@1 | 32 | # |
duke@1 | 33 | |
duke@1 | 34 | TS=${TESTSRC-.} |
duke@1 | 35 | TC=${TESTCLASSES-.} |
duke@1 | 36 | |
duke@1 | 37 | if [ "${TESTJAVA}" = "" ] |
duke@1 | 38 | then |
duke@1 | 39 | echo "TESTJAVA not set. Test cannot execute. Failed." |
duke@1 | 40 | exit 1 |
duke@1 | 41 | fi |
duke@1 | 42 | |
duke@1 | 43 | # set platform-dependent variables |
duke@1 | 44 | OS=`uname -s` |
duke@1 | 45 | case "$OS" in |
duke@1 | 46 | SunOS | Linux ) |
duke@1 | 47 | NULL=/dev/null |
duke@1 | 48 | PS=":" |
duke@1 | 49 | FS="/" |
duke@1 | 50 | ;; |
duke@1 | 51 | Windows* ) |
duke@1 | 52 | NULL=NUL |
duke@1 | 53 | PS=";" |
duke@1 | 54 | FS="\\" |
duke@1 | 55 | ;; |
duke@1 | 56 | * ) |
duke@1 | 57 | echo "Unrecognized system!" |
duke@1 | 58 | exit 1; |
duke@1 | 59 | ;; |
duke@1 | 60 | esac |
duke@1 | 61 | |
duke@1 | 62 | cat > "${TC}/ReadOldClass.java" <<EOF |
duke@1 | 63 | public class ReadOldClass { |
duke@1 | 64 | public static void main(String[] args) { |
duke@1 | 65 | } |
duke@1 | 66 | } |
duke@1 | 67 | EOF |
duke@1 | 68 | |
duke@1 | 69 | rm -f ${TC}/ReadOldClass.h |
duke@1 | 70 | |
duke@1 | 71 | set -e |
duke@1 | 72 | |
duke@1 | 73 | # compile the file |
duke@1 | 74 | "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d "${TC}" "${TC}/ReadOldClass.java" |
duke@1 | 75 | # ensure the source file is newer than the class file |
duke@1 | 76 | touch "${TC}/ReadOldClass.java" |
duke@1 | 77 | "${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} -jni -classpath "${TC}" -d "${TC}" ReadOldClass |
duke@1 | 78 | |
duke@1 | 79 | test -f "${TC}/ReadOldClass.h" |