changeset 53224:57d299cdd068

8213005: Missing symbols in hs_err files on Windows after JDK-8212028 Reviewed-by: ctornqvi
author erikj
date Thu, 25 Oct 2018 16:47:14 -0700
parents bd8c721954a4
children 26207007d234
files make/RunTests.gmk make/RunTestsPrebuiltSpec.gmk
diffstat 2 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/make/RunTests.gmk	Thu Oct 25 19:12:39 2018 -0400
+++ b/make/RunTests.gmk	Thu Oct 25 16:47:14 2018 -0700
@@ -65,10 +65,14 @@
   ifndef _NT_SYMBOL_PATH
     # Can't use PathList here as it adds quotes around the value.
     _NT_SYMBOL_PATH := \
-        $(subst $(SPACE),;, $(foreach p, $(sort $(dir $(wildcard \
-        $(addprefix $(SYMBOLS_IMAGE_DIR)/bin/, *.pdb */*.pdb)))), $(call FixPath, $p)))
+        $(subst $(SPACE),;,$(strip \
+            $(foreach p, $(sort $(dir $(wildcard \
+                $(addprefix $(SYMBOLS_IMAGE_DIR)/bin/, *.pdb */*.pdb)))), \
+              $(call FixPath, $p) \
+            ) \
+        ))
     export _NT_SYMBOL_PATH
-    $(info _NT_SYMBOL_PATH $(_NT_SYMBOL_PATH))
+    $(info _NT_SYMBOL_PATH=$(_NT_SYMBOL_PATH))
   endif
 endif
 
--- a/make/RunTestsPrebuiltSpec.gmk	Thu Oct 25 19:12:39 2018 -0400
+++ b/make/RunTestsPrebuiltSpec.gmk	Thu Oct 25 16:47:14 2018 -0700
@@ -182,3 +182,7 @@
   SED := gsed
   TAR := gtar
 endif
+
+ifeq ($(OPENJDK_BUILD_OS), windows)
+  CYGPATH := cygpath
+endif