stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8318410: jdk/java/lang/instrument/BootClassPath/BootClassPathTest.sh fails on Japanese Windows

Browse Source 
Reviewed-by: sspitsyn, kevinw
This commit is contained in:
Kimura Yukihiro 2023-10-30 23:26:16 +00:00 committed by Serguei Spitsyn
parent 1ca2cfafdd
commit d051f22284
2 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/jdk/java/lang/instrument/BootClassPath/BootClassPathTest.sh
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@ -64,7 +64,18 @@ echo "Creating manifest file..."
# java Setup <workdir> <premain-class>
# - outputs boot class path to boot.dir
"$JAVA" ${TESTVMOPTS} -classpath "${TESTCLASSES}" Setup "${TESTCLASSES}" Agent
OS=`uname -s`
case ${OS} in
CYGWIN*)
CYGWIN="CYGWIN"
;;
*)
CYGWIN=""
;;
esac
"$JAVA" ${TESTVMOPTS} -classpath "${TESTCLASSES}" Setup "${TESTCLASSES}" Agent "${CYGWIN}"
BOOTDIR=`cat ${TESTCLASSES}/boot.dir`
echo "Created ${BOOTDIR}"

43
test/jdk/java/lang/instrument/BootClassPath/Setup.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -45,6 +45,10 @@ public class Setup {
}
String workDir = args[0];
String premainClass = args[1];
boolean isCygwin = false;
if (args.length == 3 && args[2].equals("CYGWIN")) {
isCygwin = true;
}
String manifestFile = workDir + fileSeparator + "MANIFEST.MF";
String bootClassPath = "boot" + suffix();
@ -94,7 +98,12 @@ public class Setup {
*/
f = new File(workDir + fileSeparator + "boot.dir");
try (FileOutputStream out = new FileOutputStream(f)) {
out.write(bootDir.getBytes(filePathEncoding));
if (osName.startsWith("Windows") && isCygwin) {
out.write(bootDir.getBytes("UTF-8"));
}
else {
out.write(bootDir.getBytes(filePathEncoding));
}
}
}
@ -131,39 +140,39 @@ public class Setup {
// Use null if encoding isn't used.
String[][] names = {
{ "UTF-8", unicode, "" },
{ "windows-1256", null, "" },
{ "Cp1256", null, "" },
{ "iso-8859-6", arabic, null },
{ "GBK", s_chinese, s_chinese },
{ "GB18030", s_chinese, s_chinese },
{ "GB2312", s_chinese, null },
{ "x-windows-950", null, t_chinese },
{ "x-MS950-HKSCS", null, t_chinese },
{ "x-euc-tw", t_chinese, null },
{ "MS950", null, t_chinese },
{ "MS950_HKSCS_XP", null, t_chinese },
{ "EUC-TW", t_chinese, null },
{ "Big5", t_chinese, null },
{ "Big5-HKSCS", t_chinese, null },
{ "windows-1251", null, "" },
{ "iso-8859-5", russian, null },
{ "koi8-r", russian, null },
{ "windows-1253", null, "" },
{ "Cp1253", null, "" },
{ "iso-8859-7", greek, null },
{ "windows-1255", null, "" },
{ "iso8859-8", hebrew, null },
{ "windows-31j", null, japanese },
{ "Cp1255", null, "" },
{ "iso-8859-8", hebrew, null },
{ "MS932", null, japanese },
{ "x-eucJP-Open", japanese, null },
{ "x-EUC-JP-LINUX", japanese, null },
{ "EUC-JP-LINUX", japanese, null },
{ "x-pck", japanese, null },
{ "x-windows-949", null, korean },
{ "MS949", null, korean },
{ "euc-kr", korean, null },
{ "windows-1257", null, "" },
{ "Cp1257", null, "" },
{ "iso-8859-13", lithuanian, null },
{ "windows-1250", null, "" },
{ "Cp1250", null, "" },
{ "iso-8859-2", czech, null },
{ "windows-1254", null, "" },
{ "Cp1254", null, "" },
{ "iso-8859-9", turkish, null },
{ "windows-1252", null, "" },
{ "Cp1252", null, "" },
{ "iso-8859-1", spanish, null },
{ "iso-8859-15", spanish, null },
{ "x-windows-874", null, thai },
{ "MS874", null, thai },
{ "tis-620", thai, null },
};