# HG changeset patch
# User avorobye
# Date 1473438608 -10800
# Node ID 9f985f4ecea806777cdbc1c78dadd98e7267f15c
# Parent  55c16639f2ead7f6c4248cc92f840bedad3063e9
8146128: compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig timeouts
Summary: test settings were changes in order to avoid timeouts
Reviewed-by: kvn

diff -r 55c16639f2ea -r 9f985f4ecea8 hotspot/test/compiler/cpuflags/AESIntrinsicsBase.java
--- a/hotspot/test/compiler/cpuflags/AESIntrinsicsBase.java	Fri Sep 09 06:44:31 2016 +0000
+++ b/hotspot/test/compiler/cpuflags/AESIntrinsicsBase.java	Fri Sep 09 19:30:08 2016 +0300
@@ -48,8 +48,8 @@
             = {"-XX:+UnlockDiagnosticVMOptions", "-XX:+PrintIntrinsics"};
     public static final String[] TEST_AES_CMD
             = {"-XX:+IgnoreUnrecognizedVMOptions", "-XX:+PrintFlagsFinal",
-            "-Xbatch", "-DcheckOutput=true", "-Dmode=CBC",
-            TestAESMain.class.getName()};
+            "-Xbatch", "-XX:CompileThresholdScaling=0.01", "-DcheckOutput=true", "-Dmode=CBC",
+            TestAESMain.class.getName(), "100", "1000"};
 
     protected AESIntrinsicsBase(BooleanSupplier predicate) {
         super(predicate);
diff -r 55c16639f2ea -r 9f985f4ecea8 hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java
--- a/hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java	Fri Sep 09 06:44:31 2016 +0000
+++ b/hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java	Fri Sep 09 19:30:08 2016 +0300
@@ -27,11 +27,11 @@
  * @library /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @ignore 8146128
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/timeout=600 -Xbootclasspath/a:.
+ *                   -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -Xbatch
  *                   compiler.cpuflags.TestAESIntrinsicsOnSupportedConfig
  */