# HG changeset patch
# User iignatyev
# Date 1502493237 -7200
# Node ID 1c1c4904d92f90b7343f030c0c37e4f9ba60b5f7
# Parent  db2cd95b294c7a6fed2625fef3b2abe982bf4515# Parent  d8a818513b8c4cffcdefe04e8cf000aab8a8850d
Merge

diff -r db2cd95b294c -r 1c1c4904d92f hotspot/test/ProblemList.txt
--- a/hotspot/test/ProblemList.txt	Fri Aug 11 16:06:38 2017 -0700
+++ b/hotspot/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
 
 #############################################################################
 
diff -r db2cd95b294c -r 1c1c4904d92f hotspot/test/compiler/jsr292/PollutedTrapCounts.java
--- a/hotspot/test/compiler/jsr292/PollutedTrapCounts.java	Fri Aug 11 16:06:38 2017 -0700
+++ b/hotspot/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
  */