test/TestCommon.gmk

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.  Oracle designates this

@@ -122,17 +122,10 @@
          $(ECHO) "$(ABS_PLATFORM_BUILD_ROOT)";  \
        fi)
   PRODUCT_HOME := $(PRODUCT_HOME)
 endif
 
-# Expect JPRT to set JAVA_ARGS (e.g. -server etc.)
-ifdef JAVA_ARGS
-  JAVA_OPTIONS := $(JAVA_ARGS)
-else
-  JAVA_OPTIONS :=
-endif
-
 # Expect JPRT to set JPRT_PRODUCT_ARGS (e.g. -server etc.)
 #   Should be passed into 'java' only.
 #   Could include: -d64 -server -client OR any java option
 ifdef JPRT_PRODUCT_ARGS
   JAVA_ARGS = $(JPRT_PRODUCT_ARGS)

@@ -368,11 +361,11 @@
   JTREG_TEST_OPTIONS += $(JTREG_TESTVM_MEMORY_OPTION)
 endif
 # Give tests access to JT_JAVA, see JDK-8141609
 JTREG_BASIC_OPTIONS += -e:JDK8_HOME=${JT_JAVA}
 # Set other vm and test options
-JTREG_TEST_OPTIONS += $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_OPTIONS:%=-vmoption:%) $(JAVA_VM_ARGS:%=-vmoption:%)
+JTREG_TEST_OPTIONS += $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%)
 
 ifeq ($(IGNORE_MARKED_TESTS), true)
   # Option to tell jtreg to not run tests marked with "ignore"
   ifeq ($(PLATFORM), windows)
     JTREG_KEY_OPTION = -k:!ignore