Changeset 309 for trunk/openjdk/jdk/test/Makefile

Timestamp:

Feb 13, 2012, 10:07:12 PM (14 years ago)

Author:

dmik

Message:

trunk: Merged in openjdk6 b24 from branches/vendor/oracle.

Location:

trunk/openjdk

Files:

• . (modified) (1 prop)
• jdk/test/Makefile (modified) (3 diffs)

trunk/openjdk/jdk/test/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -355 +355 @@
   USE_JTREG_SAMEVM=false
 endif
-# With samevm, you cannot use -javaoptions?
+# With samevm, you cannot use -javaoptions? (-agentvm is more reliable -samevm)
 ifeq ($(USE_JTREG_SAMEVM),true)
-  JTREG_SAMEVM_OPTION = -samevm
+  #JTREG_SAMEVM_OPTION = -samevm
+  JTREG_SAMEVM_OPTION = -agentvm
   EXTRA_JTREG_OPTIONS += $(JTREG_SAMEVM_OPTION) $(JAVA_ARGS) $(JAVA_ARGS:%=-vmoption:%)
   JTREG_TEST_OPTIONS = $(JAVA_VM_ARGS:%=-vmoption:%)
@@ -544 +545 @@
 JDK_ALL_TARGETS += jdk_tools1
 jdk_tools1: com/sun/jdi
-        $(call RunOthevmBatch)
+        $(call RunOthervmBatch)
 
 # Stable othervm testruns (minus items from PROBLEM_LIST)