test/java/util/Locale/LocaleProviders.sh

*** 21,32 ****
  # or visit www.oracle.com if you need additional information or have any
  # questions.
  #
  #
  # @test
! # @bug 6336885 7196799 7197573 7198834 8000245 8000615 8001440 8010666
! #      8013086 8013233 8013903 8015960 8028771
  # @summary tests for "java.locale.providers" system property
  # @compile -XDignore.symbol.file LocaleProviders.java
  # @run shell/timeout=600 LocaleProviders.sh
  
  if [ "${TESTSRC}" = "" ]
--- 21,32 ----
  # or visit www.oracle.com if you need additional information or have any
  # questions.
  #
  #
  # @test
! # @bug 6336885 7196799 7197573 7198834 8000245 8000615 8001440 8008577
! #      8010666 8013086 8013233 8013903 8015960 8028771
  # @summary tests for "java.locale.providers" system property
  # @compile -XDignore.symbol.file LocaleProviders.java
  # @run shell/timeout=600 LocaleProviders.sh
  
  if [ "${TESTSRC}" = "" ]
*** 222,232 ****
  # testing the order, variaton #3 for non-existent locale in JRE assuming "haw" is not in JRE.
  METHODNAME=adapterTest
  PREFLIST=JRE,CLDR
  PARAM1=CLDR
  PARAM2=haw
! PARAM3=GB
  SPICLASSES=
  runTest
  
  # testing the order, variaton #4 for the bug 7196799. CLDR's "zh" data should be used in "zh_CN"
  METHODNAME=adapterTest
--- 222,232 ----
  # testing the order, variaton #3 for non-existent locale in JRE assuming "haw" is not in JRE.
  METHODNAME=adapterTest
  PREFLIST=JRE,CLDR
  PARAM1=CLDR
  PARAM2=haw
! PARAM3=
  SPICLASSES=
  runTest
  
  # testing the order, variaton #4 for the bug 7196799. CLDR's "zh" data should be used in "zh_CN"
  METHODNAME=adapterTest
*** 244,254 ****
  PARAM2=en
  PARAM3=US
  SPICLASSES=
  runTest
  PREFLIST=FOO
! PARAM1=JRE
  PARAM2=en
  PARAM3=US
  SPICLASSES=
  runTest
  PREFLIST=BAR,SPI
--- 244,254 ----
  PARAM2=en
  PARAM3=US
  SPICLASSES=
  runTest
  PREFLIST=FOO
! PARAM1=CLDR
  PARAM2=en
  PARAM3=US
  SPICLASSES=
  runTest
  PREFLIST=BAR,SPI