From 47faabe40caa2c01a6379f5d143af189fa96ca9b Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 26 Feb 2020 19:12:55 +0300
Subject: Release version 1.6.3+2

Invent PKGCONF_PKG_PKGF_DONT_MERGE_SPECIAL_FRAGMENTS flag
---
 libpkgconf/tests/api/driver.c   | 2 +-
 libpkgconf/tests/api/testscript | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'libpkgconf/tests/api')

diff --git a/libpkgconf/tests/api/driver.c b/libpkgconf/tests/api/driver.c
index 57f989d..6035771 100644
--- a/libpkgconf/tests/api/driver.c
+++ b/libpkgconf/tests/api/driver.c
@@ -130,7 +130,7 @@ main (int argc, const char* argv[])
   int r = 1;
   int max_depth = 2000;
 
-  pkgconf_client_set_flags (c, 0);
+  pkgconf_client_set_flags (c, PKGCONF_PKG_PKGF_DONT_MERGE_SPECIAL_FRAGMENTS);
   pkgconf_pkg_t* p = pkgconf_pkg_find (c, path);
 
   if (p != NULL)
diff --git a/libpkgconf/tests/api/testscript b/libpkgconf/tests/api/testscript
index dfada71..0382f87 100644
--- a/libpkgconf/tests/api/testscript
+++ b/libpkgconf/tests/api/testscript
@@ -114,9 +114,9 @@
     EOO
 }
 
-: merged
+: no-merge
 :
-: Note that we want the merged options to be eventually separated.
+: Test that the -framework options are not merged into a single fragment.
 :
 {
   +cat <<EOI >=libfoo.pc
@@ -137,6 +137,9 @@
     l ssl
     l crypto
     l z
-      -framework CoreFoundation -framework Security
+      -framework
+      CoreFoundation
+      -framework
+      Security
     EOO
 }
-- 
cgit v1.1