diff options
author | Dan Nicholson <dbn.lists@gmail.com> | 2012-11-28 09:51:01 -0800 |
---|---|---|
committer | Dan Nicholson <dbn.lists@gmail.com> | 2012-11-29 19:18:41 -0800 |
commit | d6337ec9861f9f32d484159014f921e97fbcb264 (patch) | |
tree | e87f34f80d6831ccd95c2d733df696a09a557e75 /check/check-missing | |
parent | 840cf3c97e793877388396a43dd2048f361eac67 (diff) |
Always use --static test results for indirect depencency results
Often the expected results for the indirect dependency tests fell behind
because it's not a typical test scenario. However, since the results are
always the same as --static, they can just use the same results and the
test can be run conditionally without --static based on configuration.
Diffstat (limited to 'check/check-missing')
-rwxr-xr-x | check/check-missing | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/check/check-missing b/check/check-missing index ef808e0..719998a 100755 --- a/check/check-missing +++ b/check/check-missing @@ -22,21 +22,18 @@ RESULT="" run_test --exists missing-requires-private # get Libs -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" +EXPECT_RETURN=0 +RESULT="-L/missing-requires-private/lib -lmissing-requires-private" +if [ "$list_indirect_deps" = no ]; then + run_test --libs missing-requires-private fi -run_test --libs missing-requires-private # Libs.private should fail (verbosely, but the output isn't verified) EXPECT_RETURN=1 RESULT="" +if [ "$list_indirect_deps" = yes ]; then + run_test --silence-errors --libs missing-requires-private +fi run_test --silence-errors --static --libs missing-requires-private # Cflags.private should fail (verbosely, but the output isn't verified) |