--- old/test/java/awt/FontClass/CreateFont/fileaccess/FontFile.java 2015-03-30 10:58:06.681343224 -0700 +++ new/test/java/awt/FontClass/CreateFont/fileaccess/FontFile.java 2015-03-30 10:58:06.474341832 -0700 @@ -25,6 +25,16 @@ * @test * @bug 6652929 * @summary verify handling of File.getPath() + * @compile FontFile.java + * @run shell TestFontFile.sh + */ + +/* + * When using jtreg this test needs to be run by shell script, + * since otherwise jtreg reflectively invokes the main method + * and the codebase for the purposes of the security manager + * is that of the jtreg harness, not the codebase (class file location) + * of this program, thus access to read to that location is not available. */ import java.awt.*; @@ -34,10 +44,21 @@ public static void main(String[] args) throws Exception { String sep = System.getProperty("file.separator"); String fname = ".." + sep + "A.ttf"; - String dir = System.getProperty("test.src"); + //String dir = System.getProperty("test.src"); + String dir = System.getenv("TESTSRC"); if (dir != null) { fname = dir + sep + fname; } + //String classesDir = System.getProperty("test.classes"); + String classesDir = System.getenv("TESTCLASSES"); + System.out.println("classesDir="+classesDir); + String testfile = "somefile"; + if (classesDir != null) { + testfile = classesDir + sep + testfile; + } + final String somefile = testfile; + System.out.println("somefile="+somefile); + System.out.println("userdir="+System.getProperty("user.dir")); final String name = fname; System.out.println("Will try to access " + name); if (!(new File(name)).canRead()) { @@ -66,7 +87,7 @@ return name; } else { read = true; - return "somefile"; + return somefile; } } @Override public boolean canRead() { --- /dev/null 2015-01-28 02:51:53.538203068 -0800 +++ new/test/java/awt/FontClass/CreateFont/fileaccess/TestFontFile.sh 2015-03-30 10:58:07.000345369 -0700 @@ -0,0 +1,84 @@ +# +# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. +# ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# + +#!/bin/sh + +if [ "${TESTSRC}" = "" ] +then TESTSRC=. +fi + +if [ "${TESTJAVA}" = "" ] +then + PARENT=`dirname \`which java\`` + TESTJAVA=`dirname ${PARENT}` + echo "TESTJAVA not set, selecting " ${TESTJAVA} + echo "If this is incorrect, try setting the variable manually." +fi + +if [ "${TESTCLASSES}" = "" ] +then + echo "TESTCLASSES not set. Test cannot execute. Failed." + exit 1 +fi + +BIT_FLAG="" + +# set platform-dependent variables +OS=`uname -s` +case "$OS" in + SunOS | Linux | Darwin ) + NULL=/dev/null + PS=":" + FS="/" + ## for solaris, linux it's HOME + FILE_LOCATION=$HOME + if [ -f ${FILE_LOCATION}${FS}JDK64BIT -a ${OS} = "SunOS" ] + then + BIT_FLAG=`cat ${FILE_LOCATION}${FS}JDK64BIT` + fi + ;; + Windows_* | CYGWIN* ) + NULL=NUL + PS=";" + FS="\\" + ;; + * ) + echo "Unrecognized system!" + exit 1; + ;; +esac + +JEMMYPATH=${CPAPPEND} +CLASSPATH=.${PS}${TESTCLASSES}${PS}${JEMMYPATH} ; export CLASSPATH + +THIS_DIR=`pwd` + +${TESTJAVA}${FS}bin${FS}java ${BIT_FLAG} -version + +${TESTJAVA}${FS}bin${FS}java ${BIT_FLAG} FontFile > test.out 2>&1 + +STATUS=$? + +cat test.out + +exit $STATUS