From 1f373a265427a1555151d250cf9d340bd4a49235 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Fri, 14 Sep 2012 15:50:27 -0500 Subject: [PATCH] tests: check for Msys and use Windows-style path seperators for PKG_CONFIG_PATH. --- tests/run.sh.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/run.sh.in b/tests/run.sh.in index 6e7b0bc..8006f3b 100644 --- a/tests/run.sh.in +++ b/tests/run.sh.in @@ -43,6 +43,11 @@ run_test() { selfdir=$(cd "$(dirname "${0}")"; pwd | sed s#/c/#c:/#) +PATH_SEP=":" +if [ "$(uname -o)" = "Msys" ]; then + PATH_SEP=";" +fi + # 1) overall 'is it working?' test run_test "PKG_CONFIG_PATH=${selfdir}/lib1 ${1}; echo \$?" \ '1' @@ -82,9 +87,9 @@ run_test "PKG_CONFIG_PATH=${selfdir}/lib1 ${1} --libs intermediary-1 intermediar '-lintermediary-1 -lintermediary-2 -lfoo -lbar -lbaz' # 2) tests for PKG_CONFIG_PATH order -run_test "PKG_CONFIG_PATH=${selfdir}/lib1:${selfdir}/lib2 ${1} --libs foo" \ +run_test "PKG_CONFIG_PATH=${selfdir}/lib1${PATH_SEP}${selfdir}/lib2 ${1} --libs foo" \ '-lfoo' -run_test "PKG_CONFIG_PATH=${selfdir}/lib2:${selfdir}/lib1 ${1} --libs foo" \ +run_test "PKG_CONFIG_PATH=${selfdir}/lib2${PATH_SEP}${selfdir}/lib1 ${1} --libs foo" \ '-lbar' # 3) tests for 'Requires' and 'Requires.private'