infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-14 00:49:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

8055253: test/java/util/Currency/PropertiesTest.sh modifies the test JDK

Browse Source 
Always make a temp copy of the test JDK before destructively modifying

Reviewed-by: naoto, alanb
This commit is contained in:
Martin Buchholz 2014-08-18 21:06:45 -07:00
parent bbb2e94d16
commit 0613e548bb
2 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/test/TEST.ROOT
View File

@ -8,7 +8,7 @@ keys=2d dnd i18n
othervm.dirs=java/awt java/beans javax/accessibility javax/imageio javax/sound javax/print javax/management com/sun/awt sun/awt sun/java2d sun/pisces
# Tests that cannot run concurrently
exclusiveAccess.dirs=java/rmi/Naming java/util/Currency java/util/prefs sun/management/jmxremote sun/tools/jstatd sun/security/mscapi
exclusiveAccess.dirs=java/rmi/Naming java/util/prefs sun/management/jmxremote sun/tools/jstatd sun/security/mscapi
# Group definitions
groups=TEST.groups [closed/TEST.groups]

29
jdk/test/java/util/Currency/PropertiesTest.sh
View File

@ -97,25 +97,16 @@ run PropertiesTest -c dump1 dump2 ${PROPS}
# Dump built-in currency data + overrides in properties file copied into
# JRE image.
# Copy the test properties file. If testjava is not a typical jdk-image
# or testjava is not writable, make a private copy of it.
COPIED=0
if [ -w ${TESTJAVA}${FS}jre${FS}lib ]
then
WRITABLEJDK=$TESTJAVA
# Make a private copy of the jdk so we can write to the properties file location
# without disturbing other users, including concurrently executing tests.
WRITABLEJDK=.${FS}testjava
cp -Hr $TESTJAVA $WRITABLEJDK
if [ -d ${TESTJAVA}${FS}jre ]; then
PROPLOCATION=${WRITABLEJDK}${FS}jre${FS}lib
else
WRITABLEJDK=.${FS}testjava
if [ -d ${TESTJAVA}${FS}jre ]
then
PROPLOCATION=${WRITABLEJDK}${FS}jre${FS}lib
else
PROPLOCATION=${WRITABLEJDK}${FS}lib
fi
cp -r $TESTJAVA $WRITABLEJDK
chmod -R +w $WRITABLEJDK
COPIED=1
PROPLOCATION=${WRITABLEJDK}${FS}lib
fi
chmod -R +w $WRITABLEJDK
cp ${PROPS} $PROPLOCATION
echo "Properties location: ${PROPLOCATION}"
@ -125,11 +116,7 @@ sh -xc "${WRITABLEJDK}${FS}bin${FS}java ${TESTVMOPTS} -cp ${TESTCLASSES} Propert
if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
# Cleanup
rm -f ${PROPLOCATION}${FS}currency.properties
if [ $COPIED -eq 1 ]
then
rm -rf $WRITABLEJDK
fi
rm -rf $WRITABLEJDK
# compare the two dump files
run PropertiesTest -c dump1 dump3 ${PROPS}