jdk/test/Makefile

*** 1,7 ****
  #
! # Copyright (c) 1995, 2014, 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
--- 1,7 ----
  #
! # Copyright (c) 1995, 2015, 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
*** 110,119 ****
--- 110,132 ----
  #   Should be passed into anything running the vm (java, javac, javadoc, ...).
  ifdef JPRT_PRODUCT_VM_ARGS
    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)/jdk/jtreg/native")
+ endif
+ 
  # Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results)
  ifdef JPRT_ARCHIVE_BUNDLE
    ARCHIVE_BUNDLE = $(JPRT_ARCHIVE_BUNDLE)
  else
    ARCHIVE_BUNDLE = $(ABS_TEST_OUTPUT_DIR)/ARCHIVE_BUNDLE.zip
*** 311,320 ****
--- 324,334 ----
              $(shell $(GETMIXEDPATH) "$(JTREG)")                              \
                $(JTREG_BASIC_OPTIONS)                                         \
                -r:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTreport")  \
                -w:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTwork")    \
                -jdk:$(shell $(GETMIXEDPATH) "$(PRODUCT_HOME)")                \
+               $(JTREG_NATIVE_PATH)                                           \
                $(JTREG_EXCLUSIONS)                                            \
                $(JTREG_TEST_OPTIONS)                                          \
                $(TEST_SELECTION)                                                    \
            ) ;                                                                \
            $(BUNDLE_UP_AND_EXIT)                                              \