jdk8-mips64-public/hotspot: changeset 7787:1ec24746bb40

8038098: [TESTBUG] remove explicit set build flavor from hotspot/test/compiler/* tests
Reviewed-by: kvn, iignatyev

     1.1 --- a/test/compiler/codegen/LoadWithMask.java	Fri Apr 24 09:47:07 2015 +0200
     1.2 +++ b/test/compiler/codegen/LoadWithMask.java	Thu Apr 23 13:02:32 2015 +0300
     1.3 @@ -25,7 +25,7 @@
     1.4   * @test
     1.5   * @bug 8032207
     1.6   * @summary Invalid node sizing for loadUS2L_immI16 and loadI2L_immI
     1.7 - * @run main/othervm -server -Xbatch -XX:-TieredCompilation -XX:CompileCommand=compileonly,LoadWithMask.foo LoadWithMask
     1.8 + * @run main/othervm -Xbatch -XX:CompileCommand=compileonly,LoadWithMask.foo LoadWithMask
     1.9   *
    1.10   */
    1.11  public class LoadWithMask {

     2.1 --- a/test/compiler/codegen/LoadWithMask2.java	Fri Apr 24 09:47:07 2015 +0200
     2.2 +++ b/test/compiler/codegen/LoadWithMask2.java	Thu Apr 23 13:02:32 2015 +0300
     2.3 @@ -25,7 +25,7 @@
     2.4   * @test
     2.5   * @bug 8031743
     2.6   * @summary loadI2L_immI broken for negative memory values
     2.7 - * @run main/othervm -server -Xbatch -XX:-TieredCompilation -XX:CompileCommand=compileonly,*.foo* LoadWithMask2
     2.8 + * @run main/othervm -Xbatch -XX:CompileCommand=compileonly,*.foo* LoadWithMask2
     2.9   *
    2.10   */
    2.11  public class LoadWithMask2 {

     3.1 --- a/test/compiler/stable/TestStableBoolean.java	Fri Apr 24 09:47:07 2015 +0200
     3.2 +++ b/test/compiler/stable/TestStableBoolean.java	Thu Apr 23 13:02:32 2015 +0300
     3.3 @@ -53,44 +53,32 @@
     3.4   *           java/lang/invoke/TestStableBoolean$DefaultStaticValue
     3.5   *           java/lang/invoke/TestStableBoolean$ObjectArrayLowerDim2
     3.6   *
     3.7 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
     3.8 + * @run main/othervm -Xbootclasspath/a:.
     3.9   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    3.10 - *                   -server -XX:-TieredCompilation
    3.11 + *                   -XX:-TieredCompilation
    3.12   *                   -XX:+FoldStableValues
    3.13   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    3.14   *                   java.lang.invoke.TestStableBoolean
    3.15 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    3.16 + * @run main/othervm -Xbootclasspath/a:.
    3.17   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    3.18 - *                   -server -XX:-TieredCompilation
    3.19 + *                   -XX:-TieredCompilation
    3.20   *                   -XX:-FoldStableValues
    3.21   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    3.22   *                   java.lang.invoke.TestStableBoolean
    3.23   *
    3.24 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    3.25 + * @run main/othervm -Xbootclasspath/a:.
    3.26   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    3.27 - *                   -server -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    3.28 + *                   -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    3.29   *                   -XX:+FoldStableValues
    3.30   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    3.31   *                   java.lang.invoke.TestStableBoolean
    3.32 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    3.33 + * @run main/othervm -Xbootclasspath/a:.
    3.34   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    3.35 - *                   -server -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    3.36 + *                   -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    3.37   *                   -XX:-FoldStableValues
    3.38   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    3.39   *                   java.lang.invoke.TestStableBoolean
    3.40   *
    3.41 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    3.42 - *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    3.43 - *                   -client -XX:-TieredCompilation
    3.44 - *                   -XX:+FoldStableValues
    3.45 - *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    3.46 - *                   java.lang.invoke.TestStableBoolean
    3.47 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    3.48 - *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    3.49 - *                   -client -XX:-TieredCompilation
    3.50 - *                   -XX:-FoldStableValues
    3.51 - *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    3.52 - *                   java.lang.invoke.TestStableBoolean
    3.53   */
    3.54  package java.lang.invoke;
    3.55

     4.1 --- a/test/compiler/stable/TestStableByte.java	Fri Apr 24 09:47:07 2015 +0200
     4.2 +++ b/test/compiler/stable/TestStableByte.java	Thu Apr 23 13:02:32 2015 +0300
     4.3 @@ -53,44 +53,32 @@
     4.4   *           java/lang/invoke/TestStableByte$DefaultStaticValue
     4.5   *           java/lang/invoke/TestStableByte$ObjectArrayLowerDim2
     4.6   *
     4.7 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
     4.8 + * @run main/othervm -Xbootclasspath/a:.
     4.9   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    4.10 - *                   -server -XX:-TieredCompilation
    4.11 + *                   -XX:-TieredCompilation
    4.12   *                   -XX:+FoldStableValues
    4.13   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    4.14   *                   java.lang.invoke.TestStableByte
    4.15 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    4.16 + * @run main/othervm -Xbootclasspath/a:.
    4.17   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    4.18 - *                   -server -XX:-TieredCompilation
    4.19 + *                   -XX:-TieredCompilation
    4.20   *                   -XX:-FoldStableValues
    4.21   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    4.22   *                   java.lang.invoke.TestStableByte
    4.23   *
    4.24 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    4.25 + * @run main/othervm -Xbootclasspath/a:.
    4.26   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    4.27 - *                   -server -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    4.28 + *                   -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    4.29   *                   -XX:+FoldStableValues
    4.30   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    4.31   *                   java.lang.invoke.TestStableByte
    4.32 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    4.33 + * @run main/othervm -Xbootclasspath/a:.
    4.34   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    4.35 - *                   -server -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    4.36 + *                   -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    4.37   *                   -XX:-FoldStableValues
    4.38   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    4.39   *                   java.lang.invoke.TestStableByte
    4.40   *
    4.41 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    4.42 - *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    4.43 - *                   -client -XX:-TieredCompilation
    4.44 - *                   -XX:+FoldStableValues
    4.45 - *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    4.46 - *                   java.lang.invoke.TestStableByte
    4.47 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    4.48 - *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    4.49 - *                   -client -XX:-TieredCompilation
    4.50 - *                   -XX:-FoldStableValues
    4.51 - *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    4.52 - *                   java.lang.invoke.TestStableByte
    4.53   */
    4.54  package java.lang.invoke;
    4.55

     5.1 --- a/test/compiler/stable/TestStableChar.java	Fri Apr 24 09:47:07 2015 +0200
     5.2 +++ b/test/compiler/stable/TestStableChar.java	Thu Apr 23 13:02:32 2015 +0300
     5.3 @@ -53,44 +53,32 @@
     5.4   *           java/lang/invoke/TestStableChar$DefaultStaticValue
     5.5   *           java/lang/invoke/TestStableChar$ObjectArrayLowerDim2
     5.6   *
     5.7 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
     5.8 + * @run main/othervm -Xbootclasspath/a:.
     5.9   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    5.10 - *                   -server -XX:-TieredCompilation
    5.11 + *                   -XX:-TieredCompilation
    5.12   *                   -XX:+FoldStableValues
    5.13   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    5.14   *                   java.lang.invoke.TestStableChar
    5.15 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    5.16 + * @run main/othervm -Xbootclasspath/a:.
    5.17   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    5.18 - *                   -server -XX:-TieredCompilation
    5.19 + *                   -XX:-TieredCompilation
    5.20   *                   -XX:-FoldStableValues
    5.21   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    5.22   *                   java.lang.invoke.TestStableChar
    5.23   *
    5.24 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    5.25 + * @run main/othervm -Xbootclasspath/a:.
    5.26   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    5.27 - *                   -server -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    5.28 + *                   -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    5.29   *                   -XX:+FoldStableValues
    5.30   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    5.31   *                   java.lang.invoke.TestStableChar
    5.32 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    5.33 + * @run main/othervm -Xbootclasspath/a:.
    5.34   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    5.35 - *                   -server -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    5.36 + *                   -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    5.37   *                   -XX:-FoldStableValues
    5.38   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    5.39   *                   java.lang.invoke.TestStableChar
    5.40   *
    5.41 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    5.42 - *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    5.43 - *                   -client -XX:-TieredCompilation
    5.44 - *                   -XX:+FoldStableValues
    5.45 - *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    5.46 - *                   java.lang.invoke.TestStableChar
    5.47 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    5.48 - *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    5.49 - *                   -client -XX:-TieredCompilation
    5.50 - *                   -XX:-FoldStableValues
    5.51 - *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    5.52 - *                   java.lang.invoke.TestStableChar
    5.53   */
    5.54  package java.lang.invoke;
    5.55

     6.1 --- a/test/compiler/stable/TestStableDouble.java	Fri Apr 24 09:47:07 2015 +0200
     6.2 +++ b/test/compiler/stable/TestStableDouble.java	Thu Apr 23 13:02:32 2015 +0300
     6.3 @@ -53,44 +53,32 @@
     6.4   *           java/lang/invoke/TestStableDouble$DefaultStaticValue
     6.5   *           java/lang/invoke/TestStableDouble$ObjectArrayLowerDim2
     6.6   *
     6.7 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
     6.8 + * @run main/othervm -Xbootclasspath/a:.
     6.9   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    6.10 - *                   -server -XX:-TieredCompilation
    6.11 + *                   -XX:-TieredCompilation
    6.12   *                   -XX:+FoldStableValues
    6.13   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    6.14   *                   java.lang.invoke.TestStableDouble
    6.15 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    6.16 + * @run main/othervm -Xbootclasspath/a:.
    6.17   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    6.18 - *                   -server -XX:-TieredCompilation
    6.19 + *                   -XX:-TieredCompilation
    6.20   *                   -XX:-FoldStableValues
    6.21   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    6.22   *                   java.lang.invoke.TestStableDouble
    6.23   *
    6.24 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    6.25 + * @run main/othervm -Xbootclasspath/a:.
    6.26   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    6.27 - *                   -server -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    6.28 + *                   -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    6.29   *                   -XX:+FoldStableValues
    6.30   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    6.31   *                   java.lang.invoke.TestStableDouble
    6.32 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    6.33 + * @run main/othervm -Xbootclasspath/a:.
    6.34   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    6.35 - *                   -server -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    6.36 + *                   -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    6.37   *                   -XX:-FoldStableValues
    6.38   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    6.39   *                   java.lang.invoke.TestStableDouble
    6.40   *
    6.41 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    6.42 - *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    6.43 - *                   -client -XX:-TieredCompilation
    6.44 - *                   -XX:+FoldStableValues
    6.45 - *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    6.46 - *                   java.lang.invoke.TestStableDouble
    6.47 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    6.48 - *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    6.49 - *                   -client -XX:-TieredCompilation
    6.50 - *                   -XX:-FoldStableValues
    6.51 - *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    6.52 - *                   java.lang.invoke.TestStableDouble
    6.53   */
    6.54  package java.lang.invoke;
    6.55

     7.1 --- a/test/compiler/stable/TestStableFloat.java	Fri Apr 24 09:47:07 2015 +0200
     7.2 +++ b/test/compiler/stable/TestStableFloat.java	Thu Apr 23 13:02:32 2015 +0300
     7.3 @@ -53,44 +53,32 @@
     7.4   *           java/lang/invoke/TestStableFloat$DefaultStaticValue
     7.5   *           java/lang/invoke/TestStableFloat$ObjectArrayLowerDim2
     7.6   *
     7.7 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
     7.8 + * @run main/othervm -Xbootclasspath/a:.
     7.9   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    7.10 - *                   -server -XX:-TieredCompilation
    7.11 + *                   -XX:-TieredCompilation
    7.12   *                   -XX:+FoldStableValues
    7.13   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    7.14   *                   java.lang.invoke.TestStableFloat
    7.15 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    7.16 + * @run main/othervm -Xbootclasspath/a:.
    7.17   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    7.18 - *                   -server -XX:-TieredCompilation
    7.19 + *                   -XX:-TieredCompilation
    7.20   *                   -XX:-FoldStableValues
    7.21   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    7.22   *                   java.lang.invoke.TestStableFloat
    7.23   *
    7.24 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    7.25 + * @run main/othervm -Xbootclasspath/a:.
    7.26   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    7.27 - *                   -server -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    7.28 + *                   -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    7.29   *                   -XX:+FoldStableValues
    7.30   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    7.31   *                   java.lang.invoke.TestStableFloat
    7.32 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    7.33 + * @run main/othervm -Xbootclasspath/a:.
    7.34   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    7.35 - *                   -server -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    7.36 + *                   -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    7.37   *                   -XX:-FoldStableValues
    7.38   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    7.39   *                   java.lang.invoke.TestStableFloat
    7.40   *
    7.41 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    7.42 - *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    7.43 - *                   -client -XX:-TieredCompilation
    7.44 - *                   -XX:+FoldStableValues
    7.45 - *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    7.46 - *                   java.lang.invoke.TestStableFloat
    7.47 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    7.48 - *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    7.49 - *                   -client -XX:-TieredCompilation
    7.50 - *                   -XX:-FoldStableValues
    7.51 - *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    7.52 - *                   java.lang.invoke.TestStableFloat
    7.53   */
    7.54  package java.lang.invoke;
    7.55

     8.1 --- a/test/compiler/stable/TestStableInt.java	Fri Apr 24 09:47:07 2015 +0200
     8.2 +++ b/test/compiler/stable/TestStableInt.java	Thu Apr 23 13:02:32 2015 +0300
     8.3 @@ -53,44 +53,32 @@
     8.4   *           java/lang/invoke/TestStableInt$DefaultStaticValue
     8.5   *           java/lang/invoke/TestStableInt$ObjectArrayLowerDim2
     8.6   *
     8.7 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
     8.8 + * @run main/othervm -Xbootclasspath/a:.
     8.9   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    8.10 - *                   -server -XX:-TieredCompilation
    8.11 + *                   -XX:-TieredCompilation
    8.12   *                   -XX:+FoldStableValues
    8.13   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    8.14   *                   java.lang.invoke.TestStableInt
    8.15 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    8.16 + * @run main/othervm -Xbootclasspath/a:.
    8.17   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    8.18 - *                   -server -XX:-TieredCompilation
    8.19 + *                   -XX:-TieredCompilation
    8.20   *                   -XX:-FoldStableValues
    8.21   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    8.22   *                   java.lang.invoke.TestStableInt
    8.23   *
    8.24 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    8.25 + * @run main/othervm -Xbootclasspath/a:.
    8.26   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    8.27 - *                   -server -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    8.28 + *                   -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    8.29   *                   -XX:+FoldStableValues
    8.30   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    8.31   *                   java.lang.invoke.TestStableInt
    8.32 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    8.33 + * @run main/othervm -Xbootclasspath/a:.
    8.34   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    8.35 - *                   -server -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    8.36 + *                   -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    8.37   *                   -XX:-FoldStableValues
    8.38   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    8.39   *                   java.lang.invoke.TestStableInt
    8.40   *
    8.41 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    8.42 - *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    8.43 - *                   -client -XX:-TieredCompilation
    8.44 - *                   -XX:+FoldStableValues
    8.45 - *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    8.46 - *                   java.lang.invoke.TestStableInt
    8.47 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    8.48 - *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    8.49 - *                   -client -XX:-TieredCompilation
    8.50 - *                   -XX:-FoldStableValues
    8.51 - *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    8.52 - *                   java.lang.invoke.TestStableInt
    8.53   */
    8.54  package java.lang.invoke;
    8.55

     9.1 --- a/test/compiler/stable/TestStableLong.java	Fri Apr 24 09:47:07 2015 +0200
     9.2 +++ b/test/compiler/stable/TestStableLong.java	Thu Apr 23 13:02:32 2015 +0300
     9.3 @@ -53,44 +53,32 @@
     9.4   *           java/lang/invoke/TestStableLong$DefaultStaticValue
     9.5   *           java/lang/invoke/TestStableLong$ObjectArrayLowerDim2
     9.6   *
     9.7 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
     9.8 + * @run main/othervm -Xbootclasspath/a:.
     9.9   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    9.10 - *                   -server -XX:-TieredCompilation
    9.11 + *                   -XX:-TieredCompilation
    9.12   *                   -XX:+FoldStableValues
    9.13   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    9.14   *                   java.lang.invoke.TestStableLong
    9.15 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    9.16 + * @run main/othervm -Xbootclasspath/a:.
    9.17   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    9.18 - *                   -server -XX:-TieredCompilation
    9.19 + *                   -XX:-TieredCompilation
    9.20   *                   -XX:-FoldStableValues
    9.21   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    9.22   *                   java.lang.invoke.TestStableLong
    9.23   *
    9.24 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    9.25 + * @run main/othervm -Xbootclasspath/a:.
    9.26   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    9.27 - *                   -server -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    9.28 + *                   -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    9.29   *                   -XX:+FoldStableValues
    9.30   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    9.31   *                   java.lang.invoke.TestStableLong
    9.32 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    9.33 + * @run main/othervm -Xbootclasspath/a:.
    9.34   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    9.35 - *                   -server -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    9.36 + *                   -XX:+TieredCompilation -XX:TieredStopAtLevel=1
    9.37   *                   -XX:-FoldStableValues
    9.38   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    9.39   *                   java.lang.invoke.TestStableLong
    9.40   *
    9.41 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    9.42 - *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    9.43 - *                   -client -XX:-TieredCompilation
    9.44 - *                   -XX:+FoldStableValues
    9.45 - *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    9.46 - *                   java.lang.invoke.TestStableLong
    9.47 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    9.48 - *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
    9.49 - *                   -client -XX:-TieredCompilation
    9.50 - *                   -XX:-FoldStableValues
    9.51 - *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
    9.52 - *                   java.lang.invoke.TestStableLong
    9.53   */
    9.54  package java.lang.invoke;
    9.55

    10.1 --- a/test/compiler/stable/TestStableObject.java	Fri Apr 24 09:47:07 2015 +0200
    10.2 +++ b/test/compiler/stable/TestStableObject.java	Thu Apr 23 13:02:32 2015 +0300
    10.3 @@ -54,44 +54,32 @@
    10.4   *           java/lang/invoke/TestStableObject$DefaultStaticValue
    10.5   *           java/lang/invoke/TestStableObject$ObjectArrayLowerDim2
    10.6   *
    10.7 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    10.8 + * @run main/othervm -Xbootclasspath/a:.
    10.9   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
   10.10 - *                   -server -XX:-TieredCompilation
   10.11 + *                   -XX:-TieredCompilation
   10.12   *                   -XX:+FoldStableValues
   10.13   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
   10.14   *                   java.lang.invoke.TestStableObject
   10.15 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
   10.16 + * @run main/othervm -Xbootclasspath/a:.
   10.17   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
   10.18 - *                   -server -XX:-TieredCompilation
   10.19 + *                   -XX:-TieredCompilation
   10.20   *                   -XX:-FoldStableValues
   10.21   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
   10.22   *                   java.lang.invoke.TestStableObject
   10.23   *
   10.24 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
   10.25 + * @run main/othervm -Xbootclasspath/a:.
   10.26   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
   10.27 - *                   -server -XX:+TieredCompilation -XX:TieredStopAtLevel=1
   10.28 + *                   -XX:+TieredCompilation -XX:TieredStopAtLevel=1
   10.29   *                   -XX:+FoldStableValues
   10.30   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
   10.31   *                   java.lang.invoke.TestStableObject
   10.32 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
   10.33 + * @run main/othervm -Xbootclasspath/a:.
   10.34   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
   10.35 - *                   -server -XX:+TieredCompilation -XX:TieredStopAtLevel=1
   10.36 + *                   -XX:+TieredCompilation -XX:TieredStopAtLevel=1
   10.37   *                   -XX:-FoldStableValues
   10.38   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
   10.39   *                   java.lang.invoke.TestStableObject
   10.40   *
   10.41 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
   10.42 - *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
   10.43 - *                   -client -XX:-TieredCompilation
   10.44 - *                   -XX:+FoldStableValues
   10.45 - *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
   10.46 - *                   java.lang.invoke.TestStableObject
   10.47 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
   10.48 - *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
   10.49 - *                   -client -XX:-TieredCompilation
   10.50 - *                   -XX:-FoldStableValues
   10.51 - *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
   10.52 - *                   java.lang.invoke.TestStableObject
   10.53   */
   10.54  package java.lang.invoke;
   10.55

    11.1 --- a/test/compiler/stable/TestStableShort.java	Fri Apr 24 09:47:07 2015 +0200
    11.2 +++ b/test/compiler/stable/TestStableShort.java	Thu Apr 23 13:02:32 2015 +0300
    11.3 @@ -53,44 +53,32 @@
    11.4   *           java/lang/invoke/TestStableShort$DefaultStaticValue
    11.5   *           java/lang/invoke/TestStableShort$ObjectArrayLowerDim2
    11.6   *
    11.7 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
    11.8 + * @run main/othervm -Xbootclasspath/a:.
    11.9   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
   11.10 - *                   -server -XX:-TieredCompilation
   11.11 + *                   -XX:-TieredCompilation
   11.12   *                   -XX:+FoldStableValues
   11.13   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
   11.14   *                   java.lang.invoke.TestStableShort
   11.15 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
   11.16 + * @run main/othervm -Xbootclasspath/a:.
   11.17   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
   11.18 - *                   -server -XX:-TieredCompilation
   11.19 + *                   -XX:-TieredCompilation
   11.20   *                   -XX:-FoldStableValues
   11.21   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
   11.22   *                   java.lang.invoke.TestStableShort
   11.23   *
   11.24 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
   11.25 + * @run main/othervm -Xbootclasspath/a:.
   11.26   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
   11.27 - *                   -server -XX:+TieredCompilation -XX:TieredStopAtLevel=1
   11.28 + *                   -XX:+TieredCompilation -XX:TieredStopAtLevel=1
   11.29   *                   -XX:+FoldStableValues
   11.30   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
   11.31   *                   java.lang.invoke.TestStableShort
   11.32 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
   11.33 + * @run main/othervm -Xbootclasspath/a:.
   11.34   *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
   11.35 - *                   -server -XX:+TieredCompilation -XX:TieredStopAtLevel=1
   11.36 + *                   -XX:+TieredCompilation -XX:TieredStopAtLevel=1
   11.37   *                   -XX:-FoldStableValues
   11.38   *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
   11.39   *                   java.lang.invoke.TestStableShort
   11.40   *
   11.41 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
   11.42 - *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
   11.43 - *                   -client -XX:-TieredCompilation
   11.44 - *                   -XX:+FoldStableValues
   11.45 - *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
   11.46 - *                   java.lang.invoke.TestStableShort
   11.47 - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
   11.48 - *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
   11.49 - *                   -client -XX:-TieredCompilation
   11.50 - *                   -XX:-FoldStableValues
   11.51 - *                   -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
   11.52 - *                   java.lang.invoke.TestStableShort
   11.53   */
   11.54  package java.lang.invoke;
   11.55

    12.1 --- a/test/compiler/uncommontrap/UncommonTrapStackBang.java	Fri Apr 24 09:47:07 2015 +0200
    12.2 +++ b/test/compiler/uncommontrap/UncommonTrapStackBang.java	Thu Apr 23 13:02:32 2015 +0300
    12.3 @@ -1,5 +1,5 @@
    12.4  /*
    12.5 - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
    12.6 + * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
    12.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    12.8   *
    12.9   * This code is free software; you can redistribute it and/or modify it
   12.10 @@ -27,9 +27,7 @@
   12.11   * @bug 8026775
   12.12   * @summary Uncommon trap blob did not bang all the stack shadow pages
   12.13   *
   12.14 - * @run main/othervm -server -XX:+IgnoreUnrecognizedVMOptions -XX:+TieredCompilation UncommonTrapStackBang
   12.15 - * @run main/othervm -server -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation UncommonTrapStackBang
   12.16 - *
   12.17 + * @run main/othervm UncommonTrapStackBang
   12.18   *
   12.19   * Note: This test does not reproduce the problem with absolute
   12.20   * certainty. Empirically the bug reproduces on Windows some 80+% of

test/compiler/codegen/LoadWithMask.java		file \| annotate \| diff \| comparison \| revisions
test/compiler/codegen/LoadWithMask2.java		file \| annotate \| diff \| comparison \| revisions
test/compiler/stable/TestStableBoolean.java		file \| annotate \| diff \| comparison \| revisions
test/compiler/stable/TestStableByte.java		file \| annotate \| diff \| comparison \| revisions
test/compiler/stable/TestStableChar.java		file \| annotate \| diff \| comparison \| revisions
test/compiler/stable/TestStableDouble.java		file \| annotate \| diff \| comparison \| revisions
test/compiler/stable/TestStableFloat.java		file \| annotate \| diff \| comparison \| revisions
test/compiler/stable/TestStableInt.java		file \| annotate \| diff \| comparison \| revisions
test/compiler/stable/TestStableLong.java		file \| annotate \| diff \| comparison \| revisions
test/compiler/stable/TestStableObject.java		file \| annotate \| diff \| comparison \| revisions
test/compiler/stable/TestStableShort.java		file \| annotate \| diff \| comparison \| revisions
test/compiler/uncommontrap/UncommonTrapStackBang.java		file \| annotate \| diff \| comparison \| revisions

Mercurial > jdk8-mips64-public > hotspot / changeset

changeset

8038098: [TESTBUG] remove explicit set build flavor from hotspot/test/compiler/* tests