changeset 1735:a0d37d08c989

8160505: Automated test runs fail in nashorn because TEST_IMAGE_DIR is set by jib Reviewed-by: erikj, sundar
author tbell
date Wed, 29 Jun 2016 07:35:59 -0700
parents bf76248bbe51
children ee90c69a1840
files test/Makefile
diffstat 1 files changed, 0 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/test/Makefile	Tue Jun 28 15:17:51 2016 +0200
+++ b/test/Makefile	Wed Jun 29 07:35:59 2016 -0700
@@ -118,19 +118,6 @@
   JAVA_VM_ARGS = $(JPRT_PRODUCT_VM_ARGS)
 endif
 
-# jtreg -nativepath <dir>
-#
-# Local make tests will be TEST_IMAGE_DIR and JPRT with jprt.use.reg.test.bundle=true
-# should be JPRT_TESTNATIVE_PATH
-ifdef TEST_IMAGE_DIR
-  TESTNATIVE_DIR = $(TEST_IMAGE_DIR)
-else ifdef JPRT_TESTNATIVE_PATH
-  TESTNATIVE_DIR = $(JPRT_TESTNATIVE_PATH)
-endif
-ifdef TESTNATIVE_DIR
-  JTREG_NATIVE_PATH = -nativepath:$(shell $(GETMIXEDPATH) "$(TESTNATIVE_DIR)/nashorn/jtreg/native")
-endif
-
 # jtreg failure handler config
 ifeq ($(FAILURE_HANDLER_DIR), )
   ifneq ($(TESTNATIVE_DIR), )