# HG changeset patch
# User erikj
# Date 1552417921 25200
# Node ID d9bcf74fc56ab8fd141f90129d2686c66a279167
# Parent  6a15e411595ed5257bf7323cfb6e134ba547aaf1
8220529: JDK-8220383 broke test image build
Reviewed-by: tbell

diff -r 6a15e411595e -r d9bcf74fc56a make/test/JtregNativeHotspot.gmk
--- a/make/test/JtregNativeHotspot.gmk	Tue Mar 12 14:56:25 2019 -0400
+++ b/make/test/JtregNativeHotspot.gmk	Tue Mar 12 12:12:01 2019 -0700
@@ -1541,8 +1541,9 @@
 $(eval $(call SetupCopyFiles,COPY_HOTSPOT_JTREG_NATIVE, \
     SRC := $(BUILD_HOTSPOT_JTREG_OUTPUT_DIR), \
     DEST := $(TEST_IMAGE_DIR)/hotspot/jtreg/native, \
-    FILES := $(BUILD_HOTSPOT_JTREG_LIBRARIES) $(BUILD_HOTSPOT_JTREG_EXECUTABLES), \
-    FLATTEN := true))
+    FILES := $(wildcard $(addprefix $(BUILD_HOTSPOT_JTREG_OUTPUT_DIR), /bin/* /lib/*)), \
+    FLATTEN := true, \
+))
 
 test-image-hotspot-jtreg-native: $(COPY_HOTSPOT_JTREG_NATIVE)
 
diff -r 6a15e411595e -r d9bcf74fc56a make/test/JtregNativeJdk.gmk
--- a/make/test/JtregNativeJdk.gmk	Tue Mar 12 14:56:25 2019 -0400
+++ b/make/test/JtregNativeJdk.gmk	Tue Mar 12 12:12:01 2019 -0700
@@ -110,8 +110,9 @@
 $(eval $(call SetupCopyFiles,COPY_JDK_JTREG_NATIVE, \
     SRC := $(BUILD_JDK_JTREG_OUTPUT_DIR), \
     DEST := $(TEST_IMAGE_DIR)/jdk/jtreg/native, \
-    FILES := $(BUILD_JDK_JTREG_LIBRARIES) $(BUILD_JDK_JTREG_EXECUTABLES), \
-    FLATTEN := true))
+    FILES := $(wildcard $(addprefix $(BUILD_JDK_JTREG_OUTPUT_DIR), /bin/* /lib/*)), \
+    FLATTEN := true, \
+))
 
 test-image-jdk-jtreg-native: $(COPY_JDK_JTREG_NATIVE)