From 0c2ad37f74e14410164d53f2df7024c6d7e638f1 Mon Sep 17 00:00:00 2001 From: Steve Streeting Date: Tue, 20 Oct 2015 15:27:47 +0100 Subject: [PATCH] Rename IS_MINGW_CYGWIN to IS_WINDOWS, simpler --- test/testenv.sh | 4 ++-- test/testhelpers.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/testenv.sh b/test/testenv.sh index dc0faf87..918c0602 100644 --- a/test/testenv.sh +++ b/test/testenv.sh @@ -50,10 +50,10 @@ TESTHOME="$REMOTEDIR/home" GIT_CONFIG_NOSYSTEM=1 UNAME=$(uname -s) -IS_MINGW_CYGWIN=0 +IS_WINDOWS=0 if [[ $UNAME == MINGW* || $UNAME == CYGWIN* ]] then - IS_MINGW_CYGWIN=1 + IS_WINDOWS=1 fi export CREDSDIR diff --git a/test/testhelpers.sh b/test/testhelpers.sh index 4d9b3092..d89f2df6 100644 --- a/test/testhelpers.sh +++ b/test/testhelpers.sh @@ -387,7 +387,7 @@ get_date() { # Needed to match generic built paths in test scripts to native paths generated from Go native_path() { local arg=$1 - if [ $IS_MINGW_CYGWIN == "1" ]; then + if [ $IS_WINDOWS == "1" ]; then # Use params form to avoid interpreting any '\' characters printf '%s' "$(cygpath -w $arg)" else