# HG changeset patch # User duke # Date 1499290733 -7200 # Node ID df83be95e6c1b8412adec5aa996d77fa474aae1c # Parent 2b591c4d54e8167e0cea4bc4a96782623d9d3dd7# Parent 31045970cc450fc050031bae931bda05cd068a98 Merge diff -r 2b591c4d54e8 -r df83be95e6c1 .hgtags-top-repo --- a/.hgtags-top-repo Wed Jun 14 20:05:32 2017 +0000 +++ b/.hgtags-top-repo Wed Jul 05 23:38:53 2017 +0200 @@ -426,3 +426,5 @@ 4c12464a907db4656c1033f56fa49cba643ac629 jdk-9+171 6558c37afe832582238d338578d598f30c6fdd75 jdk-10+10 2c25fc24103251f9711a1c280c31e1e41016d90f jdk-9+172 +6b750cdb823a029a25ff2e560302cc2d28a86cb6 jdk-10+11 +88d7fd969e7df0e07a53b201cfd29393ca33ede9 jdk-9+173 diff -r 2b591c4d54e8 -r df83be95e6c1 common/conf/jib-profiles.js --- a/common/conf/jib-profiles.js Wed Jun 14 20:05:32 2017 +0000 +++ b/common/conf/jib-profiles.js Wed Jul 05 23:38:53 2017 +0200 @@ -387,7 +387,7 @@ // on such hardware. if (input.build_cpu == "sparcv9") { var cpu_brand = $EXEC("bash -c \"kstat -m cpu_info | grep brand | head -n1 | awk '{ print \$2 }'\""); - if (cpu_brand.trim().match('SPARC-.7')) { + if (cpu_brand.trim().match('SPARC-.[78]')) { boot_jdk_revision = "8u20"; boot_jdk_subdirpart = "1.8.0_20"; } diff -r 2b591c4d54e8 -r df83be95e6c1 make/CompileJavaModules.gmk --- a/make/CompileJavaModules.gmk Wed Jun 14 20:05:32 2017 +0000 +++ b/make/CompileJavaModules.gmk Wed Jul 05 23:38:53 2017 +0200 @@ -42,8 +42,7 @@ ################################################################################ -java.base_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' -XDstringConcat=inline \ - --doclint-format html4 +java.base_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' -XDstringConcat=inline java.base_COPY := .icu .dat .spp content-types.properties hijrah-config-islamic-umalqura.properties java.base_CLEAN := intrinsic.properties diff -r 2b591c4d54e8 -r df83be95e6c1 test/lib/jdk/test/lib/Platform.java --- a/test/lib/jdk/test/lib/Platform.java Wed Jun 14 20:05:32 2017 +0000 +++ b/test/lib/jdk/test/lib/Platform.java Wed Jul 05 23:38:53 2017 +0200 @@ -23,6 +23,10 @@ package jdk.test.lib; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.regex.Pattern; public class Platform { @@ -228,7 +232,7 @@ public static boolean canPtraceAttachLinux() throws Exception { // SELinux deny_ptrace: - String deny_ptrace = Utils.fileAsString("/sys/fs/selinux/booleans/deny_ptrace"); + String deny_ptrace = fileAsString("/sys/fs/selinux/booleans/deny_ptrace"); if (deny_ptrace != null && deny_ptrace.contains("1")) { // ptrace will be denied: return false; @@ -239,7 +243,7 @@ // 1 - restricted ptrace: a process must be a children of the inferior or user is root // 2 - only processes with CAP_SYS_PTRACE may use ptrace or user is root // 3 - no attach: no processes may use ptrace with PTRACE_ATTACH - String ptrace_scope = Utils.fileAsString("/proc/sys/kernel/yama/ptrace_scope"); + String ptrace_scope = fileAsString("/proc/sys/kernel/yama/ptrace_scope"); if (ptrace_scope != null) { if (ptrace_scope.startsWith("3")) { return false; @@ -265,4 +269,10 @@ .matcher(osArch) .matches(); } + + private static String fileAsString(String filename) throws IOException { + Path filePath = Paths.get(filename); + if (!Files.exists(filePath)) return null; + return new String(Files.readAllBytes(filePath)); + } }