diff --git a/test/test-migrate-import.sh b/test/test-migrate-import.sh index 230377fc..47205f31 100755 --- a/test/test-migrate-import.sh +++ b/test/test-migrate-import.sh @@ -328,7 +328,7 @@ begin_test "migrate import (prefix include(s))" ( set -e - includes="foo/bar/baz /foo foo/**/baz/a.txt *.txt" + includes="foo${PATH_SEPARATOR}bar${PATH_SEPARATOR}baz ${PATH_SEPARATOR}foo foo${PATH_SEPARATOR}**${PATH_SEPARATOR}baz${PATH_SEPARATOR}a.txt *.txt" for include in $includes; do setup_single_local_branch_deep_trees diff --git a/test/testenv.sh b/test/testenv.sh index 01091f55..97f53041 100644 --- a/test/testenv.sh +++ b/test/testenv.sh @@ -7,6 +7,7 @@ UNAME=$(uname -s) IS_WINDOWS=0 IS_MAC=0 SHASUM="shasum -a 256" +PATH_SEPARATOR="/" if [[ $UNAME == MINGW* || $UNAME == MSYS* || $UNAME == CYGWIN* ]] then @@ -16,6 +17,7 @@ then # script by default, so use sha256sum directly. MacOS on the other hand # does not have sha256sum, so still use shasum as the default. SHASUM="sha256sum" + PATH_SEPARATOR="\\" elif [[ $UNAME == *Darwin* ]] then IS_MAC=1