Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: make sure for both cygwin and msys cygpath is used #343

Closed
wants to merge 4 commits into from
Closed

feat: make sure for both cygwin and msys cygpath is used #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78226c5
feat: make sure for both cygwin and msys cygpath is used
zdtsw Aug 10, 2022
ce21a12
debug:
zdtsw Aug 11, 2022
f732f3d
test strip()
zdtsw Aug 12, 2022
70cf0b5
update: remove "info" debug
zdtsw Aug 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/moveDmp.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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');
Expand Down
7 changes: 4 additions & 3 deletions settings.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
#######################################
Expand Down