OpenJDK / jigsaw / jake / jdk
changeset 13553:6a7e0309fa89
Update ResourceBundle tests specific target module to javac -XaddExports
author | alanb |
---|---|
date | Fri, 31 Jul 2015 08:10:32 +0100 |
parents | 3f2cca7ef3fb |
children | 0fa5193782bc |
files | test/java/util/ResourceBundle/modules/appbasic2/appbasic2.sh test/java/util/ResourceBundle/modules/basic/basic.sh test/java/util/ResourceBundle/modules/simple/simple.sh |
diffstat | 3 files changed, 14 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/test/java/util/ResourceBundle/modules/appbasic2/appbasic2.sh Fri Jul 31 11:37:53 2015 +0530 +++ b/test/java/util/ResourceBundle/modules/appbasic2/appbasic2.sh Fri Jul 31 08:10:32 2015 +0100 @@ -39,7 +39,7 @@ # This test is temporarily converted to use AbstractResourceBundleProvider class # to avoid calling Control.newBundle -EXTRA_JAVAC_OPTS="-XaddExports:java.base/sun.util.locale.provider" +EXTRA_OPTS="-XaddExports:java.base/sun.util.locale.provider=test" for I in eu asia do @@ -47,7 +47,7 @@ mkdir -p mods/$B CLASSES="`find $TESTSRC/src/$B -name '*.java'`" if [ "x$CLASSES" != x ]; then - $JAVAC ${EXTRA_JAVAC_OPTS} -g -d mods -modulesourcepath $TESTSRC/src -cp mods/test $CLASSES + $JAVAC ${EXTRA_OPTS} -g -d mods -modulesourcepath $TESTSRC/src -cp mods/test $CLASSES fi PROPS="`(cd $TESTSRC/src/$B; find . -name '*.properties')`" if [ "x$PROPS" != x ]; then @@ -61,10 +61,8 @@ done mkdir -p mods/test -$JAVAC ${EXTRA_JAVAC_OPTS} -g -d mods -modulesourcepath $TESTSRC/src \ - `find $TESTSRC/src/test -name "*.java"` +$JAVAC ${EXTRA_OPTS} -g -d mods -modulesourcepath $TESTSRC/src `find $TESTSRC/src/test -name "*.java"` -$JAVA -XaddExports:java.base/sun.util.locale.provider=test \ - -mp mods -m test/jdk.test.Main de fr ja zh-tw en de +$JAVA ${EXTRA_OPTS} -mp mods -m test/jdk.test.Main de fr ja zh-tw en de exit $?
--- a/test/java/util/ResourceBundle/modules/basic/basic.sh Fri Jul 31 11:37:53 2015 +0530 +++ b/test/java/util/ResourceBundle/modules/basic/basic.sh Fri Jul 31 08:10:32 2015 +0100 @@ -41,9 +41,7 @@ # This test is temporarily converted to use AbstractResourceBundleProvider class # to avoid calling Control.newBundle - -EXTRA_JAVAC_OPTS="-XaddExports:java.base/sun.util.locale.provider" -EXTRA_JAVA_OPTS="-XaddExports:java.base/sun.util.locale.provider=mainbundles" +EXTRA_OPTS="-XaddExports:java.base/sun.util.locale.provider=mainbundles" rm -rf mods @@ -54,7 +52,7 @@ mkdir -p mods/$B CLASSES="`find $TESTSRC/src/$B -name '*.java'`" if [ "x$CLASSES" != x ]; then - $JAVAC ${EXTRA_JAVAC_OPTS} -g -d mods -modulesourcepath $TESTSRC/src $CP $CLASSES + $JAVAC ${EXTRA_OPTS} -g -d mods -modulesourcepath $TESTSRC/src $CP $CLASSES fi PROPS="`(cd $TESTSRC/src/$B; find . -name '*.properties')`" if [ "x$PROPS" != x ]; then @@ -69,7 +67,7 @@ done mkdir -p mods/test -$JAVAC ${EXTRA_JAVAC_OPTS} -g -cp mods/mainbundles -d mods -modulesourcepath $TESTSRC/src \ +$JAVAC ${EXTRA_OPTS} -g -cp mods/mainbundles -d mods -modulesourcepath $TESTSRC/src \ `find $TESTSRC/src/test -name "*.java"` # Create a jar to be added to the class path. Expected only properties files are @@ -81,10 +79,10 @@ -C $TESTSRC/src/extra jdk/test/resources/asia $JAR -tvf extra.jar -$JAVA ${EXTRA_JAVA_OPTS} -mp mods -m test/jdk.test.Main de fr ja zh-tw en de && +$JAVA ${EXTRA_OPTS} -mp mods -m test/jdk.test.Main de fr ja zh-tw en de && # properties files on the class path should be picked up. - $JAVA ${EXTRA_JAVA_OPTS} -cp extra.jar -mp mods -m test/jdk.test.Main de fr ja zh-tw en de vi && + $JAVA ${EXTRA_OPTS} -cp extra.jar -mp mods -m test/jdk.test.Main de fr ja zh-tw en de vi && # classes on the class path shouldn't. - ! $JAVA ${EXTRA_JAVA_OPTS} -cp extra.jar -mp mods -m test/jdk.test.Main es + ! $JAVA ${EXTRA_OPTS} -cp extra.jar -mp mods -m test/jdk.test.Main es exit $?
--- a/test/java/util/ResourceBundle/modules/simple/simple.sh Fri Jul 31 11:37:53 2015 +0530 +++ b/test/java/util/ResourceBundle/modules/simple/simple.sh Fri Jul 31 08:10:32 2015 +0100 @@ -39,7 +39,7 @@ # This test is temporarily converted to use AbstractResourceBundleProvider class # to avoid calling Control.newBundle -EXTRA_JAVAC_OPTS="-XaddExports:java.base/sun.util.locale.provider" +EXTRA_OPTS="-XaddExports:java.base/sun.util.locale.provider=bundles" JAVAC="$COMPILEJAVA/bin/javac" JAVA="$TESTJAVA/bin/java" @@ -52,7 +52,7 @@ mkdir -p mods/$B CLASSES="`find $TESTSRC/src/$B -name '*.java'`" if [ "x$CLASSES" != x ]; then - $JAVAC ${EXTRA_JAVAC_OPTS} -g -d mods -modulesourcepath $TESTSRC/src $CLASSES + $JAVAC ${EXTRA_OPTS} -g -d mods -modulesourcepath $TESTSRC/src $CLASSES fi PROPS="`(cd $TESTSRC/src/$B; find . -name '*.properties')`" if [ "x$PROPS" != x ]; then @@ -64,11 +64,9 @@ done fi -$JAVAC ${EXTRA_JAVAC_OPTS} \ - -g -d mods -modulesourcepath $TESTSRC/src \ +$JAVAC ${EXTRA_OPTS} -g -d mods -modulesourcepath $TESTSRC/src \ -cp mods/bundles `find $TESTSRC/src/test -name "*.java"` -$JAVA -XaddExports:java.base/sun.util.locale.provider=bundles \ - -mp mods -m test/jdk.test.Main de fr ja zh-tw en de +$JAVA ${EXTRA_OPTS} -mp mods -m test/jdk.test.Main de fr ja zh-tw en de exit $?