test/Makefile

@@ -33,10 +33,11 @@
 # This makefile depends on the availability of sibling directories.
 LANGTOOLS_DIR=$(TOPDIR)/langtools
 JDK_DIR=$(TOPDIR)/jdk
 JAXP_DIR=$(TOPDIR)/jaxp
 HOTSPOT_DIR=$(TOPDIR)/hotspot
+NASHORN_DIR=$(TOPDIR)/nashorn
 
 # Macro to run a test target in a subdir
 define SUBDIR_TEST # subdirectory target
 if [ -d $1 ] ; then \
   if [ -r $1/test/Makefile ] ; then \

@@ -55,10 +56,18 @@
 default: jdk_core langtools_jtreg jaxp_all
 
 # All testing
 all: jdk_all langtools_all jaxp_all
 
+# Tiered testing
+# TODO: Include full set of repos (jaxp, nashorn, jdk, langtools) in each tier.
+tier1: jaxp_tier1 nashorn_tier1
+
+tier2: jaxp_tier2 nashorn_tier2
+
+tier3: jdk_tier3 langtools_tier3 jaxp_tier3 nashorn_tier3
+
 # Test targets
 langtools_% :
         @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@))
 
 jdk_% core_%s svc_%:

@@ -68,10 +77,13 @@
         @$(NO_STOPPING)$(call SUBDIR_TEST, $(JAXP_DIR), TEST="$@" $@)
 
 hotspot_%:
         @$(NO_STOPPING)$(call SUBDIR_TEST, $(HOTSPOT_DIR), TEST="$@" $@)
 
+nashorn_%:
+        @$(NO_STOPPING)$(call SUBDIR_TEST, $(NASHORN_DIR), TEST="$@" $@)
+
 #
 # jtreg_tests
 #
 # Invocation:
 #