tests: add prefix-resistant SYSROOT_DIR variable which uses a sentinel mingw won't mess with

feature/tap-sh
William Pitcock 2012-09-14 16:04:20 -05:00
parent fa0b2f9fc2
commit 73b443b883
1 changed files with 3 additions and 2 deletions

View File

@ -44,6 +44,7 @@ run_test() {
selfdir=$(cd "$(dirname "${0}")"; pwd | sed s#/c/#c:/#) selfdir=$(cd "$(dirname "${0}")"; pwd | sed s#/c/#c:/#)
PATH_SEP=":" PATH_SEP=":"
SYSROOT_DIR="${selfdir}/test"
if [ "$(uname -o)" = "Msys" ]; then if [ "$(uname -o)" = "Msys" ]; then
PATH_SEP=";" PATH_SEP=";"
fi fi
@ -139,8 +140,8 @@ run_test "PKG_CONFIG_PATH='${selfdir}/lib1' ${1} --variable=pcfiledir foo" \
"${selfdir}/lib1" "${selfdir}/lib1"
# 7) tests for env modifiers # 7) tests for env modifiers
run_test "PKG_CONFIG_PATH='${selfdir}/lib1' PKG_CONFIG_SYSROOT_DIR='/test' ${1} --cflags baz" \ run_test "PKG_CONFIG_PATH='${selfdir}/lib1' PKG_CONFIG_SYSROOT_DIR='${SYSROOT_DIR}' ${1} --cflags baz" \
'-I/test/usr/include/foo' "-I${SYSROOT_DIR}/usr/include/foo"
# 8) tests for 'Conflicts' # 8) tests for 'Conflicts'
run_test "PKG_CONFIG_PATH='${selfdir}/lib1' ${1} --libs conflicts; echo \$?" \ run_test "PKG_CONFIG_PATH='${selfdir}/lib1' ${1} --libs conflicts; echo \$?" \