From ce47fa8d89c869922b73744a259113d08872f820 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Fri, 5 May 2017 01:40:09 -0500 Subject: [PATCH] tests: add reduced version of freebsd gtk+-3.0 crappy output situation as a testcase --- Makefile.am | 4 ++++ tests/lib1/fragment-collision-1.pc | 4 ++++ tests/lib1/fragment-collision-2.pc | 4 ++++ tests/lib1/fragment-collision-intermediary.pc | 5 +++++ tests/lib1/fragment-collision.pc | 6 ++++++ tests/regress.sh | 9 ++++++++- 6 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 tests/lib1/fragment-collision-1.pc create mode 100644 tests/lib1/fragment-collision-2.pc create mode 100644 tests/lib1/fragment-collision-intermediary.pc create mode 100644 tests/lib1/fragment-collision.pc diff --git a/Makefile.am b/Makefile.am index f45ce98..64549b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,6 +65,10 @@ EXTRA_DIST = pkg.m4 \ tests/lib1/flag-order-1.pc \ tests/lib1/flag-order-3.pc \ tests/lib1/variable-whitespace.pc \ + tests/lib1/fragment-collision.pc \ + tests/lib1/fragment-collision-intermediary.pc \ + tests/lib1/fragment-collision-1.pc \ + tests/lib1/fragment-collision-2.pc \ tests/lib1/fragment-quoting.pc \ tests/lib1/fragment-quoting-2.pc \ tests/lib1/fragment-quoting-3.pc \ diff --git a/tests/lib1/fragment-collision-1.pc b/tests/lib1/fragment-collision-1.pc new file mode 100644 index 0000000..201bcb0 --- /dev/null +++ b/tests/lib1/fragment-collision-1.pc @@ -0,0 +1,4 @@ +Name: fragment-collision-1 +Version: 0 +Description: fragment collision test package +Cflags: -D_THREAD_SAFE -pthread diff --git a/tests/lib1/fragment-collision-2.pc b/tests/lib1/fragment-collision-2.pc new file mode 100644 index 0000000..2e6feb4 --- /dev/null +++ b/tests/lib1/fragment-collision-2.pc @@ -0,0 +1,4 @@ +Name: fragment-collision-2 +Version: 0 +Description: fragment collision test package +CFlags: -D_FOO diff --git a/tests/lib1/fragment-collision-intermediary.pc b/tests/lib1/fragment-collision-intermediary.pc new file mode 100644 index 0000000..1ddb6f5 --- /dev/null +++ b/tests/lib1/fragment-collision-intermediary.pc @@ -0,0 +1,5 @@ +Name: fragment-collision-intermediary +Version: 0 +Description: fragment collision test package +Requires.private: fragment-collision-1, fragment-collision-2 +CFlags: -D_BAR diff --git a/tests/lib1/fragment-collision.pc b/tests/lib1/fragment-collision.pc new file mode 100644 index 0000000..c582675 --- /dev/null +++ b/tests/lib1/fragment-collision.pc @@ -0,0 +1,6 @@ +Name: fragment-collision +Version: 0 +Description: fragment collision test package +Requires: fragment-collision-2, fragment-collision-intermediary +Requires.private: fragment-collision-1 +Cflags: -D_BAZ diff --git a/tests/regress.sh b/tests/regress.sh index 07658ae..1acf8af 100755 --- a/tests/regress.sh +++ b/tests/regress.sh @@ -24,7 +24,8 @@ tests_init \ idirafter_ordering \ pcpath \ sysroot_munge \ - virtual_variable + virtual_variable \ + fragment_collision case_sensitivity_body() { @@ -217,3 +218,9 @@ virtual_variable_body() atf_check -o inline:"${pcpath}\n" \ pkgconf --variable=pc_path pkgconf } + +fragment_collision_body() +{ + atf_check -o inline:"-D_BAZ -D_BAR -D_FOO -D_THREAD_SAFE -pthread \n" \ + pkgconf --with-path="${selfdir}/lib1" --cflags fragment-collision +}