summaryrefslogtreecommitdiff
path: root/libpkgconf/tests/api/driver.c
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2021-10-20 17:06:32 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2021-10-20 17:06:32 +0300
commite00a421e51b5747696f89b6611eba1d0010dd501 (patch)
tree89ebd5975b58597c4e8555144f98ad26333c40a8 /libpkgconf/tests/api/driver.c
parentf76df6b5b3ad65675058bf6ab0aa8bf6e14e11ac (diff)
Release version 1.6.3+5v1.6.3+5
Prevent dropping of -framework options in Libs value Change manifest builds value from all to host Disable the success build emails Cleanup comments in tests/basic/driver.c
Diffstat (limited to 'libpkgconf/tests/api/driver.c')
-rw-r--r--libpkgconf/tests/api/driver.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/libpkgconf/tests/api/driver.c b/libpkgconf/tests/api/driver.c
index 15b0685..447a223 100644
--- a/libpkgconf/tests/api/driver.c
+++ b/libpkgconf/tests/api/driver.c
@@ -24,7 +24,6 @@ error_handler (const char* msg, const pkgconf_client_t* c, const void* d)
/* Seems it always have a trailing newline char. Probably it still a good
* idea to check if it is. Let's see if it ever be missed.
- *
*/
fprintf (stderr, "%s", msg);
return true;
@@ -127,7 +126,9 @@ main (int argc, const char* argv[])
int r = 1;
int max_depth = 2000;
- pkgconf_client_set_flags (c, PKGCONF_PKG_PKGF_DONT_MERGE_SPECIAL_FRAGMENTS);
+ const int pkgconf_flags = PKGCONF_PKG_PKGF_DONT_MERGE_SPECIAL_FRAGMENTS;
+
+ pkgconf_client_set_flags (c, pkgconf_flags);
pkgconf_pkg_t* p = pkgconf_pkg_find (c, path);
if (p != NULL)
@@ -138,7 +139,9 @@ main (int argc, const char* argv[])
{
case dump_cflags:
{
- pkgconf_client_set_flags (c, PKGCONF_PKG_PKGF_SEARCH_PRIVATE);
+ pkgconf_client_set_flags (c,
+ pkgconf_flags |
+ PKGCONF_PKG_PKGF_SEARCH_PRIVATE);
pkgconf_list_t list = PKGCONF_LIST_INITIALIZER;
e = pkgconf_pkg_cflags (c, p, &list, max_depth);
@@ -152,6 +155,7 @@ main (int argc, const char* argv[])
case dump_libs:
{
pkgconf_client_set_flags (c,
+ pkgconf_flags |
PKGCONF_PKG_PKGF_SEARCH_PRIVATE |
PKGCONF_PKG_PKGF_MERGE_PRIVATE_FRAGMENTS);