changeset 10496:3256d4204291

8150054: Make compilercontrol test ignore xcomp Summary: Add -Xmixed and use jtreg driver Reviewed-by: kvn
author neliasso
date Wed, 16 Mar 2016 10:45:43 +0100
parents a67e578d4015
children 27654175e92a
files test/compiler/compilercontrol/commandfile/CompileOnlyTest.java test/compiler/compilercontrol/commandfile/ExcludeTest.java test/compiler/compilercontrol/commandfile/LogTest.java test/compiler/compilercontrol/commandfile/PrintTest.java test/compiler/compilercontrol/commands/CompileOnlyTest.java test/compiler/compilercontrol/commands/ExcludeTest.java test/compiler/compilercontrol/commands/LogTest.java test/compiler/compilercontrol/commands/PrintTest.java test/compiler/compilercontrol/directives/CompileOnlyTest.java test/compiler/compilercontrol/directives/ExcludeTest.java test/compiler/compilercontrol/directives/LogTest.java test/compiler/compilercontrol/directives/PrintTest.java test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java test/compiler/compilercontrol/jcmd/AddExcludeTest.java test/compiler/compilercontrol/jcmd/AddLogTest.java test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java test/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java test/compiler/compilercontrol/matcher/MethodMatcherTest.java test/compiler/compilercontrol/mixed/RandomCommandsTest.java test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java test/compiler/compilercontrol/share/MultiCommand.java test/compiler/compilercontrol/share/scenario/Scenario.java
diffstat 26 files changed, 47 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -29,9 +29,9 @@
  * @build compiler.compilercontrol.commandfile.CompileOnlyTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm compiler.compilercontrol.commandfile.CompileOnlyTest
+ * @run driver compiler.compilercontrol.commandfile.CompileOnlyTest
  */
 
 package compiler.compilercontrol.commandfile;
--- a/test/compiler/compilercontrol/commandfile/ExcludeTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/commandfile/ExcludeTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -29,9 +29,9 @@
  * @build compiler.compilercontrol.commandfile.ExcludeTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm compiler.compilercontrol.commandfile.ExcludeTest
+ * @run driver compiler.compilercontrol.commandfile.ExcludeTest
  */
 
 package compiler.compilercontrol.commandfile;
--- a/test/compiler/compilercontrol/commandfile/LogTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/commandfile/LogTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -29,9 +29,9 @@
  * @build compiler.compilercontrol.commandfile.LogTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm compiler.compilercontrol.commandfile.LogTest
+ * @run driver compiler.compilercontrol.commandfile.LogTest
  */
 
 package compiler.compilercontrol.commandfile;
--- a/test/compiler/compilercontrol/commandfile/PrintTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/commandfile/PrintTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -30,9 +30,9 @@
  * @build compiler.compilercontrol.commandfile.PrintTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm compiler.compilercontrol.commandfile.PrintTest
+ * @run driver compiler.compilercontrol.commandfile.PrintTest
  */
 
 package compiler.compilercontrol.commandfile;
--- a/test/compiler/compilercontrol/commands/CompileOnlyTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/commands/CompileOnlyTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -29,9 +29,9 @@
  * @build compiler.compilercontrol.commands.CompileOnlyTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm compiler.compilercontrol.commands.CompileOnlyTest
+ * @run driver compiler.compilercontrol.commands.CompileOnlyTest
  */
 
 package compiler.compilercontrol.commands;
--- a/test/compiler/compilercontrol/commands/ExcludeTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/commands/ExcludeTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -29,9 +29,9 @@
  * @build compiler.compilercontrol.commands.ExcludeTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm compiler.compilercontrol.commands.ExcludeTest
+ * @run driver compiler.compilercontrol.commands.ExcludeTest
  */
 
 package compiler.compilercontrol.commands;
--- a/test/compiler/compilercontrol/commands/LogTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/commands/LogTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -29,9 +29,9 @@
  * @build compiler.compilercontrol.commands.LogTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm compiler.compilercontrol.commands.LogTest
+ * @run driver compiler.compilercontrol.commands.LogTest
  */
 
 package compiler.compilercontrol.commands;
--- a/test/compiler/compilercontrol/commands/PrintTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/commands/PrintTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -30,9 +30,9 @@
  * @build compiler.compilercontrol.commands.PrintTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm compiler.compilercontrol.commands.PrintTest
+ * @run driver compiler.compilercontrol.commands.PrintTest
  */
 
 package compiler.compilercontrol.commands;
--- a/test/compiler/compilercontrol/directives/CompileOnlyTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/directives/CompileOnlyTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -29,9 +29,9 @@
  * @build compiler.compilercontrol.directives.CompileOnlyTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm compiler.compilercontrol.directives.CompileOnlyTest
+ * @run driver compiler.compilercontrol.directives.CompileOnlyTest
  */
 
 package compiler.compilercontrol.directives;
--- a/test/compiler/compilercontrol/directives/ExcludeTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/directives/ExcludeTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -29,9 +29,9 @@
  * @build compiler.compilercontrol.directives.ExcludeTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm compiler.compilercontrol.directives.ExcludeTest
+ * @run driver compiler.compilercontrol.directives.ExcludeTest
  */
 
 package compiler.compilercontrol.directives;
--- a/test/compiler/compilercontrol/directives/LogTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/directives/LogTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -29,9 +29,9 @@
  * @build compiler.compilercontrol.directives.LogTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm compiler.compilercontrol.directives.LogTest
+ * @run driver compiler.compilercontrol.directives.LogTest
  */
 
 package compiler.compilercontrol.directives;
--- a/test/compiler/compilercontrol/directives/PrintTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/directives/PrintTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -30,9 +30,9 @@
  * @build compiler.compilercontrol.directives.PrintTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm compiler.compilercontrol.directives.PrintTest
+ * @run driver compiler.compilercontrol.directives.PrintTest
  */
 
 package compiler.compilercontrol.directives;
--- a/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -29,9 +29,9 @@
  * @build compiler.compilercontrol.jcmd.AddAndRemoveTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm compiler.compilercontrol.jcmd.AddAndRemoveTest
+ * @run driver compiler.compilercontrol.jcmd.AddAndRemoveTest
  */
 
 package compiler.compilercontrol.jcmd;
--- a/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -29,9 +29,9 @@
  * @build compiler.compilercontrol.jcmd.AddCompileOnlyTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm compiler.compilercontrol.jcmd.AddCompileOnlyTest
+ * @run driver compiler.compilercontrol.jcmd.AddCompileOnlyTest
  */
 
 package compiler.compilercontrol.jcmd;
--- a/test/compiler/compilercontrol/jcmd/AddExcludeTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/jcmd/AddExcludeTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -29,9 +29,9 @@
  * @build compiler.compilercontrol.jcmd.AddExcludeTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm compiler.compilercontrol.jcmd.AddExcludeTest
+ * @run driver compiler.compilercontrol.jcmd.AddExcludeTest
  */
 
 package compiler.compilercontrol.jcmd;
--- a/test/compiler/compilercontrol/jcmd/AddLogTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/jcmd/AddLogTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -29,9 +29,9 @@
  * @build compiler.compilercontrol.jcmd.AddLogTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm compiler.compilercontrol.jcmd.AddLogTest
+ * @run driver compiler.compilercontrol.jcmd.AddLogTest
  */
 
 package compiler.compilercontrol.jcmd;
--- a/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -30,9 +30,9 @@
  * @build compiler.compilercontrol.jcmd.AddPrintAssemblyTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm compiler.compilercontrol.jcmd.AddPrintAssemblyTest
+ * @run driver compiler.compilercontrol.jcmd.AddPrintAssemblyTest
  */
 
 package compiler.compilercontrol.jcmd;
--- a/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -30,9 +30,9 @@
  * @build compiler.compilercontrol.jcmd.ClearDirectivesFileStackTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm compiler.compilercontrol.jcmd.ClearDirectivesFileStackTest
+ * @run driver compiler.compilercontrol.jcmd.ClearDirectivesFileStackTest
  */
 
 package compiler.compilercontrol.jcmd;
--- a/test/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -29,9 +29,9 @@
  * @build compiler.compilercontrol.jcmd.ClearDirectivesStackTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm compiler.compilercontrol.jcmd.ClearDirectivesStackTest
+ * @run driver compiler.compilercontrol.jcmd.ClearDirectivesStackTest
  */
 
 package compiler.compilercontrol.jcmd;
--- a/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -30,9 +30,9 @@
  * @build compiler.compilercontrol.jcmd.PrintDirectivesTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm compiler.compilercontrol.jcmd.PrintDirectivesTest
+ * @run driver compiler.compilercontrol.jcmd.PrintDirectivesTest
  */
 
 package compiler.compilercontrol.jcmd;
--- a/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -31,7 +31,7 @@
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils
  *        compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.jcmd.StressAddMultiThreadedTest
  */
--- a/test/compiler/compilercontrol/matcher/MethodMatcherTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/matcher/MethodMatcherTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -42,7 +42,7 @@
  * @summary Tests CompilerCommand's method matcher
  * @library /testlibrary /test/lib /compiler/whitebox ../share /
  * @build compiler.compilercontrol.matcher.MethodMatcherTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *           -XX:+WhiteBoxAPI compiler.compilercontrol.matcher.MethodMatcherTest
--- a/test/compiler/compilercontrol/mixed/RandomCommandsTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/mixed/RandomCommandsTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -29,9 +29,9 @@
  * @build compiler.compilercontrol.mixed.RandomCommandsTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm/timeout=600 compiler.compilercontrol.mixed.RandomCommandsTest
+ * @run driver/timeout=600 compiler.compilercontrol.mixed.RandomCommandsTest
  */
 
 package compiler.compilercontrol.mixed;
--- a/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java	Wed Mar 16 10:45:43 2016 +0100
@@ -30,7 +30,7 @@
  * @build compiler.compilercontrol.mixed.RandomValidCommandsTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm/timeout=600 compiler.compilercontrol.mixed.RandomValidCommandsTest
  */
--- a/test/compiler/compilercontrol/share/MultiCommand.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/share/MultiCommand.java	Wed Mar 16 10:45:43 2016 +0100
@@ -72,6 +72,7 @@
     @Override
     public void test() {
         Scenario.Builder builder = Scenario.getBuilder();
+        builder.addFlag("-Xmixed");
         for (CompileCommand cc : testCases) {
             cc.print();
             builder.add(cc);
--- a/test/compiler/compilercontrol/share/scenario/Scenario.java	Tue Mar 15 14:19:24 2016 -0700
+++ b/test/compiler/compilercontrol/share/scenario/Scenario.java	Wed Mar 16 10:45:43 2016 +0100
@@ -200,6 +200,7 @@
         private final List<JcmdCommand> jcmdCommands = new ArrayList<>();
 
         public Builder() {
+            addFlag("-Xmixed");
             builders.put(Type.FILE, new CommandFileBuilder(Type.FILE.fileName));
             builders.put(Type.OPTION, new CommandOptionsBuilder());
             builders.put(Type.DIRECTIVE, new DirectiveBuilder(