changeset 46799:d8a818513b8c

Merge
author dcubed
date Fri, 11 Aug 2017 21:50:20 +0000
parents ec791efbdecf 58f54d1aa674
children eae083666a41 1c1c4904d92f
files
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/test/ProblemList.txt	Fri Aug 11 16:29:00 2017 -0400
+++ b/hotspot/test/ProblemList.txt	Fri Aug 11 21:50:20 2017 +0000
@@ -125,6 +125,7 @@
 gc/g1/logging/TestG1LoggingFailure.java 8169634 generic-all
 gc/g1/humongousObjects/TestHeapCounters.java 8178918 generic-all
 gc/stress/gclocker/TestGCLockerWithG1.java 8179226 generic-all
+gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java 8177765 generic-all
 
 #############################################################################
 
--- a/hotspot/test/compiler/jsr292/PollutedTrapCounts.java	Fri Aug 11 16:29:00 2017 -0400
+++ b/hotspot/test/compiler/jsr292/PollutedTrapCounts.java	Fri Aug 11 21:50:20 2017 +0000
@@ -26,7 +26,7 @@
  * @bug 8074551
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
- *
+ * @build jdk.test.lib.* jdk.test.lib.process.*
  * @run driver compiler.jsr292.PollutedTrapCounts
  */