stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6863624: java/util/Currency/PropertiesTest.sh writable check is incorrect

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Naoto Sato 2013-06-21 13:42:55 -07:00
parent 90aebf1cf9
commit feace4506d
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@
# #
# @test # @test
# @bug 6332666 7180362 8003846 # @bug 6332666 6863624 7180362 8003846
# @summary tests the capability of replacing the currency data with user # @summary tests the capability of replacing the currency data with user
# specified currency properties file # specified currency properties file
# @build PropertiesTest # @build PropertiesTest
@ -56,10 +56,15 @@ case "$OS" in
PS=":" PS=":"
FS="/" FS="/"
;; ;;
Windows* | CYGWIN* ) Windows* )
PS=";" PS=";"
FS="/" FS="/"
;; ;;
CYGWIN* )
PS=";"
FS="/"
TESTJAVA=`cygpath -u ${TESTJAVA}`
;;
* ) * )
echo "Unrecognized system!" echo "Unrecognized system!"
exit 1; exit 1;
@ -92,24 +97,27 @@ run PropertiesTest -c dump1 dump2 ${PROPS}
# Dump built-in currency data + overrides in properties file copied into # Dump built-in currency data + overrides in properties file copied into
# JRE image. # JRE image.
# copy the test properties file # 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 COPIED=0
if [ -w $TESTJAVA ] if [ -w ${TESTJAVA}${FS}jre${FS}lib ]
then then
WRITABLEJDK=$TESTJAVA WRITABLEJDK=$TESTJAVA
else
WRITABLEJDK=.${FS}testjava
cp -r $TESTJAVA $WRITABLEJDK
COPIED=1
fi
if [ -d ${WRITABLEJDK}${FS}jre ]
then
PROPLOCATION=${WRITABLEJDK}${FS}jre${FS}lib PROPLOCATION=${WRITABLEJDK}${FS}jre${FS}lib
else else
PROPLOCATION=${WRITABLEJDK}${FS}lib 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
fi fi
cp ${PROPS} $PROPLOCATION cp ${PROPS} $PROPLOCATION
echo "Properties location: ${PROPLOCATION}"
# run # run
echo '' echo ''

2
jdk/test/java/util/Locale/LocaleProviders.java
View File

@ -207,7 +207,7 @@ public class LocaleProviders {
String jreResult = "\u5e73\u6210 16.11.03 (\u6c34) \u5348\u524d 11:53:47"; String jreResult = "\u5e73\u6210 16.11.03 (\u6c34) \u5348\u524d 11:53:47";
Locale l = new Locale("ja", "JP", "JP"); Locale l = new Locale("ja", "JP", "JP");
SimpleDateFormat sdf = new SimpleDateFormat("GGGG yyyy.MMM.dd '('E')' a hh:mm:ss", l); SimpleDateFormat sdf = new SimpleDateFormat("GGGG yyyy.MMM.dd '('E')' a hh:mm:ss", l);
sdf.setTimeZone(TimeZone.getTimeZone("PST")); sdf.setTimeZone(TimeZone.getTimeZone("America/Los_Angeles"));
String result = sdf.format(sampleDate); String result = sdf.format(sampleDate);
System.out.println(result); System.out.println(result);
if (LocaleProviderAdapter.getAdapterPreference() if (LocaleProviderAdapter.getAdapterPreference()

2
jdk/test/java/util/Locale/LocaleProviders.sh
View File

@ -24,7 +24,7 @@
# #
# @test # @test
# @bug 6336885 7196799 7197573 7198834 8000245 8000615 8001440 8010666 # @bug 6336885 7196799 7197573 7198834 8000245 8000615 8001440 8010666
# 8013086 8013233 8013903 # 8013086 8013233 8013903 8015960
# @summary tests for "java.locale.providers" system property # @summary tests for "java.locale.providers" system property
# @compile -XDignore.symbol.file LocaleProviders.java # @compile -XDignore.symbol.file LocaleProviders.java
# @run shell/timeout=600 LocaleProviders.sh # @run shell/timeout=600 LocaleProviders.sh