# HG changeset patch
# User dcubed
# Date 1502488220 0
# Node ID d8a818513b8c4cffcdefe04e8cf000aab8a8850d
# Parent  ec791efbdecf893529017c9c76f7f9aa4d38d522# Parent  58f54d1aa67457d9af5331348f77462cdcd0137d
Merge

diff -r ec791efbdecf -r d8a818513b8c hotspot/test/ProblemList.txt
--- 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
 
 #############################################################################
 
diff -r ec791efbdecf -r d8a818513b8c hotspot/test/compiler/jsr292/PollutedTrapCounts.java
--- 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
  */