From edb96ea0eadea96c2743ce3ffd526babacee8b9c Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Mon, 19 Mar 2018 10:52:57 -0400 Subject: [PATCH] Add test for Requires.internal https://bugs.freedesktop.org/show_bug.cgi?id=105572 --- check/check-print-options | 4 +++- check/check-requires-private | 8 ++++---- check/internal-dep.pc | 6 ++++++ check/requires-test.pc | 1 + 4 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 check/internal-dep.pc diff --git a/check/check-print-options b/check/check-print-options index 198e5a1..0f98c78 100755 --- a/check/check-print-options +++ b/check/check-print-options @@ -31,7 +31,8 @@ RESULT="public-dep >= 1" run_test --print-requires requires-test # --print-requires-private -RESULT="private-dep >= 1" +RESULT="internal-dep >= 1 +private-dep >= 1" run_test --print-requires-private requires-test # --list-all, limit to a subdirectory @@ -51,6 +52,7 @@ run_test --modversion --version simple # --print-requires/--print-requires-private allowed together RESULT="public-dep >= 1 +internal-dep >= 1 private-dep >= 1" run_test --print-requires --print-requires-private requires-test run_test --print-requires-private --print-requires requires-test diff --git a/check/check-requires-private b/check/check-requires-private index dc69baf..66e3ef7 100755 --- a/check/check-requires-private +++ b/check/check-requires-private @@ -4,7 +4,7 @@ set -e . ${srcdir}/common -# expect cflags from requires-test and public-dep +# expect cflags from requires-test, public-dep and private-dep but not internal-dep RESULT="-I/requires-test/include -I/private-dep/include -I/public-dep/include" run_test --cflags requires-test run_test --static --cflags requires-test @@ -15,9 +15,9 @@ if [ "$list_indirect_deps" = no ]; then run_test --libs requires-test fi -# expect libs for requires-test, public-dep and private-dep in static case -RESULT="-L/requires-test/lib -L/private-dep/lib -L/public-dep/lib \ --lrequires-test -lprivate-dep -lpublic-dep" +# expect libs for requires-test, public-dep, private-dep and internal-dep in static case +RESULT="-L/requires-test/lib -L/internal-dep/lib -L/private-dep/lib -L/public-dep/lib \ +-lrequires-test -linternal-dep -lprivate-dep -lpublic-dep" if [ "$list_indirect_deps" = yes ]; then run_test --libs requires-test fi diff --git a/check/internal-dep.pc b/check/internal-dep.pc new file mode 100644 index 0000000..87a051b --- /dev/null +++ b/check/internal-dep.pc @@ -0,0 +1,6 @@ +Name: Requires test package +Description: Dummy pkgconfig test package for testing Requires/Requires.private +Version: 1.0.0 +Libs: -L/internal-dep/lib -linternal-dep +Cflags: -I/internal-dep/include + diff --git a/check/requires-test.pc b/check/requires-test.pc index e483db2..5339f4e 100644 --- a/check/requires-test.pc +++ b/check/requires-test.pc @@ -3,6 +3,7 @@ Description: Dummy pkgconfig test package for testing Requires/Requires.private Version: 1.0.0 Requires: public-dep >= 1 Requires.private: private-dep >= 1 +Requires.internal: internal-dep >= 1 Libs: -L/requires-test/lib -lrequires-test Cflags: -I/requires-test/include -- 2.14.1