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

Jump to bottom

Use Windows paths in tests of mingw-w64 executables #2105

Merged
merged 13 commits into from
Apr 11, 2022
Merged

Use Windows paths in tests of mingw-w64 executables #2105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
92be010
Use Windows paths in tests of mingw executables
mjwoods Sep 3, 2021
64f8cd9
Replace pwd by $PWDCMD in test_common.in
mjwoods Sep 3, 2021
13008f4
Replace pwd by $PWDCMD in d4test_common.sh
mjwoods Sep 3, 2021
14505fb
Replace pwd by $PWDCMD in test_nczarr.sh
mjwoods Sep 3, 2021
02c92a5
Disable bash path conversions in testpathcvt.sh on mingw
mjwoods Sep 3, 2021
9ec281a
Replace pwd by $PWDCMD after test_common.sh is sourced
mjwoods Sep 3, 2021
84af35e
Revert "Use Windows paths in tests of mingw executables"
mjwoods Sep 5, 2021
2fcbf1e
Revert "Replace pwd by $PWDCMD in test_common.in"
mjwoods Sep 5, 2021
d4c55aa
Revert "Replace pwd by $PWDCMD in d4test_common.sh"
mjwoods Sep 5, 2021
a87c57f
Revert "Replace pwd by $PWDCMD in test_nczarr.sh"
mjwoods Sep 5, 2021
2da66c6
Revert "Replace pwd by $PWDCMD after test_common.sh is sourced"
mjwoods Sep 5, 2021
3749328
Use Windows format for pwd in test_common on mingw
mjwoods Sep 5, 2021
c0f319d
Merge branch 'main' into mingw-w64-pwd
WardF Apr 11, 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: 4 additions & 0 deletions ncdump/testpathcvt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi

set -e

# Disable automatic path conversions in MINGW shell:
export MSYS2_ARG_CONV_EXCL='*'

# We need to find the drive letter, if any
DL=`${NCPATHCVT} -c -e / | sed -e 's|/cygdrive/\([a-zA-Z]\)/.*|\1|'`
if test "x$DL" != x ; then
Expand All @@ -13,6 +16,7 @@ if test "x$DL" != x ; then
DL="-d $DLL"
fi


testcase1() {
T="$1"
P="$2"
Expand Down
13 changes: 5 additions & 8 deletions test_common.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,11 @@ if test "x$SETX" = x1 ; then set -x ; fi
# On MINGW, bash and other POSIX utilities use a mounted root directory,
# but executables compiled for Windows do not recognise the mount point.
# Here we ensure that Windows paths are used in tests of Windows executables.
if test "x${FP_ISMSYS}" = xyes || test "x${FP_ISCYGWIN}" = xyes ; then
if test "x${MSYS2_PREFIX}" = x ; then
MSYS2_PREFIX=`cygpath -w '/'`
export MSYS2_PREFIX
fi
fi
if test "x${FP_ISMINGW}" = xyes ; then
alias pwd='pwd -W'

system=`uname`
if test "x${system##MINGW*}" = x; then
alias pwd='pwd -W'

fi

# We assume that TOPSRCDIR and TOPBUILDDIR are defined
Expand Down