# HG changeset patch
# User cjplummer
# Date 1417823041 28800
# Node ID d2c87a8d2f37a894eaee5392880e1954d50d3e8c
# Parent  03e0e38915720fb5781317947d7c24fa814e9431
8066507: JPRT is not capable of running jtreg tests located jdk/test
Summary: Fixed by copying same fix already in place in hotspot/test/Makefile.
Reviewed-by: dholmes, tbell

diff -r 03e0e3891572 -r d2c87a8d2f37 jdk/test/Makefile
--- a/jdk/test/Makefile	Wed Dec 10 18:31:24 2014 +0100
+++ b/jdk/test/Makefile	Fri Dec 05 15:44:01 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