changeset 39697:1f34864a0347

Merge
author dcubed
date Tue, 05 Jul 2016 21:24:24 +0000
parents 946f1321c075 80c9894e18f9
children 4016de4e596b 7a2a49fd5ee0
files
diffstat 7 files changed, 15 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/test/compiler/ciReplay/TestVM_no_comp_level.sh	Tue Jul 05 15:34:06 2016 -0400
+++ b/hotspot/test/compiler/ciReplay/TestVM_no_comp_level.sh	Tue Jul 05 21:24:24 2016 +0000
@@ -29,6 +29,7 @@
 ## @summary testing of ciReplay with using generated by VM replay.txt w/o comp_level
 ## @author igor.ignatyev@oracle.com
 ## @requires vm.flightRecorder != true
+## @ignore 8157984
 ## @run shell TestVM_no_comp_level.sh
 ##
 
--- a/hotspot/test/compiler/rangechecks/TestRangeCheckSmearing.java	Tue Jul 05 15:34:06 2016 -0400
+++ b/hotspot/test/compiler/rangechecks/TestRangeCheckSmearing.java	Tue Jul 05 21:24:24 2016 +0000
@@ -28,6 +28,7 @@
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @ignore 8157984
  * @build TestRangeCheckSmearing
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                jdk.test.lib.Platform
--- a/hotspot/test/compiler/tiered/NonTieredLevelsTest.java	Tue Jul 05 15:34:06 2016 -0400
+++ b/hotspot/test/compiler/tiered/NonTieredLevelsTest.java	Tue Jul 05 21:24:24 2016 +0000
@@ -26,6 +26,7 @@
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  * @modules java.management
+ * @ignore 8157984
  * @build NonTieredLevelsTest
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/hotspot/test/runtime/SharedArchiveFile/SASymbolTableTest.java	Tue Jul 05 15:34:06 2016 -0400
+++ b/hotspot/test/runtime/SharedArchiveFile/SASymbolTableTest.java	Tue Jul 05 21:24:24 2016 +0000
@@ -24,6 +24,9 @@
 /*
  * @test SASymbolTableTest
  * @summary Walk symbol table using SA, with and without CDS.
+ * Started failing on 2016.06.24 due to 8160376 on MacOS X so quarantine
+ * it on that platform:
+ * @requires os.family != "mac"
  * @library /testlibrary
  * @modules java.base/jdk.internal.misc
  *          jdk.hotspot.agent/sun.jvm.hotspot.oops
--- a/hotspot/test/serviceability/sa/TestClassLoaderStats.java	Tue Jul 05 15:34:06 2016 -0400
+++ b/hotspot/test/serviceability/sa/TestClassLoaderStats.java	Tue Jul 05 21:24:24 2016 +0000
@@ -32,6 +32,9 @@
 
 /*
  * @test
+ * @summary Started failing on 2016.06.24 due to 8160376 on MacOS X so
+ * quarantine it on that platform:
+ * @requires os.family != "mac"
  * @modules java.base/jdk.internal.misc
  * @library /test/lib/share/classes
  * @library /testlibrary
--- a/hotspot/test/serviceability/sa/TestStackTrace.java	Tue Jul 05 15:34:06 2016 -0400
+++ b/hotspot/test/serviceability/sa/TestStackTrace.java	Tue Jul 05 21:24:24 2016 +0000
@@ -32,6 +32,9 @@
 
 /*
  * @test
+ * @summary Started failing on 2016.06.24 due to 8160376 on MacOS X so
+ * quarantine it on that platform:
+ * @requires os.family != "mac"
  * @modules java.base/jdk.internal.misc
  * @library /test/lib/share/classes
  * @library /testlibrary
--- a/hotspot/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java	Tue Jul 05 15:34:06 2016 -0400
+++ b/hotspot/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java	Tue Jul 05 21:24:24 2016 +0000
@@ -43,6 +43,9 @@
  * @bug 6313383
  * @key regression
  * @summary Regression test for hprof export issue due to large heaps (>2G)
+ * Started failing on 2016.06.24 due to 8160376 on MacOS X so quarantine
+ * it on that platform:
+ * @requires os.family != "mac"
  * @library /testlibrary
  * @modules java.base/jdk.internal.misc
  *          java.compiler