From 42998d21b1d74e9f670c3f5f396760d4ec8e5375 Mon Sep 17 00:00:00 2001 From: KKES335 <48511024+KKES335@users.noreply.github.com> Date: Thu, 12 Dec 2019 01:44:56 +0900 Subject: [PATCH] Remove disabled tags from playlist.xml (#1480) --- functional/MBCS_Tests/CLDR_11/playlist.xml | 1 - functional/MBCS_Tests/Compiler/playlist.xml | 1 - functional/MBCS_Tests/IDN/playlist.xml | 2 -- functional/MBCS_Tests/StAX/playlist.xml | 1 - functional/MBCS_Tests/StAX/test.sh | 1 - .../expected/AIX_ja_JP.IBM-eucJP.def.txt | 8 ++++---- .../expected/AIX_ja_JP.IBM-eucJP.pro.txt | 20 +++++++++---------- functional/MBCS_Tests/annotation/playlist.xml | 1 - functional/MBCS_Tests/codepage/playlist.xml | 1 - functional/MBCS_Tests/codepoint/test.sh | 3 ++- functional/MBCS_Tests/coin/playlist.xml | 1 - functional/MBCS_Tests/env/playlist.xml | 1 - functional/MBCS_Tests/file/playlist.xml | 1 - functional/MBCS_Tests/formatter/playlist.xml | 1 - functional/MBCS_Tests/i18n/playlist.xml | 1 - functional/MBCS_Tests/jaxp14/playlist.xml | 1 - functional/MBCS_Tests/jdbc41/playlist.xml | 3 --- .../MBCS_Tests/locale_matching/playlist.xml | 2 -- functional/MBCS_Tests/nio/playlist.xml | 2 -- functional/MBCS_Tests/pref/playlist.xml | 1 - functional/MBCS_Tests/regex/playlist.xml | 1 - functional/MBCS_Tests/scanner/playlist.xml | 1 - functional/MBCS_Tests/tools/set_variable.sh | 20 +++++++++++++++++++ functional/MBCS_Tests/unicode/test.sh | 7 +------ .../MBCS_Tests/urlclassloader/playlist.xml | 1 - 25 files changed, 37 insertions(+), 46 deletions(-) create mode 100755 functional/MBCS_Tests/tools/set_variable.sh diff --git a/functional/MBCS_Tests/CLDR_11/playlist.xml b/functional/MBCS_Tests/CLDR_11/playlist.xml index 9d1a7e34f0..02d43e6c1f 100644 --- a/functional/MBCS_Tests/CLDR_11/playlist.xml +++ b/functional/MBCS_Tests/CLDR_11/playlist.xml @@ -72,7 +72,6 @@ limitations under the License. 11 - bugs.openjdk.java.net/browse/JDK-8212794 MBCS_Tests_CLDR_11_JA_JP_aix diff --git a/functional/MBCS_Tests/Compiler/playlist.xml b/functional/MBCS_Tests/Compiler/playlist.xml index 892c6b3add..b088a8db82 100644 --- a/functional/MBCS_Tests/Compiler/playlist.xml +++ b/functional/MBCS_Tests/Compiler/playlist.xml @@ -67,7 +67,6 @@ limitations under the License. 8 11+ - bugs.openjdk.java.net/browse/JDK-8212794 MBCS_Tests_Compiler_JA_JP_aix diff --git a/functional/MBCS_Tests/IDN/playlist.xml b/functional/MBCS_Tests/IDN/playlist.xml index 24cef10a11..900e2237ac 100644 --- a/functional/MBCS_Tests/IDN/playlist.xml +++ b/functional/MBCS_Tests/IDN/playlist.xml @@ -67,7 +67,6 @@ limitations under the License. 8 11+ - bugs.openjdk.java.net/browse/JDK-8212794 MBCS_Tests_IDN_JA_JP_aix @@ -96,7 +95,6 @@ limitations under the License. 8 11+ - bugs.openjdk.java.net/browse/JDK-8213618 MBCS_Tests_IDN_KO_KR_aix diff --git a/functional/MBCS_Tests/StAX/playlist.xml b/functional/MBCS_Tests/StAX/playlist.xml index 37bc8efad9..db7ca51d73 100644 --- a/functional/MBCS_Tests/StAX/playlist.xml +++ b/functional/MBCS_Tests/StAX/playlist.xml @@ -60,7 +60,6 @@ limitations under the License. 11+ - bugs.openjdk.java.net/browse/JDK-8212794 MBCS_Tests_StAX_Ja_JP_aix diff --git a/functional/MBCS_Tests/StAX/test.sh b/functional/MBCS_Tests/StAX/test.sh index 8f124cd340..5be5e6f511 100644 --- a/functional/MBCS_Tests/StAX/test.sh +++ b/functional/MBCS_Tests/StAX/test.sh @@ -45,4 +45,3 @@ ${JAVA_BIN}/java ${CP} StAXReadEveIter ${BASE}/data/drinks_${COUNTRY}.xml >read_ ${JAVA_BIN}/java ${CP} StAXWriteCursor $TEST_STRINGS ${JAVA_BIN}/java ${CP} StAXWriteEveIter $TEST_STRINGS -LANG=${LANG} perl ${BASE}/resultCheck.pl diff --git a/functional/MBCS_Tests/annotation/expected/AIX_ja_JP.IBM-eucJP.def.txt b/functional/MBCS_Tests/annotation/expected/AIX_ja_JP.IBM-eucJP.def.txt index 77fd1dcad3..bd064e0c37 100755 --- a/functional/MBCS_Tests/annotation/expected/AIX_ja_JP.IBM-eucJP.def.txt +++ b/functional/MBCS_Tests/annotation/expected/AIX_ja_JP.IBM-eucJP.def.txt @@ -1,8 +1,8 @@ Compiled from "AnnotatedTest.java" public class AnnotatedTest { - public java.lang.String ｶﾅ表示テスト外字鵯鵺鶚鶤_1; - public int ｶﾅ表示テスト外字鵯鵺鶚鶤_2; + public java.lang.String 漢字表示能力カナｶﾅＫａｎａKana記号￥¢£外字丨恭飴鵯鵺鶚鶤_1; + public int 漢字表示能力カナｶﾅＫａｎａKana記号￥¢£外字丨恭飴鵯鵺鶚鶤_2; public AnnotatedTest(); - public void ｶﾅ表示テスト外字鵯鵺鶚鶤_1(); - public void ｶﾅ表示テスト外字鵯鵺鶚鶤_2(); + public void 漢字表示能力カナｶﾅＫａｎａKana記号￥¢£外字丨恭飴鵯鵺鶚鶤_1(); + public void 漢字表示能力カナｶﾅＫａｎａKana記号￥¢£外字丨恭飴鵯鵺鶚鶤_2(); } diff --git a/functional/MBCS_Tests/annotation/expected/AIX_ja_JP.IBM-eucJP.pro.txt b/functional/MBCS_Tests/annotation/expected/AIX_ja_JP.IBM-eucJP.pro.txt index 329dbe5d0a..769b36dcd6 100755 --- a/functional/MBCS_Tests/annotation/expected/AIX_ja_JP.IBM-eucJP.pro.txt +++ b/functional/MBCS_Tests/annotation/expected/AIX_ja_JP.IBM-eucJP.pro.txt @@ -1,36 +1,36 @@ -annotation : @ｶﾅ表示テスト外字鵯鵺鶚鶤(ｶﾅ表示テスト外字鵯鵺鶚鶤_1=1234567890, ｶﾅ表示テスト外字鵯鵺鶚鶤_2="\uff76\uff85\u8868\u793a\u30c6\u30b9\u30c8\u5916\u5b57\u2160\u2161\u2162\u2163") +annotation : @漢字表示能力カナｶﾅＫａｎａKana記号￥¢£外字丨恭飴鵯鵺鶚鶤(漢字表示能力カナｶﾅＫａｎａKana記号￥¢£外字丨恭飴鵯鵺鶚鶤_1=1234567890, 漢字表示能力カナｶﾅＫａｎａKana記号￥¢£外字丨恭飴鵯鵺鶚鶤_2="\u6f22\u5b57\u8868\u793a\u80fd\u529b\u30ab\u30ca\uff76\uff85\uff2b\uff41\uff4e\uff41Kana\u8a18\u53f7\uffe5\uffe0\uffe1\u5916\u5b57\u4e28\u663b\u5916\u5b57\u2160\u2161\u2162\u2163") kind: CLASS modifier: [public] type: AnnotatedTest element: AnnotatedTest -annotation : @ｶﾅ表示テスト外字鵯鵺鶚鶤_constructor("\uff76\uff85\u8868\u793a\u30c6\u30b9\u30c8\u5916\u5b57\u2160\u2161\u2162\u2163") +annotation : @漢字表示能力カナｶﾅＫａｎａKana記号￥¢£外字丨恭飴鵯鵺鶚鶤_constructor("\u6f22\u5b57\u8868\u793a\u80fd\u529b\u30ab\u30ca\uff76\uff85\uff2b\uff41\uff4e\uff41Kana\u8a18\u53f7\uffe5\uffe0\uffe1\u5916\u5b57\u4e28\u663b\u5916\u5b57\u2160\u2161\u2162\u2163") kind: CONSTRUCTOR modifier: [public] type: ()void element: AnnotatedTest() -annotation : @ｶﾅ表示テスト外字鵯鵺鶚鶤_field("\uff76\uff85\u8868\u793a\u30c6\u30b9\u30c8\u5916\u5b57\u2160\u2161\u2162\u2163_1") +annotation : @漢字表示能力カナｶﾅＫａｎａKana記号￥¢£外字丨恭飴鵯鵺鶚鶤_field("\u6f22\u5b57\u8868\u793a\u80fd\u529b\u30ab\u30ca\uff76\uff85\uff2b\uff41\uff4e\uff41Kana\u8a18\u53f7\uffe5\uffe0\uffe1\u5916\u5b57\u4e28\u663b\u5916\u5b57\u2160\u2161\u2162\u2163_1") kind: FIELD modifier: [public] type: java.lang.String -element: ｶﾅ表示テスト外字鵯鵺鶚鶤_1 +element: 漢字表示能力カナｶﾅＫａｎａKana記号￥¢£外字丨恭飴鵯鵺鶚鶤_1 -annotation : @ｶﾅ表示テスト外字鵯鵺鶚鶤_field("\uff76\uff85\u8868\u793a\u30c6\u30b9\u30c8\u5916\u5b57\u2160\u2161\u2162\u2163_2") +annotation : @漢字表示能力カナｶﾅＫａｎａKana記号￥¢£外字丨恭飴鵯鵺鶚鶤_field("\u6f22\u5b57\u8868\u793a\u80fd\u529b\u30ab\u30ca\uff76\uff85\uff2b\uff41\uff4e\uff41Kana\u8a18\u53f7\uffe5\uffe0\uffe1\u5916\u5b57\u4e28\u663b\u5916\u5b57\u2160\u2161\u2162\u2163_2") kind: FIELD modifier: [public] type: int -element: ｶﾅ表示テスト外字鵯鵺鶚鶤_2 +element: 漢字表示能力カナｶﾅＫａｎａKana記号￥¢£外字丨恭飴鵯鵺鶚鶤_2 -annotation : @ｶﾅ表示テスト外字鵯鵺鶚鶤_method("\uff76\uff85\u8868\u793a\u30c6\u30b9\u30c8\u5916\u5b57\u2160\u2161\u2162\u2163_1") +annotation : @漢字表示能力カナｶﾅＫａｎａKana記号￥¢£外字丨恭飴鵯鵺鶚鶤_method("\u6f22\u5b57\u8868\u793a\u80fd\u529b\u30ab\u30ca\uff76\uff85\uff2b\uff41\uff4e\uff41Kana\u8a18\u53f7\uffe5\uffe0\uffe1\u5916\u5b57\u4e28\u663b\u5916\u5b57\u2160\u2161\u2162\u2163_1") kind: METHOD modifier: [public] type: ()void -element: ｶﾅ表示テスト外字鵯鵺鶚鶤_1() +element: 漢字表示能力カナｶﾅＫａｎａKana記号￥¢£外字丨恭飴鵯鵺鶚鶤_1() -annotation : @ｶﾅ表示テスト外字鵯鵺鶚鶤_method("\uff76\uff85\u8868\u793a\u30c6\u30b9\u30c8\u5916\u5b57\u2160\u2161\u2162\u2163_2") +annotation : @漢字表示能力カナｶﾅＫａｎａKana記号￥¢£外字丨恭飴鵯鵺鶚鶤_method("\u6f22\u5b57\u8868\u793a\u80fd\u529b\u30ab\u30ca\uff76\uff85\uff2b\uff41\uff4e\uff41Kana\u8a18\u53f7\uffe5\uffe0\uffe1\u5916\u5b57\u4e28\u663b\u5916\u5b57\u2160\u2161\u2162\u2163_2") kind: METHOD modifier: [public] type: ()void -element: ｶﾅ表示テスト外字鵯鵺鶚鶤_2() +element: 漢字表示能力カナｶﾅＫａｎａKana記号￥¢£外字丨恭飴鵯鵺鶚鶤_2() diff --git a/functional/MBCS_Tests/annotation/playlist.xml b/functional/MBCS_Tests/annotation/playlist.xml index 1a6f4f4b8d..b76707689b 100755 --- a/functional/MBCS_Tests/annotation/playlist.xml +++ b/functional/MBCS_Tests/annotation/playlist.xml @@ -49,7 +49,6 @@ limitations under the License. functional - bugs.openjdk.java.net/browse/JDK-8212794 MBCS_Tests_annotation_Ja_JP_aix diff --git a/functional/MBCS_Tests/codepage/playlist.xml b/functional/MBCS_Tests/codepage/playlist.xml index ff1215e6cb..7e89699011 100644 --- a/functional/MBCS_Tests/codepage/playlist.xml +++ b/functional/MBCS_Tests/codepage/playlist.xml @@ -67,7 +67,6 @@ limitations under the License. 8 11+ - bugs.openjdk.java.net/browse/JDK-8212794 MBCS_Tests_codepage_JA_JP_aix diff --git a/functional/MBCS_Tests/codepoint/test.sh b/functional/MBCS_Tests/codepoint/test.sh index d9faf427cc..ee3bfc9882 100644 --- a/functional/MBCS_Tests/codepoint/test.sh +++ b/functional/MBCS_Tests/codepoint/test.sh @@ -15,7 +15,8 @@ BASE=`dirname $0` export BASE -. ${BASE}/check_env_unix.sh +. ${BASE}/set_variable.sh + CP="-cp ${BASE}/codepoint.jar" ${JAVA_BIN}/java ${CP} UnicodeDataTest 2> err.txt diff --git a/functional/MBCS_Tests/coin/playlist.xml b/functional/MBCS_Tests/coin/playlist.xml index ac07261e7b..5f9cde347e 100644 --- a/functional/MBCS_Tests/coin/playlist.xml +++ b/functional/MBCS_Tests/coin/playlist.xml @@ -53,7 +53,6 @@ limitations under the License. 8 11+ - bugs.openjdk.java.net/browse/JDK-8212794 MBCS_Tests_coin_Ja_JP_aix diff --git a/functional/MBCS_Tests/env/playlist.xml b/functional/MBCS_Tests/env/playlist.xml index aeabd08379..ec22b12c05 100644 --- a/functional/MBCS_Tests/env/playlist.xml +++ b/functional/MBCS_Tests/env/playlist.xml @@ -67,7 +67,6 @@ limitations under the License. 8 11+ - bugs.openjdk.java.net/browse/JDK-8212794 MBCS_Tests_env_JA_JP_aix diff --git a/functional/MBCS_Tests/file/playlist.xml b/functional/MBCS_Tests/file/playlist.xml index b117542ee4..ad49ba1820 100644 --- a/functional/MBCS_Tests/file/playlist.xml +++ b/functional/MBCS_Tests/file/playlist.xml @@ -53,7 +53,6 @@ limitations under the License. 8 11+ - bugs.openjdk.java.net/browse/JDK-8212794 MBCS_Tests_file_Ja_JP.aix diff --git a/functional/MBCS_Tests/formatter/playlist.xml b/functional/MBCS_Tests/formatter/playlist.xml index 1fb68c4049..2885315394 100644 --- a/functional/MBCS_Tests/formatter/playlist.xml +++ b/functional/MBCS_Tests/formatter/playlist.xml @@ -72,7 +72,6 @@ limitations under the License. 11+ - bugs.openjdk.java.net/browse/JDK-8212794 MBCS_Tests_formatter_JA_JP_aix diff --git a/functional/MBCS_Tests/i18n/playlist.xml b/functional/MBCS_Tests/i18n/playlist.xml index b561c685b7..f52238627f 100644 --- a/functional/MBCS_Tests/i18n/playlist.xml +++ b/functional/MBCS_Tests/i18n/playlist.xml @@ -58,7 +58,6 @@ limitations under the License. 11+ - bugs.openjdk.java.net/browse/JDK-8212794 MBCS_Tests_i18n_Ja_JP_aix diff --git a/functional/MBCS_Tests/jaxp14/playlist.xml b/functional/MBCS_Tests/jaxp14/playlist.xml index faa01e4496..c0524b4e51 100644 --- a/functional/MBCS_Tests/jaxp14/playlist.xml +++ b/functional/MBCS_Tests/jaxp14/playlist.xml @@ -72,7 +72,6 @@ limitations under the License. 11+ - bugs.openjdk.java.net/browse/JDK-8212794 MBCS_Tests_jaxp14_JA_JP_aix diff --git a/functional/MBCS_Tests/jdbc41/playlist.xml b/functional/MBCS_Tests/jdbc41/playlist.xml index d88efdc9dd..9fa8299e0e 100644 --- a/functional/MBCS_Tests/jdbc41/playlist.xml +++ b/functional/MBCS_Tests/jdbc41/playlist.xml @@ -64,7 +64,6 @@ limitations under the License. - bugs.openjdk.java.net/browse/JDK-8212794 MBCS_Tests_jdbc41RS_Ja_JP_aix @@ -82,7 +81,6 @@ limitations under the License. - bugs.openjdk.java.net/browse/JDK-8211295 MBCS_Tests_jdbc41RS_JA_JP_aix @@ -232,7 +230,6 @@ limitations under the License. 11+ - bugs.openjdk.java.net/browse/JDK-8212794 MBCS_Tests_jdbc41_Ja_JP_aix diff --git a/functional/MBCS_Tests/locale_matching/playlist.xml b/functional/MBCS_Tests/locale_matching/playlist.xml index a1e3366285..8474b9332f 100644 --- a/functional/MBCS_Tests/locale_matching/playlist.xml +++ b/functional/MBCS_Tests/locale_matching/playlist.xml @@ -90,7 +90,6 @@ limitations under the License. 11+ - bugs.openjdk.java.net/browse/JDK-8212794 MBCS_Tests_locale_matching_Ja_JP_aix @@ -211,7 +210,6 @@ limitations under the License. 11+ - bugs.openjdk.java.net/browse/JDK-8212794 MBCS_Tests_locale_matching_Zh_TW_aix diff --git a/functional/MBCS_Tests/nio/playlist.xml b/functional/MBCS_Tests/nio/playlist.xml index 9a54dab3b7..1ddade7f9e 100644 --- a/functional/MBCS_Tests/nio/playlist.xml +++ b/functional/MBCS_Tests/nio/playlist.xml @@ -67,7 +67,6 @@ limitations under the License. 8 11+ - bugs.openjdk.java.net/browse/JDK-8212794 MBCS_Tests_nio_JA_JP_aix @@ -96,7 +95,6 @@ limitations under the License. 8 11+ - bugs.openjdk.java.net/browse/JDK-8213618 MBCS_Tests_nio_KO_KR_aix diff --git a/functional/MBCS_Tests/pref/playlist.xml b/functional/MBCS_Tests/pref/playlist.xml index 003e97459b..6e34747a7e 100644 --- a/functional/MBCS_Tests/pref/playlist.xml +++ b/functional/MBCS_Tests/pref/playlist.xml @@ -67,7 +67,6 @@ limitations under the License. 8 11+ - bugs.openjdk.java.net/browse/JDK-8212794 MBCS_Tests_pref_JA_JP_aix diff --git a/functional/MBCS_Tests/regex/playlist.xml b/functional/MBCS_Tests/regex/playlist.xml index 862d2d5564..4b86bc6827 100644 --- a/functional/MBCS_Tests/regex/playlist.xml +++ b/functional/MBCS_Tests/regex/playlist.xml @@ -67,7 +67,6 @@ limitations under the License. 8 11+ - bugs.openjdk.java.net/browse/JDK-8212794 MBCS_Tests_regex_JA_JP_aix diff --git a/functional/MBCS_Tests/scanner/playlist.xml b/functional/MBCS_Tests/scanner/playlist.xml index 33d85de503..411d36163d 100644 --- a/functional/MBCS_Tests/scanner/playlist.xml +++ b/functional/MBCS_Tests/scanner/playlist.xml @@ -53,7 +53,6 @@ limitations under the License. 8 11+ - bugs.openjdk.java.net/browse/JDK-8212794 MBCS_Tests_scanner_Ja_JP_aix diff --git a/functional/MBCS_Tests/tools/set_variable.sh b/functional/MBCS_Tests/tools/set_variable.sh new file mode 100755 index 0000000000..c2a5231031 --- /dev/null +++ b/functional/MBCS_Tests/tools/set_variable.sh @@ -0,0 +1,20 @@ +#!/bin/sh +################################################################################ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +################################################################################ + +if [ -x "${TEST_JDK_HOME}/jre/bin/java" ] ; then + export JAVA_BIN=${TEST_JDK_HOME}/jre/bin +else + export JAVA_BIN=${TEST_JDK_HOME}/bin +fi diff --git a/functional/MBCS_Tests/unicode/test.sh b/functional/MBCS_Tests/unicode/test.sh index 0a1ee5b560..69ea219015 100644 --- a/functional/MBCS_Tests/unicode/test.sh +++ b/functional/MBCS_Tests/unicode/test.sh @@ -16,12 +16,7 @@ BASE=`dirname $0` export BASE CP="-cp ${BASE}/unicode.jar" - -if [ -x "${TEST_JDK_HOME}/jre/bin/java" ] ; then - export JAVA_BIN=${TEST_JDK_HOME}/jre/bin -else - export JAVA_BIN=${TEST_JDK_HOME}/bin -fi +. ${BASE}/set_variable.sh ${JAVA_BIN}/java ${CP} UnicodeChecker 2>err1.txt cat err1.txt diff --git a/functional/MBCS_Tests/urlclassloader/playlist.xml b/functional/MBCS_Tests/urlclassloader/playlist.xml index 52f3ca5d95..d82f5ddd03 100644 --- a/functional/MBCS_Tests/urlclassloader/playlist.xml +++ b/functional/MBCS_Tests/urlclassloader/playlist.xml @@ -53,7 +53,6 @@ limitations under the License. 8 11+ - bugs.openjdk.java.net/browse/JDK-8212794 MBCS_Tests_urlclassloader_Ja_JP_aix