~ chicken-core (chicken-5) 4258fea8d7a62650b23c58d80caec4ef7a2d7afa
commit 4258fea8d7a62650b23c58d80caec4ef7a2d7afa Author: Evan Hanson <evhan@foldling.org> AuthorDate: Tue Dec 26 17:43:28 2017 +1300 Commit: Evan Hanson <evhan@foldling.org> CommitDate: Tue Dec 26 17:43:28 2017 +1300 Fix MSYS tests by using Windows-style path separators in runtests.sh When executing the runtests.sh script on Windows (in other words, when testing on MSYS), we need to use ";" as the path component separator for the CHICKEN_REPOSITORY_PATH variable. We use the presence of the MSYSTEM environment variable to detect this situation, as is done when setting the TEST_DIR variable. diff --git a/tests/runtests.sh b/tests/runtests.sh index 7b677c67..763267f0 100755 --- a/tests/runtests.sh +++ b/tests/runtests.sh @@ -8,10 +8,12 @@ set -e if test -z "$MSYSTEM"; then TEST_DIR=`pwd` + PATH_SEP=':' else # Use Windows-native format with drive letters instead of awkward # MSYS /c/blabla "pseudo-paths" which break when used in syscalls. TEST_DIR=`pwd -W` + PATH_SEP=';' fi DYLD_LIBRARY_PATH=${TEST_DIR}/.. @@ -36,7 +38,7 @@ CHICKEN_PROFILE=${TEST_DIR}/../chicken-profile CHICKEN_INSTALL=${TEST_DIR}/../chicken-install CHICKEN_UNINSTALL=${TEST_DIR}/../chicken-uninstall CHICKEN_INSTALL_REPOSITORY=${TEST_DIR}/test-repository -CHICKEN_REPOSITORY_PATH=${TEST_DIR}/..:$CHICKEN_INSTALL_REPOSITORY +CHICKEN_REPOSITORY_PATH="${TEST_DIR}/..${PATH_SEP}${CHICKEN_INSTALL_REPOSITORY}" export CHICKEN_INSTALL_REPOSITORY CHICKEN_REPOSITORY_PATHTrap