From c8dc869ed7c48f5fef1edda01fae2b5c9286a3a8 Mon Sep 17 00:00:00 2001
From: alanb <unknown>
Date: Sat, 9 Nov 2013 16:46:46 +0000
Subject: [PATCH] 8028044: [TEST_BUG] Calendar shell tests do not pass
 TESTVMOPTS Reviewed-by: dholmes, alanb Contributed-by:
 patrick.zhang@oracle.com

---
 test/java/util/Calendar/GenericTimeZoneNamesTest.sh | 4 ++--
 test/java/util/Calendar/NarrowNamesTest.sh          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/java/util/Calendar/GenericTimeZoneNamesTest.sh b/test/java/util/Calendar/GenericTimeZoneNamesTest.sh
index a5491891b..ab3f4981c 100644
--- a/test/java/util/Calendar/GenericTimeZoneNamesTest.sh
+++ b/test/java/util/Calendar/GenericTimeZoneNamesTest.sh
@@ -35,12 +35,12 @@ echo "Locale providers: default"
 # TODO: The purpose of ja-JP is to make sure the fallback for generic
 # names works. Remove ja-JP when adding generic names to localized
 # resources.
-if ! ${TESTJAVA}/bin/java -esa -cp "${TESTCLASSES}" GenericTimeZoneNamesTest en-US ja-JP; then
+if ! ${TESTJAVA}/bin/java -esa ${TESTVMOPTS} -cp "${TESTCLASSES}" GenericTimeZoneNamesTest en-US ja-JP; then
     STATUS=1
 fi
 
 echo "Locale providers: CLDR"
-if ! ${TESTJAVA}/bin/java -esa -cp "${TESTCLASSES}" -Djava.locale.providers=CLDR GenericTimeZoneNamesTest en-US; then
+if ! ${TESTJAVA}/bin/java -esa ${TESTVMOPTS} -cp "${TESTCLASSES}" -Djava.locale.providers=CLDR GenericTimeZoneNamesTest en-US; then
    STATUS=1
 fi
 exit ${STATUS}
diff --git a/test/java/util/Calendar/NarrowNamesTest.sh b/test/java/util/Calendar/NarrowNamesTest.sh
index 742e35ac2..15d1d7009 100644
--- a/test/java/util/Calendar/NarrowNamesTest.sh
+++ b/test/java/util/Calendar/NarrowNamesTest.sh
@@ -34,7 +34,7 @@ STATUS=0
 for P in "JRE,SPI" "CLDR"
 do
     echo "Locale providers: $P"
-    if ! ${TESTJAVA}/bin/java -esa -cp "${TESTCLASSES}" -Djava.locale.providers="${P}" NarrowNamesTest; then
+    if ! ${TESTJAVA}/bin/java -esa ${TESTVMOPTS} -cp "${TESTCLASSES}" -Djava.locale.providers="${P}" NarrowNamesTest; then
         STATUS=1
     fi
 done
-- 
GitLab