Merge
authorcoleenp
Thu, 11 Jan 2018 21:49:51 -0500
changeset 48636 b96f03796580
parent 48635 612dfa1d8aad (current diff)
parent 48634 ec666229de1f (diff)
child 48637 7bba05746c44
child 48781 6ebef5cd0c8d
Merge
--- a/test/hotspot/jtreg/runtime/NMT/PrintNMTStatistics.java	Thu Jan 11 18:42:36 2018 -0500
+++ b/test/hotspot/jtreg/runtime/NMT/PrintNMTStatistics.java	Thu Jan 11 21:49:51 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,6 @@
     OutputAnalyzer output_detail = new OutputAnalyzer(pb.start());
     output_detail.shouldContain("Virtual memory map:");
     output_detail.shouldContain("Details:");
-    output_detail.shouldNotContain("error");
     output_detail.shouldHaveExitValue(0);
 
     // Make sure memory reserved for Module processing is recorded.
@@ -62,7 +61,6 @@
     output_summary.shouldContain("Java Heap (reserved=");
     output_summary.shouldNotContain("Virtual memory map:");
     output_summary.shouldNotContain("Details:");
-    output_summary.shouldNotContain("error");
     output_summary.shouldHaveExitValue(0);
     }
 }