hotspot/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.
--- 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.
*** 146,155 ****
--- 146,167 ----
  JAVA_OPTIONS = 
  ifdef JAVA_ARGS
    JAVA_OPTIONS = $(JAVA_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
+ ifndef TESTNATIVE_DIR
+   ifdef TEST_IMAGE_DIR
+     TESTNATIVE_DIR = $(TEST_IMAGE_DIR)
+   else
+     TESTNATIVE_DIR = $(JPRT_TESTNATIVE_PATH)
+   endif
+ endif
+ 
  # Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results)
  ARCHIVE_BUNDLE = $(ABS_TEST_OUTPUT_DIR)/ARCHIVE_BUNDLE.zip
  ifdef JPRT_ARCHIVE_BUNDLE
    ARCHIVE_BUNDLE = $(JPRT_ARCHIVE_BUNDLE)
  endif
*** 301,310 ****
--- 313,323 ----
              $(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)")                \
+               -nativepath:$(shell $(GETMIXEDPATH) "$(TESTNATIVE_DIR)/hotspot/jtreg/native") \
                $(JTREG_EXCLUSIONS)                                            \
                $(JTREG_TEST_OPTIONS)                                          \
                $(TEST_SELECTION)                                              \
            ) ;                                                                \
            $(BUNDLE_UP_AND_EXIT)                                              \