diff options
Diffstat (limited to 'libpkgconf/tests')
| -rw-r--r-- | libpkgconf/tests/api/driver.c | 2 | ||||
| -rw-r--r-- | libpkgconf/tests/api/testscript | 9 |
2 files changed, 7 insertions, 4 deletions
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 } |