Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorcoleenp
Wed, 28 Oct 2015 23:29:21 +0100
changeset 33618 c89e098003b6
parent 33615 c8116ce58d71 (current diff)
parent 33617 ba5e8f66173f (diff)
child 33621 ba9cc1d8cc1f
Merge
--- a/hotspot/test/compiler/membars/DekkerTest.java	Wed Oct 28 19:54:46 2015 +0100
+++ b/hotspot/test/compiler/membars/DekkerTest.java	Wed Oct 28 23:29:21 2015 +0100
@@ -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	Wed Oct 28 19:54:46 2015 +0100
+++ b/hotspot/test/runtime/CommandLine/IgnoreUnrecognizedVMOptions.java	Wed Oct 28 23:29:21 2015 +0100
@@ -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
     */
jdk-sandbox