# HG changeset patch
# User sherman
# Date 1418249731 28800
# Node ID 7e6ab24dd745d36f0b30fbb728dd0aa869dfb704
# Parent  8d98ed07bc286c34ddfec9f47830cf7cd6c0efad# Parent  d2c87a8d2f37a894eaee5392880e1954d50d3e8c
Merge

diff -r 8d98ed07bc28 -r 7e6ab24dd745 jdk/test/Makefile
--- a/jdk/test/Makefile	Wed Dec 10 14:11:05 2014 -0800
+++ b/jdk/test/Makefile	Wed Dec 10 14:15:31 2014 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
+# 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
@@ -258,6 +258,11 @@
 
 # ------------------------------------------------------------------
 
+# When called from JPRT the TESTDIRS variable is set to the jtreg tests to run
+ifdef TESTDIRS
+  TEST_SELECTION = $(TESTDIRS)
+endif
+
 ifdef CONCURRENCY
   EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY)
 endif