提交 92558042 编写于 作者: B bchristi

8006039: test/tools/launcher/I18NJarTest.java fails on Mac w/ LANG=C, LC_ALL=C

Summary: Avoid automated test failure by just exiting when in 'C' locale
Reviewed-by: naoto, ksrini
上级 9fd7f809
...@@ -327,9 +327,6 @@ tools/pack200/Pack200Test.java solaris-all, mac ...@@ -327,9 +327,6 @@ tools/pack200/Pack200Test.java solaris-all, mac
# 7150569 # 7150569
tools/launcher/UnicodeTest.java macosx-all tools/launcher/UnicodeTest.java macosx-all
# 8006039
tools/launcher/I18NJarTest.java macosx-all
# 8007410 # 8007410
tools/launcher/FXLauncherTest.java linux-all tools/launcher/FXLauncherTest.java linux-all
......
/* /*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -52,6 +52,8 @@ public class I18NJarTest extends TestHelper { ...@@ -52,6 +52,8 @@ public class I18NJarTest extends TestHelper {
private static final File cwd = new File("."); private static final File cwd = new File(".");
private static final File dir = new File("\uFF66\uFF67\uFF68\uFF69"); private static final File dir = new File("\uFF66\uFF67\uFF68\uFF69");
private static final String encoding = System.getProperty("sun.jnu.encoding", ""); private static final String encoding = System.getProperty("sun.jnu.encoding", "");
private static final String LANG = System.getenv("LANG");
private static final String LC_ALL = System.getenv("LC_ALL");
public static void main(String... args) throws Exception { public static void main(String... args) throws Exception {
boolean localeAvailable = false; boolean localeAvailable = false;
...@@ -63,7 +65,16 @@ public class I18NJarTest extends TestHelper { ...@@ -63,7 +65,16 @@ public class I18NJarTest extends TestHelper {
} }
if (!localeAvailable) { if (!localeAvailable) {
System.out.println("Warning: locale: " + Locale.JAPAN System.out.println("Warning: locale: " + Locale.JAPAN
+ " not found, test passes vacuosly"); + " not found, test passes vacuously");
return;
}
if ("C".equals(LC_ALL) || "C".equals(LANG)) {
System.out.println("Warning: The LANG and/or LC_ALL env vars are " +
"set to \"C\":\n" +
" LANG=" + LANG + "\n" +
" LC_ALL=" + LC_ALL + "\n" +
"This test requires support for multi-byte filenames.\n" +
"Test passes vacuously.");
return; return;
} }
if (encoding.equals("MS932") || encoding.equals("UTF-8")) { if (encoding.equals("MS932") || encoding.equals("UTF-8")) {
...@@ -73,7 +84,7 @@ public class I18NJarTest extends TestHelper { ...@@ -73,7 +84,7 @@ public class I18NJarTest extends TestHelper {
} else { } else {
System.out.println("Warning: current encoding is " + encoding + System.out.println("Warning: current encoding is " + encoding +
"this test requires MS932 <Ja> or UTF-8," + "this test requires MS932 <Ja> or UTF-8," +
" test passes vacuosly"); " test passes vacuously");
return; return;
} }
dir.mkdir(); dir.mkdir();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册