Skip to content

Commit cb112af

Browse files
Masanori Yanonaotoj
authored andcommitted
8269373: some tests in jdk/tools/launcher/ fails on localized Windows platform
Reviewed-by: naoto
1 parent 7e662e7 commit cb112af

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

test/jdk/tools/launcher/FXLauncherTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -360,6 +360,10 @@ static void testExtendFXApp(boolean useCP, boolean setFXMainClass) throws Except
360360
*/
361361
@Test
362362
static void testMissingMC() throws Exception {
363+
if (!isEnglishLocale()) {
364+
return;
365+
}
366+
363367
String testname = "testMissingMC";
364368
testcount++;
365369
line();

test/jdk/tools/launcher/SourceMode.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -200,6 +200,10 @@ void testClasspath() throws IOException {
200200
// java --add-exports=... Export.java --help
201201
@Test
202202
void testAddExports() throws IOException {
203+
if (!isEnglishLocale()) {
204+
return;
205+
}
206+
203207
starting("testAddExports");
204208
Path exportJava = Paths.get("Export.java");
205209
createFile(exportJava, List.of(
@@ -254,6 +258,10 @@ void testClassNamedJava() throws IOException {
254258
// java --source N -cp ... HelloWorld
255259
@Test
256260
void testSourceClasspath() throws IOException {
261+
if (!isEnglishLocale()) {
262+
return;
263+
}
264+
257265
starting("testSourceClasspath");
258266
Path base = Files.createDirectories(Paths.get("testSourceClasspath"));
259267
Path src = Files.createDirectories(base.resolve("src"));

0 commit comments

Comments
 (0)