From f0f5ef65f0fc6c74b3024a4f8da84b0c78e4ab33 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Mon, 27 Nov 2017 19:14:42 +0100
Subject: [PATCH] 8179555: make run-test should always use a fresh, clean
 JTwork directory

Reviewed-by: erikj
---
 make/RunTests.gmk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 269f5d58ddb..ac4f685c2e3 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -411,7 +411,10 @@ define SetupRunJtregTestBody
     $1_JTREG_BASIC_OPTIONS += -cpa:$$(JIB_JAR)
   endif
 
-  run-test-$1:
+  clean-workdir-$1:
+	$$(RM) -r $$($1_TEST_SUPPORT_DIR)
+
+  run-test-$1: clean-workdir-$1
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))