changeset 33119:29f4d03f3eab

Merge
author dcubed
date Fri, 02 Oct 2015 16:48:31 +0000
parents 7a40dee50f80 bbeea96c5b63
children 63aca8d49f2a
files
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/test/runtime/CommandLine/VMOptionsFile/TestVMOptionsFile.java	Fri Oct 02 06:06:22 2015 -0700
+++ b/hotspot/test/runtime/CommandLine/VMOptionsFile/TestVMOptionsFile.java	Fri Oct 02 16:48:31 2015 +0000
@@ -505,10 +505,7 @@
 
         runJavaCheckExitValue(pb, JVM_SUCCESS);
 
-/*
- * This check can be enabled after 8136552 is fixed:
- *      outputShouldNotContain("VM option '+PrintVMOptions'");
- */
+        outputShouldNotContain("VM option '+PrintVMOptions'");
         checkProperty("shared.property", "command_line_before");
         checkVMOption("MinHeapFreeRatio", "7");