stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Christian Tornqvist 2015-04-17 23:55:04 +00:00
commit 1314bfbc94
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hotspot/test/Makefile
View File

@ -279,6 +279,8 @@ endif
# Default JTREG to run # Default JTREG to run
JTREG = $(JT_HOME)/bin/jtreg JTREG = $(JT_HOME)/bin/jtreg
# Use agent mode
JTREG_BASIC_OPTIONS += -agentvm
# Only run automatic tests # Only run automatic tests
JTREG_BASIC_OPTIONS += -a JTREG_BASIC_OPTIONS += -a
# Report details on all failed or error tests, times too # Report details on all failed or error tests, times too

2
hotspot/test/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java
View File

@ -30,7 +30,7 @@
* java.instrument * java.instrument
* java.management * java.management
* @compile -XDignore.symbol.file RedefineMethodUsedByMultipleMethodHandles.java * @compile -XDignore.symbol.file RedefineMethodUsedByMultipleMethodHandles.java
* @run main RedefineMethodUsedByMultipleMethodHandles * @run main/othervm RedefineMethodUsedByMultipleMethodHandles
*/ */
import java.io.*; import java.io.*;

2
hotspot/test/compiler/uncommontrap/TestUnstableIfTrap.java
View File

@ -69,7 +69,7 @@ import uncommontrap.Verifier;
* -XX:CompileCommand=compileonly,UnstableIfExecutable.test * -XX:CompileCommand=compileonly,UnstableIfExecutable.test
* -XX:LogFile=never_taken_fired.xml * -XX:LogFile=never_taken_fired.xml
* TestUnstableIfTrap NEVER_TAKEN true * TestUnstableIfTrap NEVER_TAKEN true
* @run main uncommontrap.Verifier always_taken_not_fired.xml * @run main/othervm uncommontrap.Verifier always_taken_not_fired.xml
* always_taken_fired.xml * always_taken_fired.xml
* never_taken_not_fired.xml * never_taken_not_fired.xml
* never_taken_fired.xml * never_taken_fired.xml

1
hotspot/test/sanity/WhiteBox.java → hotspot/test/sanity/MismatchedWhiteBox/WhiteBox.java
View File

@ -30,7 +30,6 @@
* @compile WhiteBox.java * @compile WhiteBox.java
* @run main ClassFileInstaller sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI sun.hotspot.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI sun.hotspot.WhiteBox
* @clean sun.hotspot.WhiteBox
*/ */
package sun.hotspot; package sun.hotspot;

3
hotspot/test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java
View File

@ -139,6 +139,9 @@ public final class ProcessTools {
args.add(javapath); args.add(javapath);
Collections.addAll(args, getPlatformSpecificVMArgs()); Collections.addAll(args, getPlatformSpecificVMArgs());
args.add("-cp");
args.add(System.getProperty("java.class.path"));
if (addTestVmAndJavaOptions) { if (addTestVmAndJavaOptions) {
Collections.addAll(args, Utils.getTestJavaOpts()); Collections.addAll(args, Utils.getTestJavaOpts());
} }