jdk/test/java/util/ResourceBundle/modules/basic/basic.sh

*** 50,60 ****
  do
    B=${I}bundles
    mkdir -p mods/$B
    CLASSES="`find $TESTSRC/src/$B -name '*.java'`"
    if [ "x$CLASSES" != x ]; then
!     $JAVAC -g -d mods -modulesourcepath $TESTSRC/src $CP $CLASSES
    fi
    PROPS="`(cd $TESTSRC/src/$B; find . -name '*.properties')`"
    if [ "x$PROPS" != x ]; then
        for P in $PROPS
        do
--- 50,60 ----
  do
    B=${I}bundles
    mkdir -p mods/$B
    CLASSES="`find $TESTSRC/src/$B -name '*.java'`"
    if [ "x$CLASSES" != x ]; then
!     $JAVAC -g -d mods --module-source-path $TESTSRC/src $CP $CLASSES
    fi
    PROPS="`(cd $TESTSRC/src/$B; find . -name '*.properties')`"
    if [ "x$PROPS" != x ]; then
        for P in $PROPS
        do
*** 65,75 ****
    fi
    CP="-cp mods/mainbundles"
  done
  
  mkdir -p mods/test
! $JAVAC -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
  # picked up from the class path.
  rm -f extra.jar
--- 65,75 ----
    fi
    CP="-cp mods/mainbundles"
  done
  
  mkdir -p mods/test
! $JAVAC -g -cp mods/mainbundles -d mods --module-source-path $TESTSRC/src \
      `find $TESTSRC/src/test -name "*.java"`
  
  # Create a jar to be added to the class path. Expected only properties files are
  # picked up from the class path.
  rm -f extra.jar
*** 79,89 ****
                     -C $TESTSRC/src/extra jdk/test/resources/asia
  
  STATUS=0
  
  echo "jdk.test.Main should load bundles using ResourceBundleProviders."
! $JAVA -mp mods -m test/jdk.test.Main de fr ja ja-jp zh-tw en de ja-jp || STATUS=1
  
  echo "jdk.test.Main should NOT load bundles from the jar file specified by the class-path."
! $JAVA -cp extra.jar -mp mods -m test/jdk.test.Main es vi && STATUS=1
  
  exit $STATUS
--- 79,89 ----
                     -C $TESTSRC/src/extra jdk/test/resources/asia
  
  STATUS=0
  
  echo "jdk.test.Main should load bundles using ResourceBundleProviders."
! $JAVA -p mods -m test/jdk.test.Main de fr ja ja-jp zh-tw en de ja-jp || STATUS=1
  
  echo "jdk.test.Main should NOT load bundles from the jar file specified by the class-path."
! $JAVA -cp extra.jar -p mods -m test/jdk.test.Main es vi && STATUS=1
  
  exit $STATUS