# HG changeset patch
# User coleenp
# Date 1440522415 -7200
# Node ID 6ea0bf4c4e2840443f7a86643789c7f9aff57b87
# Parent  2e0377d76c5afc4bf5d03fa2520f6a869415c833# Parent  cffadc776803bab4c1d7d38f93db70988df8f3d9
Merge

diff -r 2e0377d76c5a -r 6ea0bf4c4e28 hotspot/test/compiler/arguments/CheckCICompilerCount.java
--- a/hotspot/test/compiler/arguments/CheckCICompilerCount.java	Tue Aug 25 17:30:14 2015 +0200
+++ b/hotspot/test/compiler/arguments/CheckCICompilerCount.java	Tue Aug 25 19:06:55 2015 +0200
@@ -75,7 +75,7 @@
             "intx CICompilerCount                          := 1                                   {product}"
         },
         {
-            "CICompilerCount=0 must be at least 1",
+            "CICompilerCount (0) must be at least 1",
             "Improperly specified VM option 'CICompilerCount=0'"
         },
         {
@@ -130,7 +130,7 @@
             "intx CICompilerCount                          := 2                                   {product}"
         },
         {
-            "CICompilerCount=1 must be at least 2",
+            "CICompilerCount (1) must be at least 2",
             "Improperly specified VM option 'CICompilerCount=1'"
         },
         {