From 73b443b8836a712981be9717b14e545223058e2f Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Fri, 14 Sep 2012 16:04:20 -0500 Subject: [PATCH] tests: add prefix-resistant SYSROOT_DIR variable which uses a sentinel mingw won't mess with --- tests/run.sh.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/run.sh.in b/tests/run.sh.in index 1d81f8b..7d1ac93 100644 --- a/tests/run.sh.in +++ b/tests/run.sh.in @@ -44,6 +44,7 @@ run_test() { selfdir=$(cd "$(dirname "${0}")"; pwd | sed s#/c/#c:/#) PATH_SEP=":" +SYSROOT_DIR="${selfdir}/test" if [ "$(uname -o)" = "Msys" ]; then PATH_SEP=";" fi @@ -139,8 +140,8 @@ run_test "PKG_CONFIG_PATH='${selfdir}/lib1' ${1} --variable=pcfiledir foo" \ "${selfdir}/lib1" # 7) tests for env modifiers -run_test "PKG_CONFIG_PATH='${selfdir}/lib1' PKG_CONFIG_SYSROOT_DIR='/test' ${1} --cflags baz" \ - '-I/test/usr/include/foo' +run_test "PKG_CONFIG_PATH='${selfdir}/lib1' PKG_CONFIG_SYSROOT_DIR='${SYSROOT_DIR}' ${1} --cflags baz" \ + "-I${SYSROOT_DIR}/usr/include/foo" # 8) tests for 'Conflicts' run_test "PKG_CONFIG_PATH='${selfdir}/lib1' ${1} --libs conflicts; echo \$?" \