Merge
authorsherman
Wed, 10 Dec 2014 14:15:31 -0800
changeset 27956 7e6ab24dd745
parent 27955 8d98ed07bc28 (current diff)
parent 27954 d2c87a8d2f37 (diff)
child 27957 24b4e6082f19
Merge
--- 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