test/gc/g1/TestGCLogMessages.java

rev 10309 : imported patch 8076463-add-logging-for-preserve-cm-tasks
rev 10310 : [mq]: 8150630-add-logging-for-merge-pss

*** 21,31 ****
   * questions.
   */
  
  /*
   * @test TestGCLogMessages
!  * @bug 8035406 8027295 8035398 8019342 8027959 8048179 8027962 8069330 8076463
   * @summary Ensure the output for a minor GC with G1
   * includes the expected necessary messages.
   * @key gc
   * @library /testlibrary
   * @modules java.base/sun.misc
--- 21,31 ----
   * questions.
   */
  
  /*
   * @test TestGCLogMessages
!  * @bug 8035406 8027295 8035398 8019342 8027959 8048179 8027962 8069330 8076463 8150630
   * @summary Ensure the output for a minor GC with G1
   * includes the expected necessary messages.
   * @key gc
   * @library /testlibrary
   * @modules java.base/sun.misc
*** 86,95 ****
--- 86,97 ----
          // Humongous Eager Reclaim
          new LogMessageWithLevel("Humongous Reclaim", Level.DEBUG),
          new LogMessageWithLevel("Humongous Register", Level.DEBUG),
          // Preserve CM Referents
          new LogMessageWithLevel("Preserve CM Refs", Level.DEBUG),
+         // Merge PSS
+         new LogMessageWithLevel("Merge Per-Thread State", Level.DEBUG),
      };
  
      void checkMessagesAtLevel(OutputAnalyzer output, LogMessageWithLevel messages[], Level level) throws Exception {
          for (LogMessageWithLevel l : messages) {
              if (level.lessOrEqualTo(l.level)) {