diff options
| author | Tollef Fog Heen <tfheen@err.no> | 2009-03-30 22:03:38 +0200 |
|---|---|---|
| committer | Tollef Fog Heen <tfheen@err.no> | 2009-03-30 22:03:38 +0200 |
| commit | e4d39435b9819f36eb9951ecdc9d02d57e75a065 (patch) | |
| tree | 492f47505108f0e57273339bbb92bd21776ba670 | |
| parent | f37f04a78a6eb3c2481ab9b4fdf23c325b0f299b (diff) | |
| download | pkg-config-e4d39435b9819f36eb9951ecdc9d02d57e75a065.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | check/check-libs | 6 | ||||
| -rwxr-xr-x | check/check-missing | 12 | ||||
| -rwxr-xr-x | check/check-requires-private | 6 |
4 files changed, 24 insertions, 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. diff --git a/check/check-libs b/check/check-libs index 32366a1..d124970 100755 --- a/check/check-libs +++ b/check/check-libs @@ -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 diff --git a/check/check-missing b/check/check-missing index 667de6c..fba43a7 100755 --- a/check/check-missing +++ b/check/check-missing @@ -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) diff --git a/check/check-requires-private b/check/check-requires-private index 34f4021..45115ee 100755 --- a/check/check-requires-private +++ b/check/check-requires-private @@ -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 |