# HG changeset patch
# User dcubed
# Date 1443804511 0
# Node ID 29f4d03f3eab496aeefd9c007a1e3b8bf58fb291
# Parent  7a40dee50f80a8fd1c4d7bc7e8aee387adc34d19# Parent  bbeea96c5b639f731a18c2097032b0ba8ebd600f
Merge

diff -r 7a40dee50f80 -r 29f4d03f3eab hotspot/test/runtime/CommandLine/VMOptionsFile/TestVMOptionsFile.java
--- 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");