8140539: compiler/membars/DekkerTest.java fails with -XX:CICompilerCount=1
Summary: Add back "-XX:+IgnoreUnrecognizedVMOptions" that was removed in a prototype.
Reviewed-by: dcubed, ddmitriev
--- a/hotspot/test/compiler/membars/DekkerTest.java Tue Oct 27 14:33:29 2015 +0300
+++ b/hotspot/test/compiler/membars/DekkerTest.java Wed Oct 28 09:09:55 2015 -0500
@@ -25,9 +25,9 @@
* @test
* @bug 8007898
* @summary Incorrect optimization of Memory Barriers in Matcher::post_store_load_barrier().
- * @run main/othervm -Xbatch -XX:-TieredCompilation -XX:CICompilerCount=1 -XX:+StressGCM -XX:+StressLCM DekkerTest
- * @run main/othervm -Xbatch -XX:-TieredCompilation -XX:CICompilerCount=1 -XX:+StressGCM -XX:+StressLCM DekkerTest
- * @run main/othervm -Xbatch -XX:-TieredCompilation -XX:CICompilerCount=1 -XX:+StressGCM -XX:+StressLCM DekkerTest
+ * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:CICompilerCount=1 -XX:+StressGCM -XX:+StressLCM DekkerTest
+ * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:CICompilerCount=1 -XX:+StressGCM -XX:+StressLCM DekkerTest
+ * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:CICompilerCount=1 -XX:+StressGCM -XX:+StressLCM DekkerTest
* @author Martin Doerr martin DOT doerr AT sap DOT com
*
* Run 3 times since the failure is intermittent.
--- a/hotspot/test/runtime/CommandLine/IgnoreUnrecognizedVMOptions.java Tue Oct 27 14:33:29 2015 +0300
+++ b/hotspot/test/runtime/CommandLine/IgnoreUnrecognizedVMOptions.java Wed Oct 28 09:09:55 2015 -0500
@@ -88,8 +88,8 @@
/*
#1.4 develop & notproduct flag on product VM:
- develop & !product_build notproduct & !product_build
- -XX:+DeoptimizeALot -XX:+VerifyCodeCache
+ develop & !product_build notproduct & product_build
+ -XX:+DeoptimizeALot -XX:+VerifyCodeCache
-IgnoreUnrecognizedVMOptions ERR ERR
+IgnoreUnrecognizedVMOptions OK OK
*/
@@ -103,8 +103,8 @@
/*
#1.5 malformed develop & notproduct flag on debug VM:
- develop & !product_build notproduct & !product_build
- -XX:DeoptimizeALot -XX:VerifyCodeCache
+ develop & !product_build notproduct & !product_build
+ -XX:DeoptimizeALot -XX:VerifyCodeCache
-IgnoreUnrecognizedVMOptions ERR ERR
+IgnoreUnrecognizedVMOptions ERR ERR
*/
@@ -117,8 +117,8 @@
/*
#1.6 malformed develop & notproduct flag on product VM:
- develop & !product_build .notproduct & !product_build
- -XX:DeoptimizeALot -XX:VerifyCodeCache
+ develop & !product_build notproduct & product_build
+ -XX:DeoptimizeALot -XX:VerifyCodeCache
-IgnoreUnrecognizedVMOptions ERR ERR
+IgnoreUnrecognizedVMOptions OK OK
*/