diff options
author | Andrey Loskutov | 2019-01-12 08:09:30 +0000 |
---|---|---|
committer | Andrey Loskutov | 2019-01-12 08:09:30 +0000 |
commit | 9420ac111fc8ea1b1513fabd25db66ee1359accd (patch) | |
tree | bfd4b29383e1288a5f8de48acf25da7ac493fa10 | |
parent | 8f27de00ee41924ca8f840207a4c9805178a3f1d (diff) | |
download | eclipse.jdt.core-9420ac111fc8ea1b1513fabd25db66ee1359accd.tar.gz eclipse.jdt.core-9420ac111fc8ea1b1513fabd25db66ee1359accd.tar.xz eclipse.jdt.core-9420ac111fc8ea1b1513fabd25db66ee1359accd.zip |
Bug 413114 - testBug376673e fails on windows due "windows-1252" charset
Let assume UTF-8 as mandatory for *nix based systems. Windows is
different and has windows-1252 as system default.
Change-Id: I88b8bdc8d116a319becad7f84b9be43ad5da35be
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
-rw-r--r-- | org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests2.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests2.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests2.java index 770f241fc2..cc08ea50ff 100644 --- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests2.java +++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests2.java @@ -40,6 +40,7 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Platform; import org.eclipse.jdt.core.IAccessRule; import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.ICompilationUnit; @@ -806,7 +807,11 @@ public class JavaSearchBugsTests2 extends AbstractJavaSearchTests { if ("macosx".equals(System.getProperty("osgi.os"))) { return; } - assertUTF8Encoding(); + String os = Platform.getOS(); + if (!Platform.OS_WIN32.equals(os)) { + // on Windows we have Windows-1252 as default, *nix should use UTF-8 + assertUTF8Encoding(); + } IJavaProject p = createJavaProject("P", new String[] {}, new String[] { "/P/lib376673.jar", "JCL17_LIB" }, "", "1.7"); IPath jarPath = p.getProject().getLocation().append("lib376673.jar"); |