1.1 --- a/test/tools/javah/ConstMacroTest.sh Tue Feb 19 00:31:45 2013 -0800 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,102 +0,0 @@ 1.4 -#!/bin/sh 1.5 - 1.6 -# 1.7 -# Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. 1.8 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.9 -# 1.10 -# This code is free software; you can redistribute it and/or modify it 1.11 -# under the terms of the GNU General Public License version 2 only, as 1.12 -# published by the Free Software Foundation. 1.13 -# 1.14 -# This code is distributed in the hope that it will be useful, but WITHOUT 1.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 1.16 -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 1.17 -# version 2 for more details (a copy is included in the LICENSE file that 1.18 -# accompanied this code). 1.19 -# 1.20 -# You should have received a copy of the GNU General Public License version 1.21 -# 2 along with this work; if not, write to the Free Software Foundation, 1.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 1.23 -# 1.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 1.25 -# or visit www.oracle.com if you need additional information or have any 1.26 -# questions. 1.27 -# 1.28 - 1.29 -# @test 1.30 -# 1.31 -# @bug 4786406 4781221 4780341 6214324 1.32 - 1.33 -# Validates rewritten javah handling of class defined constants 1.34 -# and ensures that the appropriate macro definitions are placed 1.35 -# in the generated header file. 1.36 - 1.37 -if [ "${TESTSRC}" = "" ] 1.38 -then 1.39 - echo "TESTSRC not set. Test cannot execute. Failed." 1.40 - exit 1 1.41 -fi 1.42 -echo "TESTSRC=${TESTSRC}" 1.43 -if [ "${TESTJAVA}" = "" ] 1.44 -then 1.45 - echo "TESTJAVA not set. Test cannot execute. Failed." 1.46 - exit 1 1.47 -fi 1.48 -echo "TESTJAVA=${TESTJAVA}" 1.49 -if [ "${TESTCLASSES}" = "" ] 1.50 -then 1.51 - echo "TESTCLASSES not set. Test cannot execute. Failed." 1.52 - exit 1 1.53 -fi 1.54 -echo "TESTCLASSES=${TESTCLASSES}" 1.55 -echo "CLASSPATH=${CLASSPATH}" 1.56 - 1.57 -EXPECTED_JAVAH_OUT_FILE=SubClassConsts.out 1.58 - 1.59 -# set platform-dependent variables 1.60 -OS=`uname -s` 1.61 -case "$OS" in 1.62 - SunOS | Linux | Darwin ) 1.63 - PS=":" 1.64 - FS="/" 1.65 - ;; 1.66 - CYGWIN* ) 1.67 - PS=":" 1.68 - FS="/" 1.69 - DIFFOPTS="--strip-trailing-cr" 1.70 - EXPECTED_JAVAH_OUT_FILE=SubClassConsts.win 1.71 - ;; 1.72 - Windows* ) 1.73 - PS=";" 1.74 - FS="\\" 1.75 - EXPECTED_JAVAH_OUT_FILE=SubClassConsts.win 1.76 - ;; 1.77 - * ) 1.78 - echo "Unrecognized system!" 1.79 - exit 1; 1.80 - ;; 1.81 - esac 1.82 - 1.83 -GENERATED_HEADER_FILE=SubClassConsts.h 1.84 -HEADER_FILE_FILTERED=SubClassConsts.h.linefeed-filtered 1.85 - 1.86 -rm -rf SuperClassConsts.class SubClassConsts.class 1.87 - 1.88 -cp "${TESTSRC}${FS}SuperClassConsts.java" . 1.89 -cp "${TESTSRC}${FS}SubClassConsts.java" . 1.90 - 1.91 -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . "${TESTSRC}${FS}SubClassConsts.java" 1.92 - 1.93 -"${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} SubClassConsts 1.94 - 1.95 -diff ${DIFFOPTS} "${TESTSRC}${FS}${EXPECTED_JAVAH_OUT_FILE}" "${GENERATED_HEADER_FILE}" 1.96 -result=$? 1.97 -rm ${GENERATED_HEADER_FILE} 1.98 - 1.99 -if [ $result -eq 0 ] 1.100 -then 1.101 - echo "Passed" 1.102 -else 1.103 - echo "Failed" 1.104 -fi 1.105 -exit $result