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..9fb9fbd0 100644 --- a/settings.mk +++ b/settings.mk @@ -111,8 +111,10 @@ endif # Environment variable OSTYPE is set to cygwin if running under cygwin. ifndef CYGWIN OSTYPE?=$(shell echo $$OSTYPE) - ifeq ($(OSTYPE),cygwin) - CYGWIN:=1 + ifeq ($(strip $(OSTYPE)), cygwin) + CYGWIN:=1 + else ifeq ($(strip $(OSTYPE)), msys) + CYGWIN:=1 else CYGWIN:=0 endif @@ -223,7 +225,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 #######################################