# HG changeset patch # User neliasso # Date 1513156881 -3600 # Node ID 39a84de6afd693ff9b8c60bbdae0abb332b4938a # Parent 993b004ab38f4b1c85ae19de5096f3a1aad9d827 8192971: LockCompilationTest fails intermittently Summary: Remove all unnecessary compilations Reviewed-by: kvn, thartmann diff -r 993b004ab38f -r 39a84de6afd6 test/hotspot/jtreg/compiler/whitebox/LockCompilationTest.java --- a/test/hotspot/jtreg/compiler/whitebox/LockCompilationTest.java Tue Dec 12 21:46:06 2017 -0500 +++ b/test/hotspot/jtreg/compiler/whitebox/LockCompilationTest.java Wed Dec 13 10:21:21 2017 +0100 @@ -33,6 +33,7 @@ * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -XX:-UseCounterDecay + * -XX:CompileCommand=compileonly,*SimpleTestCaseHelper::method * compiler.whitebox.LockCompilationTest */ @@ -46,20 +47,7 @@ // This case waits for 5 seconds and verifies that the method hasn't been // compiled during that time. Only do that for one of the test cases. - // Only compile SimpleTestCaseHelper.method and exclude all other to ensure no - // contention on the compile queue causes problems. - String directive = - "[{ match:\"*SimpleTestCaseHelper.method\", Exclude:false}, " + - " { match:\"*.*\", Exclude:true}]"; - if (WHITE_BOX.addCompilerDirective(directive) != 2) { - throw new RuntimeException("Could not add directive"); - } - try { - CompilerWhiteBoxTest.main(LockCompilationTest::new, new String[] {"METHOD_TEST"}); - } finally { - WHITE_BOX.removeCompilerDirective(2); - } - + CompilerWhiteBoxTest.main(LockCompilationTest::new, new String[] {"METHOD_TEST"}); } private LockCompilationTest(TestCase testCase) {