summaryrefslogtreecommitdiff
path: root/check
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2013-12-14 10:37:20 -0800
committerDan Nicholson <dbn.lists@gmail.com>2013-12-14 10:47:56 -0800
commit860cab9a3eea61dd8136f8852054d8f645dfd30a (patch)
tree9e12c878a3f88a3793a708088c54b14bfaad6797 /check
parent9f6541134153fa6e8393fc339438a527bb0fbd4d (diff)
downloadpkg-config-860cab9a3eea61dd8136f8852054d8f645dfd30a.tar.gz
check: Rework dirafter test to handle all special cases
Expand the special flags test to check -framework usage and the handling of multiple arguments.
Diffstat (limited to 'check')
-rw-r--r--check/Makefile.am4
-rwxr-xr-xcheck/check-idirafter8
-rwxr-xr-xcheck/check-special-flags11
-rw-r--r--check/special-flags.pc (renamed from check/idirafter.pc)7
4 files changed, 16 insertions, 14 deletions
diff --git a/check/Makefile.am b/check/Makefile.am
index 9bef3b4..34d0e34 100644
--- a/check/Makefile.am
+++ b/check/Makefile.am
@@ -12,7 +12,7 @@ TESTS = \
check-includedir \
check-conflicts \
check-missing \
- check-idirafter \
+ check-special-flags \
check-sort-order \
check-duplicate-flags \
check-whitespace \
@@ -38,7 +38,7 @@ EXTRA_DIST = \
includedir.pc \
missing-requires-private.pc \
missing-requires.pc \
- idirafter.pc \
+ special-flags.pc \
conflicts-test.pc \
whitespace.pc \
fields-blank.pc \
diff --git a/check/check-idirafter b/check/check-idirafter
deleted file mode 100755
index a41d11e..0000000
--- a/check/check-idirafter
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-
-set -e
-
-. ${srcdir}/common
-
-RESULT="-idirafter -I/after -I/foo -I/bar"
-run_test --cflags idirafter
diff --git a/check/check-special-flags b/check/check-special-flags
new file mode 100755
index 0000000..136160a
--- /dev/null
+++ b/check/check-special-flags
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+set -e
+
+. ${srcdir}/common
+
+RESULT="-idirafter /after1 -idirafter /after2 -I/foo -I/bar"
+run_test --cflags special-flags
+
+RESULT="-framework Foo -lsimple -framework Bar"
+run_test --libs special-flags
diff --git a/check/idirafter.pc b/check/special-flags.pc
index fced885..269fd36 100644
--- a/check/idirafter.pc
+++ b/check/special-flags.pc
@@ -3,10 +3,9 @@ exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
-Name: idirafter test
+Name: Special flags test
Description: Dummy pkgconfig test package for testing pkgconfig
Version: 1.0.0
Requires:
-Libs: -lsimple
-Libs.private: -lm
-Cflags: -I/foo -idirafter -I/after -I/bar
+Libs: -framework Foo -lsimple -framework Bar
+Cflags: -I/foo -idirafter /after1 -I/bar -idirafter /after2