Mercurial > hg > truffle
changeset 8684:7369298bec7e
7115383: TEST_BUG: some jtreg tests fail because they explicitly specify -server option
Summary: Small changes to hotspot tests to remove "-server" and replace with ${TESTVMOPTS}
Reviewed-by: kvn
| author | collins |
|---|---|
| date | Wed, 27 Feb 2013 20:36:14 -0800 |
| parents | be1fbee20765 |
| children | 5cf033ff06c4 |
| files | test/compiler/6431242/Test.java test/compiler/6589834/Test_ia32.java test/compiler/6636138/Test1.java test/compiler/6636138/Test2.java test/compiler/6795161/Test.java test/compiler/6946040/TestCharShortByteSwap.java test/compiler/7068051/Test7068051.sh test/compiler/8000805/Test8000805.java |
| diffstat | 8 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/test/compiler/6431242/Test.java Fri Feb 22 10:12:00 2013 -0800 +++ b/test/compiler/6431242/Test.java Wed Feb 27 20:36:14 2013 -0800 @@ -25,7 +25,7 @@ /* * @test * @bug 6431242 - * @run main/othervm -server -XX:+PrintCompilation Test + * @run main Test */ public class Test{
--- a/test/compiler/6589834/Test_ia32.java Fri Feb 22 10:12:00 2013 -0800 +++ b/test/compiler/6589834/Test_ia32.java Wed Feb 27 20:36:14 2013 -0800 @@ -26,7 +26,7 @@ * @bug 6589834 * @summary deoptimization problem with -XX:+DeoptimizeALot * - * @run main/othervm -server Test_ia32 + * @run main Test_ia32 */ /***************************************************************************************
--- a/test/compiler/6636138/Test1.java Fri Feb 22 10:12:00 2013 -0800 +++ b/test/compiler/6636138/Test1.java Wed Feb 27 20:36:14 2013 -0800 @@ -26,7 +26,7 @@ * @bug 6636138 * @summary SuperWord::co_locate_pack(Node_List* p) generates memory graph that leads to memory order violation. * - * @run main/othervm -server -Xbatch -XX:CompileOnly=Test1.init Test1 + * @run main/othervm -Xbatch -XX:CompileOnly=Test1.init Test1 */ public class Test1 {
--- a/test/compiler/6636138/Test2.java Fri Feb 22 10:12:00 2013 -0800 +++ b/test/compiler/6636138/Test2.java Wed Feb 27 20:36:14 2013 -0800 @@ -26,7 +26,7 @@ * @bug 6636138 * @summary SuperWord::co_locate_pack(Node_List* p) generates memory graph that leads to memory order violation. * - * @run main/othervm -server -Xbatch -XX:CompileOnly=Test2.shift Test2 + * @run main/othervm -Xbatch -XX:CompileOnly=Test2.shift Test2 */ public class Test2 {
--- a/test/compiler/6795161/Test.java Fri Feb 22 10:12:00 2013 -0800 +++ b/test/compiler/6795161/Test.java Wed Feb 27 20:36:14 2013 -0800 @@ -26,7 +26,7 @@ * @test * @bug 6795161 * @summary Escape analysis leads to data corruption - * @run main/othervm -server -XX:+IgnoreUnrecognizedVMOptions -Xcomp -XX:CompileOnly=Test -XX:+DoEscapeAnalysis Test + * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -Xcomp -XX:CompileOnly=Test -XX:+DoEscapeAnalysis Test */ class Test_Class_1 {
--- a/test/compiler/6946040/TestCharShortByteSwap.java Fri Feb 22 10:12:00 2013 -0800 +++ b/test/compiler/6946040/TestCharShortByteSwap.java Wed Feb 27 20:36:14 2013 -0800 @@ -26,7 +26,7 @@ * @test * @bug 6946040 * @summary Tests Character/Short.reverseBytes and their intrinsics implementation in the server compiler - * @run main/othervm -Xbatch -server -XX:CompileOnly=.testChar,.testShort TestCharShortByteSwap + * @run main/othervm -Xbatch -XX:CompileOnly=.testChar,.testShort TestCharShortByteSwap */ // This test must run without any command line arguments.
--- a/test/compiler/7068051/Test7068051.sh Fri Feb 22 10:12:00 2013 -0800 +++ b/test/compiler/7068051/Test7068051.sh Wed Feb 27 20:36:14 2013 -0800 @@ -45,5 +45,5 @@ ${TESTJAVA}/bin/javac -d . Test7068051.java -${TESTJAVA}/bin/java -showversion -Xbatch ${TESTVMOPTS} Test7068051 foo.jar +${TESTJAVA}/bin/java ${TESTVMOPTS} -showversion -Xbatch Test7068051 foo.jar
--- a/test/compiler/8000805/Test8000805.java Fri Feb 22 10:12:00 2013 -0800 +++ b/test/compiler/8000805/Test8000805.java Wed Feb 27 20:36:14 2013 -0800 @@ -26,7 +26,7 @@ * @bug 8000805 * @summary JMM issue: short loads are non-atomic * - * @run main/othervm -server -XX:-TieredCompilation -Xcomp -XX:+PrintCompilation -XX:CompileOnly=Test8000805.loadS2LmaskFF,Test8000805.loadS2Lmask16,Test8000805.loadS2Lmask13,Test8000805.loadUS_signExt,Test8000805.loadB2L_mask8 Test8000805 + * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -Xcomp -XX:+PrintCompilation -XX:CompileOnly=Test8000805.loadS2LmaskFF,Test8000805.loadS2Lmask16,Test8000805.loadS2Lmask13,Test8000805.loadUS_signExt,Test8000805.loadB2L_mask8 Test8000805 */ public class Test8000805 {