mirror of
https://gitlab.freedesktop.org/pkg-config/pkg-config.git
synced 2026-05-08 05:28:02 +02:00
2009-03-30 Tollef Fog Heen <tfheen@err.no>
* check/check-missing, check/check-libs, check/check-requires-private: Handle the case of indirect being enabled correctly in checks.
This commit is contained in:
parent
f37f04a78a
commit
e4d39435b9
4 changed files with 24 additions and 4 deletions
|
|
@ -1,5 +1,9 @@
|
|||
2009-03-30 Tollef Fog Heen <tfheen@err.no>
|
||||
|
||||
* check/check-missing, check/check-libs,
|
||||
check/check-requires-private: Handle the case of indirect being
|
||||
enabled correctly in checks.
|
||||
|
||||
* check/common, check/config.sh.in, check/Makefile.am,
|
||||
configure.in: Make it possible to check for configure variables in
|
||||
the check scripts. So far, only direct/indirect is exposed.
|
||||
|
|
|
|||
|
|
@ -10,6 +10,10 @@ set -e
|
|||
. ${srcdir}/common
|
||||
|
||||
ARGS="--libs simple"
|
||||
RESULT="-lsimple"
|
||||
if [ "$list_indirect_deps" = "yes" ]; then
|
||||
RESULT="-lsimple -lm"
|
||||
else
|
||||
RESULT="-lsimple"
|
||||
fi
|
||||
|
||||
run_test
|
||||
|
|
|
|||
|
|
@ -23,8 +23,16 @@ run_test
|
|||
|
||||
# get Libs
|
||||
ARGS="--libs missing-requires-private"
|
||||
EXPECT_RETURN=0
|
||||
RESULT="-L/missing-requires-private/lib -lmissing-requires-private"
|
||||
if [ "$list_indirect_deps" = "yes" ]; then
|
||||
EXPECT_RETURN=1
|
||||
RESULT='Package pkg-non-existent-private-dep was not found in the pkg-config search path.
|
||||
Perhaps you should add the directory containing `pkg-non-existent-private-dep.pc'\''
|
||||
to the PKG_CONFIG_PATH environment variable
|
||||
Package '\''pkg-non-existent-private-dep'\'', required by '\''Missing Requires.private test package'\'', not found'
|
||||
else
|
||||
EXPECT_RETURN=0
|
||||
RESULT="-L/missing-requires-private/lib -lmissing-requires-private"
|
||||
fi
|
||||
run_test
|
||||
|
||||
# Libs.private should fail (verbosely, but the output isn't verified)
|
||||
|
|
|
|||
|
|
@ -20,7 +20,11 @@ run_test
|
|||
|
||||
# expect libs for just requires-test and public-dep
|
||||
ARGS="--libs requires-test"
|
||||
RESULT="-L/requires-test/lib -L/public-dep/lib -lrequires-test -lpublic-dep"
|
||||
if [ "$list_indirect_deps" = "yes" ]; then
|
||||
RESULT="-L/requires-test/lib -L/private-dep/lib -L/public-dep/lib -lrequires-test -lprivate-dep -lpublic-dep"
|
||||
else
|
||||
RESULT="-L/requires-test/lib -L/public-dep/lib -lrequires-test -lpublic-dep"
|
||||
fi
|
||||
run_test
|
||||
|
||||
# expect libs for requires-test, public-dep and private-dep in static case
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue