changeset 13502:122d8b165f68

Merge
author iignatyev
date Sat, 12 Aug 2017 01:13:57 +0200
parents c2430e15a9f1 c742c5b00556
children d9ec6f177df2
files
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/test/ProblemList.txt	Fri Aug 11 16:06:38 2017 -0700
+++ b/test/ProblemList.txt	Sat Aug 12 01:13:57 2017 +0200
@@ -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/test/compiler/jsr292/PollutedTrapCounts.java	Fri Aug 11 16:06:38 2017 -0700
+++ b/test/compiler/jsr292/PollutedTrapCounts.java	Sat Aug 12 01:13:57 2017 +0200
@@ -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
  */