From 78226c57c8d856b7dac38462cf21b4053f744d3c Mon Sep 17 00:00:00 2001 From: Wen Zhou Date: Wed, 10 Aug 2022 18:20:48 +0200 Subject: [PATCH 1/4] feat: make sure for both cygwin and msys cygpath is used --- scripts/moveDmp.pl | 4 ++-- settings.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/moveDmp.pl b/scripts/moveDmp.pl index 5bb49ba1..1d845c8e 100644 --- a/scripts/moveDmp.pl +++ b/scripts/moveDmp.pl @@ -36,7 +36,7 @@ if ($path && $testRoot) { my $location = dirname($path); - if($^O =~ /cygwin/) { + if($^O =~ /cygwin/ || $^O =~ /msys/) { my $cygPath = qx(cygpath -u '$path'); $location = dirname($cygPath); } @@ -139,7 +139,7 @@ sub moveTDUMPS { $curCorePath =~ s/\r//g; my $curCoreAbsPath = ""; my $moveLocationAbs = ""; - if($^O =~ /cygwin/) { + if($^O =~ /cygwin/ || $^O =~ /msys/) { $curCoreAbsPath = qx(cygpath -u '$curCorePath'); $moveLocationAbs = $moveLocation; $moveLocation = qx(cygpath -w '$moveLocation'); diff --git a/settings.mk b/settings.mk index 796dd74f..cc71c2d7 100644 --- a/settings.mk +++ b/settings.mk @@ -111,7 +111,7 @@ endif # Environment variable OSTYPE is set to cygwin if running under cygwin. ifndef CYGWIN OSTYPE?=$(shell echo $$OSTYPE) - ifeq ($(OSTYPE),cygwin) + ifeq ($(OSTYPE),$(filter $(OSTYPE), cygwin msys)) CYGWIN:=1 else CYGWIN:=0 From ce21a1206bf3965331a817f51a8d9a26d9c1ecd6 Mon Sep 17 00:00:00 2001 From: Wen Zhou Date: Thu, 11 Aug 2022 16:24:29 +0200 Subject: [PATCH 2/4] debug: --- settings.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/settings.mk b/settings.mk index cc71c2d7..ac0c37c8 100644 --- a/settings.mk +++ b/settings.mk @@ -111,6 +111,7 @@ endif # Environment variable OSTYPE is set to cygwin if running under cygwin. ifndef CYGWIN OSTYPE?=$(shell echo $$OSTYPE) +$(info OSTYPE is $(OSTYPE)) ifeq ($(OSTYPE),$(filter $(OSTYPE), cygwin msys)) CYGWIN:=1 else @@ -118,10 +119,12 @@ ifndef CYGWIN endif endif +$(info CYGWIN is $(CYGWIN)) ifeq ($(CYGWIN),1) TEST_ROOT := $(shell cygpath -w $(TEST_ROOT)) endif TEST_ROOT := $(subst \,/,$(TEST_ROOT)) +$(info TEST_ROOT is $(TEST_ROOT)) ifndef BUILD_ROOT BUILD_ROOT := $(TEST_ROOT)$(D)..$(D)jvmtest From f732f3daca89e29225c06f040f69f01dc2b4be54 Mon Sep 17 00:00:00 2001 From: Wen Zhou Date: Fri, 12 Aug 2022 16:41:39 +0200 Subject: [PATCH 3/4] test strip() --- settings.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/settings.mk b/settings.mk index ac0c37c8..77bd4fad 100644 --- a/settings.mk +++ b/settings.mk @@ -111,9 +111,10 @@ endif # Environment variable OSTYPE is set to cygwin if running under cygwin. ifndef CYGWIN OSTYPE?=$(shell echo $$OSTYPE) -$(info OSTYPE is $(OSTYPE)) - ifeq ($(OSTYPE),$(filter $(OSTYPE), cygwin msys)) - CYGWIN:=1 + ifeq ($(strip $(OSTYPE)), cygwin) + CYGWIN:=1 + else ifeq ($(strip $(OSTYPE)), msys) + CYGWIN:=1 else CYGWIN:=0 endif @@ -226,7 +227,6 @@ TEST_SETUP=@echo "Nothing to be done for setup." ifeq ($(JDK_IMPL), $(filter $(JDK_IMPL),openj9 ibm)) TEST_SETUP=$(JAVA_COMMAND) -Xshareclasses:destroyAll; $(JAVA_COMMAND) -Xshareclasses:groupAccess,destroyAll; echo "cache cleanup done" endif - ####################################### # TEST_TEARDOWN ####################################### From 70cf0b5d8a50682284fa7ca0d395fda57b1c7c3c Mon Sep 17 00:00:00 2001 From: Wen Zhou Date: Sat, 13 Aug 2022 15:20:00 +0200 Subject: [PATCH 4/4] update: remove "info" debug --- settings.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/settings.mk b/settings.mk index 77bd4fad..9fb9fbd0 100644 --- a/settings.mk +++ b/settings.mk @@ -120,12 +120,10 @@ ifndef CYGWIN endif endif -$(info CYGWIN is $(CYGWIN)) ifeq ($(CYGWIN),1) TEST_ROOT := $(shell cygpath -w $(TEST_ROOT)) endif TEST_ROOT := $(subst \,/,$(TEST_ROOT)) -$(info TEST_ROOT is $(TEST_ROOT)) ifndef BUILD_ROOT BUILD_ROOT := $(TEST_ROOT)$(D)..$(D)jvmtest