changeset 54083:d9bcf74fc56a

8220529: JDK-8220383 broke test image build Reviewed-by: tbell
author erikj
date Tue, 12 Mar 2019 12:12:01 -0700
parents 6a15e411595e
children 84f10bbf993f
files make/test/JtregNativeHotspot.gmk make/test/JtregNativeJdk.gmk
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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)
 
--- 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)