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.

diff --git a/ChangeLog b/ChangeLog
index 21115f0bebb05a01f718e5a69edd700f07bd393b..7fc42dd5114eb63282891f2cea7c4609a64d2340 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 32366a1bd4bd4e78d6e3425dd4dcf25483c0d060..d1249703dbb943a749c553e395f209699352f4d2 100755 (executable)
--- 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 667de6cc4b9b76579f6e8e8d9a15a00bd8cacc60..fba43a73692d7e72d74d61767bb8ea81365a6d33 100755 (executable)
--- 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 34f40218444b1b566c912f3081fef3cca4fb0d55..45115eed921e2022596419b320e2b36faa2e621b 100755 (executable)
--- 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