test/hotspot/gtest/gc/g1/test_g1HeapVerifier.cpp

rev 48019 : 8191821: Finer granularity for GC verification
Reviewed-by:
rev 48020 : [mq]: 8191821-rev-sang-poonam
rev 48021 : [mq]: 8191821-rev-tsch

*** 32,69 ****
  
    LogConfiguration::configure_stdout(LogLevel::Off, true, LOG_TAGS(gc, verify));
  
    // Default is to verify everything.
    ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyAll));
!   ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyYoung));
    ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyMixed));
    ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyRemark));
    ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyCleanup));
    ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyFull));
  
    // Setting one will disable all other.
    verifier.parse_verification_type("full");
    ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyAll));
!   ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyYoung));
    ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyMixed));
    ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyRemark));
    ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyCleanup));
    ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyFull));
  
    // Verify case sensitivity.
!   verifier.parse_verification_type("YOUNG");
!   ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyYoung));
!   verifier.parse_verification_type("young");
!   ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyYoung));
  
    // Verify perfect match
    verifier.parse_verification_type("mixedgc");
    ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyMixed));
    verifier.parse_verification_type("mixed");
    ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyMixed));
  
!   // Verify the last two
    verifier.parse_verification_type("remark");
    verifier.parse_verification_type("cleanup");
    ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyRemark));
    ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyCleanup));
  
--- 32,74 ----
  
    LogConfiguration::configure_stdout(LogLevel::Off, true, LOG_TAGS(gc, verify));
  
    // Default is to verify everything.
    ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyAll));
!   ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyYoungOnly));
!   ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyInitialMark));
    ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyMixed));
    ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyRemark));
    ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyCleanup));
    ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyFull));
  
    // Setting one will disable all other.
    verifier.parse_verification_type("full");
    ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyAll));
!   ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyYoungOnly));
!   ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyInitialMark));
    ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyMixed));
    ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyRemark));
    ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyCleanup));
    ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyFull));
  
    // Verify case sensitivity.
!   verifier.parse_verification_type("YOUNG-ONLY");
!   ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyYoungOnly));
!   verifier.parse_verification_type("young-only");
!   ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyYoungOnly));
  
    // Verify perfect match
    verifier.parse_verification_type("mixedgc");
    ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyMixed));
+   verifier.parse_verification_type("mixe");
+   ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyMixed));
    verifier.parse_verification_type("mixed");
    ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyMixed));
  
!   // Verify the last three
!   verifier.parse_verification_type("initial-mark");
    verifier.parse_verification_type("remark");
    verifier.parse_verification_type("cleanup");
    ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyRemark));
    ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyCleanup));