From 5e051287af24692b7e08f5514d82859076310105 Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Tue, 24 Nov 2015 21:03:39 +0300 Subject: [PATCH] 8142967: [TESTBUG] Compiler control tests get NullPointerException Fix incoorect build jtreg tags Reviewed-by: iignatyev, neliasso --- hotspot/test/compiler/compilercontrol/InlineMatcherTest.java | 3 ++- .../TestCompilerDirectivesCompatibilityBase.java | 2 +- .../TestCompilerDirectivesCompatibilityCommandOff.java | 2 +- .../TestCompilerDirectivesCompatibilityCommandOn.java | 2 +- .../TestCompilerDirectivesCompatibilityFlag.java | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hotspot/test/compiler/compilercontrol/InlineMatcherTest.java b/hotspot/test/compiler/compilercontrol/InlineMatcherTest.java index 871f264baea..3dc057c448d 100644 --- a/hotspot/test/compiler/compilercontrol/InlineMatcherTest.java +++ b/hotspot/test/compiler/compilercontrol/InlineMatcherTest.java @@ -24,7 +24,8 @@ /* * @test InlineMatcherTest * @bug 8074095 - * @library /testlibrary /../../test/lib + * @library /testlibrary /test/lib + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI InlineMatcherTest diff --git a/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java b/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java index a058b2b65c1..9d01dac3243 100644 --- a/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java +++ b/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java @@ -30,7 +30,7 @@ * java.management * @build jdk.test.lib.* * @build jdk.test.lib.dcmd.* - * @build sun.hotspot.WhiteBox.* + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run testng/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestCompilerDirectivesCompatibilityBase diff --git a/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java b/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java index 91329b1b29c..948b3249356 100644 --- a/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java +++ b/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java @@ -30,7 +30,7 @@ * java.management * @build jdk.test.lib.* * @build jdk.test.lib.dcmd.* - * @build sun.hotspot.WhiteBox.* + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run testng/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions diff --git a/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java b/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java index bddbe6f4e3e..c2f10c8e8ef 100644 --- a/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java +++ b/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java @@ -30,7 +30,7 @@ * java.management * @build jdk.test.lib.* * @build jdk.test.lib.dcmd.* - * @build sun.hotspot.WhiteBox.* + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run testng/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions diff --git a/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java b/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java index 9715b1e4662..2d6da4ad794 100644 --- a/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java +++ b/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java @@ -30,7 +30,7 @@ * java.management * @build jdk.test.lib.* * @build jdk.test.lib.dcmd.* - * @build sun.hotspot.WhiteBox.* + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run testng/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions