From 860cab9a3eea61dd8136f8852054d8f645dfd30a Mon Sep 17 00:00:00 2001
From: Dan Nicholson <dbn.lists@gmail.com>
Date: Sat, 14 Dec 2013 10:37:20 -0800
Subject: check: Rework dirafter test to handle all special cases

Expand the special flags test to check -framework usage and the handling
of multiple arguments.
---
 check/Makefile.am         |  4 ++--
 check/check-idirafter     |  8 --------
 check/check-special-flags | 11 +++++++++++
 check/idirafter.pc        | 12 ------------
 check/special-flags.pc    | 11 +++++++++++
 5 files changed, 24 insertions(+), 22 deletions(-)
 delete mode 100755 check/check-idirafter
 create mode 100755 check/check-special-flags
 delete mode 100644 check/idirafter.pc
 create mode 100644 check/special-flags.pc

(limited to 'check')

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/idirafter.pc
deleted file mode 100644
index fced885..0000000
--- a/check/idirafter.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: idirafter 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
diff --git a/check/special-flags.pc b/check/special-flags.pc
new file mode 100644
index 0000000..269fd36
--- /dev/null
+++ b/check/special-flags.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: Special flags test
+Description: Dummy pkgconfig test package for testing pkgconfig
+Version: 1.0.0
+Requires:
+Libs: -framework Foo -lsimple -framework Bar
+Cflags: -I/foo -idirafter /after1 -I/bar -idirafter /after2
-- 
cgit v1.2.1