changeset 9637:e677ebf4b028

8141129: 3 compiler control tests fail on product builds Summary: UnlockDiagnosticVMOptions should be placed before the PrintAssembly Reviewed-by: kvn
author ppunegov
date Tue, 03 Nov 2015 18:42:40 +0300
parents caa57b4b87f8
children c3abbf1a6f38
files test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java
diffstat 3 files changed, 8 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java	Tue Nov 03 20:12:47 2015 +0300
+++ b/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java	Tue Nov 03 18:42:40 2015 +0300
@@ -33,11 +33,12 @@
  * @build sun.hotspot.WhiteBox.*
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run testng/othervm -Xbootclasspath/a:. -XX:-PrintAssembly -XX:CompileCommand=option,*.helper,bool,PrintAssembly,false -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestCompilerDirectivesCompatibilityCommandOff
+ * @run testng/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *      -XX:-PrintAssembly -XX:CompileCommand=option,*.helper,bool,PrintAssembly,false
+ *      -XX:+WhiteBoxAPI TestCompilerDirectivesCompatibilityCommandOff
  * @summary Test compiler control compatibility with compile command
  */
 
-// import jdk.test.lib.OutputAnalyzer;
 import jdk.test.lib.dcmd.CommandExecutor;
 import jdk.test.lib.dcmd.JMXExecutor;
 
--- a/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java	Tue Nov 03 20:12:47 2015 +0300
+++ b/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java	Tue Nov 03 18:42:40 2015 +0300
@@ -33,11 +33,12 @@
  * @build sun.hotspot.WhiteBox.*
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run testng/othervm -Xbootclasspath/a:. -XX:-PrintAssembly -XX:CompileCommand=print,*.* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestCompilerDirectivesCompatibilityCommandOn
+ * @run testng/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *      -XX:-PrintAssembly -XX:CompileCommand=print,*.* -XX:+WhiteBoxAPI
+ *      TestCompilerDirectivesCompatibilityCommandOn
  * @summary Test compiler control compatibility with compile command
  */
 
-// import jdk.test.lib.OutputAnalyzer;
 import jdk.test.lib.dcmd.CommandExecutor;
 import jdk.test.lib.dcmd.JMXExecutor;
 
--- a/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java	Tue Nov 03 20:12:47 2015 +0300
+++ b/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java	Tue Nov 03 18:42:40 2015 +0300
@@ -33,7 +33,8 @@
  * @build sun.hotspot.WhiteBox.*
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run testng/othervm -Xbootclasspath/a:. -XX:+PrintAssembly -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestCompilerDirectivesCompatibilityFlag
+ * @run testng/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *      -XX:+PrintAssembly -XX:+WhiteBoxAPI TestCompilerDirectivesCompatibilityFlag
  * @summary Test compiler control compatibility with compile command
  */