Mercurial > hg > jdk9-shenandoah
changeset 1563:0baa46377309
Merge
author | kvn |
---|---|
date | Thu, 25 Jun 2015 09:48:23 -0700 |
parents | 46ab7e19a4a6 (current diff) a7fb45dd6d26 (diff) |
children | 860d264db9e9 |
files | make/jprt.properties |
diffstat | 3 files changed, 31 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/make/jprt.properties Sat Jun 20 11:24:07 2015 +0300 +++ b/make/jprt.properties Thu Jun 25 09:48:23 2015 -0700 @@ -285,13 +285,11 @@ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_ParallelGC, \ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_CMS, \ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_G1, \ - solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_ParOldGC, \ solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_default_nontiered, \ solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_SerialGC, \ solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_ParallelGC, \ solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_CMS, \ - solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_G1, \ - solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_ParOldGC + solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_G1 my.test.targets.hotspot.solaris.x64= \ solaris_x64_5.11-{product|fastdebug}-c2-jvm98, \ @@ -304,7 +302,6 @@ solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_ParallelGC, \ solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_CMS, \ solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_G1, \ - solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_ParOldGC, \ solaris_x64_5.11-{product|fastdebug}-c2-jbb_default_nontiered, \ solaris_x64_5.11-{product|fastdebug}-c2-jbb_SerialGC, \ solaris_x64_5.11-{product|fastdebug}-c2-jbb_ParallelGC, @@ -322,13 +319,11 @@ linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_G1, \ - linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \ linux_i586_2.6-{product|fastdebug}-c1-jbb_SerialGC, \ linux_i586_2.6-{product|fastdebug}-c2-jbb_default_nontiered, \ linux_i586_2.6-{product|fastdebug}-c1-jbb_ParallelGC, \ linux_i586_2.6-{product|fastdebug}-c1-jbb_CMS, \ - linux_i586_2.6-{product|fastdebug}-c1-jbb_G1, \ - linux_i586_2.6-{product|fastdebug}-c1-jbb_ParOldGC + linux_i586_2.6-{product|fastdebug}-c1-jbb_G1 my.test.targets.hotspot.linux.x64= \ linux_x64_2.6-{product|fastdebug}-c2-jvm98, \ @@ -338,11 +333,9 @@ linux_x64_2.6-{product|fastdebug}-c2-GCBasher_ParallelGC, \ linux_x64_2.6-{product|fastdebug}-c2-GCBasher_CMS, \ linux_x64_2.6-{product|fastdebug}-c2-GCBasher_G1, \ - linux_x64_2.6-{product|fastdebug}-c2-GCBasher_ParOldGC, \ linux_x64_2.6-{product|fastdebug}-c2-jbb_default_nontiered, \ linux_x64_2.6-{product|fastdebug}-c2-jbb_ParallelGC, \ - linux_x64_2.6-{product|fastdebug}-c2-jbb_G1, \ - linux_x64_2.6-{product|fastdebug}-c2-jbb_ParOldGC + linux_x64_2.6-{product|fastdebug}-c2-jbb_G1 my.test.targets.hotspot.macosx.x64= \ macosx_x64_10.9-{product|fastdebug}-c2-jvm98, \ @@ -352,11 +345,9 @@ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_ParallelGC, \ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_CMS, \ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_G1, \ - macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_ParOldGC, \ macosx_x64_10.9-{product|fastdebug}-c2-jbb_default_nontiered, \ macosx_x64_10.9-{product|fastdebug}-c2-jbb_ParallelGC, \ - macosx_x64_10.9-{product|fastdebug}-c2-jbb_G1, \ - macosx_x64_10.9-{product|fastdebug}-c2-jbb_ParOldGC + macosx_x64_10.9-{product|fastdebug}-c2-jbb_G1 my.test.targets.hotspot.windows.i586= \ windows_i586_6.2-{product|fastdebug}-{c1|c2}-jvm98, \ @@ -370,13 +361,11 @@ windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_G1, \ - windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \ windows_i586_6.2-{product|fastdebug}-{c1|c2}-jbb_default, \ windows_i586_6.2-{product|fastdebug}-c2-jbb_default_nontiered, \ windows_i586_6.2-product-{c1|c2}-jbb_ParallelGC, \ windows_i586_6.2-product-{c1|c2}-jbb_CMS, \ - windows_i586_6.2-product-{c1|c2}-jbb_G1, \ - windows_i586_6.2-product-{c1|c2}-jbb_ParOldGC + windows_i586_6.2-product-{c1|c2}-jbb_G1 my.test.targets.hotspot.windows.x64= \ windows_x64_6.2-{product|fastdebug}-c2-jvm98, \ @@ -389,13 +378,11 @@ windows_x64_6.2-{product|fastdebug}-c2-GCBasher_ParallelGC, \ windows_x64_6.2-{product|fastdebug}-c2-GCBasher_CMS, \ windows_x64_6.2-{product|fastdebug}-c2-GCBasher_G1, \ - windows_x64_6.2-{product|fastdebug}-c2-GCBasher_ParOldGC, \ windows_x64_6.2-{product|fastdebug}-c2-jbb_default, \ windows_x64_6.2-{product|fastdebug}-c2-jbb_default_nontiered, \ windows_x64_6.2-product-c2-jbb_CMS, \ windows_x64_6.2-product-c2-jbb_ParallelGC, \ - windows_x64_6.2-product-c2-jbb_G1, \ - windows_x64_6.2-product-c2-jbb_ParOldGC + windows_x64_6.2-product-c2-jbb_G1 # Some basic "smoke" tests for OpenJDK builds my.test.targets.hotspot.open= \
--- a/test/lib/share/classes/jdk/test/lib/apps/LingeredApp.java Sat Jun 20 11:24:07 2015 +0300 +++ b/test/lib/share/classes/jdk/test/lib/apps/LingeredApp.java Thu Jun 25 09:48:23 2015 -0700 @@ -287,7 +287,7 @@ } } else{ - // Lets user manage LingerApp options + // Lets user manage LingeredApp options cmd.addAll(vmArguments); } @@ -321,6 +321,20 @@ } /** + * Delete lock file that signals app to terminate, then + * wait until app is actually terminated. + * @throws IOException + */ + public void stopApp() throws IOException { + deleteLock(); + waitAppTerminate(); + int exitcode = appProcess.exitValue(); + if (exitcode != 0) { + throw new IOException("LingeredApp terminated with non-zero exit code " + exitcode); + } + } + + /** * High level interface for test writers */ /** @@ -351,17 +365,11 @@ return startApp(null); } - /** - * Delete lock file that signal app to terminate, then - * waits until app is actually terminated. - * @throws IOException - */ - public void stopApp() throws IOException { - deleteLock(); - waitAppTerminate(); - int exitcode = appProcess.exitValue(); - if (exitcode != 0) { - throw new IOException("LingeredApp terminated with non-zero exit code " + exitcode); + public static void stopApp(LingeredApp app) throws IOException { + if (app != null) { + // LingeredApp can throw an exception during the intialization, + // make sure we don't have cascade NPE + app.stopApp(); } }
--- a/test/lib/sun/hotspot/WhiteBox.java Sat Jun 20 11:24:07 2015 +0300 +++ b/test/lib/sun/hotspot/WhiteBox.java Thu Jun 25 09:48:23 2015 -0700 @@ -83,6 +83,7 @@ public native int getHeapOopSize(); public native int getVMPageSize(); + public native long getVMAllocationGranularity(); public native long getVMLargePageSize(); private native boolean isObjectInOldGen0(Object o); @@ -363,4 +364,8 @@ // Safepoint Checking public native void assertMatchingSafepointCalls(boolean mutexSafepointValue, boolean attemptedNoSafepointValue); + + // Sharing + public native boolean isShared(Object o); + public native boolean areSharedStringsIgnored(); }