From 95fee14dfa5bd3896c510077af36ea371a9a2975 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 26 Oct 2018 13:47:53 +0300
Subject: Merge with 1.5.4 upstream package version

---
 tests/api/driver.c   |  4 +++-
 tests/api/testscript | 14 ++++++++++----
 tests/basic/driver.c |  6 ++++--
 3 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'tests')

diff --git a/tests/api/driver.c b/tests/api/driver.c
index b020bee..219549d 100644
--- a/tests/api/driver.c
+++ b/tests/api/driver.c
@@ -122,7 +122,9 @@ main (int argc, const char* argv[])
   assert (n > 3 && strcmp (path + n - 3, ".pc") == 0);
 
   pkgconf_client_t* c =
-    pkgconf_client_new (error_handler, NULL /* error_handler_data */);
+    pkgconf_client_new (error_handler,
+                        NULL /* error_handler_data */,
+                        pkgconf_cross_personality_default ());
 
   assert (c != NULL);
 
diff --git a/tests/api/testscript b/tests/api/testscript
index 7e20361..322a12d 100644
--- a/tests/api/testscript
+++ b/tests/api/testscript
@@ -8,6 +8,7 @@
   +cat <<EOI >=libfoo.pc
   prefix="C:\\Program   Files\\Foo"
   exec_prefix=${prefix}
+  var="A\"B" 'C\'D'
   Name: libfoo
   Description: Foo library
   Version: 1.0
@@ -33,8 +34,9 @@
   : vars
   :
   $* --vars $f >>EOO
-  exec_prefix "C:\\Program   Files\\Foo"
-  prefix "C:\\Program   Files\\Foo"
+  var A"B 'C\'D'
+  exec_prefix C:\\Program   Files\\Foo
+  prefix C:\\Program   Files\\Foo
   EOO
 }
 
@@ -43,6 +45,7 @@
   +cat <<EOI >=libfoo.pc
   prefix='C:\Program   Files\Foo'
   exec_prefix=${prefix}
+  var='A\'B' "C\"D"
   Name: libfoo
   Description: Foo library
   Version: 1.0
@@ -68,8 +71,9 @@
   : vars
   :
   $* --vars $f >>EOO
-  exec_prefix 'C:\Program   Files\Foo'
-  prefix 'C:\Program   Files\Foo'
+  var A'B "C\"D"
+  exec_prefix C:\Program   Files\Foo
+  prefix C:\Program   Files\Foo
   EOO
 }
 
@@ -79,6 +83,7 @@
   +cat <<EOI >=libfoo.pc
   prefix=C:\\Program\ \ \ Files\\Foo
   exec_prefix=${prefix}
+  var=X A\'B' "C\"D"
   Name: libfoo
   Description: Foo library
   Version: 1.0
@@ -104,6 +109,7 @@
   : vars
   :
   $* --vars $f >>EOO
+  var X A\'B' "C\"D"
   exec_prefix C:\\Program\ \ \ Files\\Foo
   prefix C:\\Program\ \ \ Files\\Foo
   EOO
diff --git a/tests/basic/driver.c b/tests/basic/driver.c
index 888a862..0e733c9 100644
--- a/tests/basic/driver.c
+++ b/tests/basic/driver.c
@@ -67,7 +67,9 @@ int
 main (int argc, const char* argv[])
 {
   pkgconf_client_t* c =
-    pkgconf_client_new (error_handler, NULL /* error_handler_data */);
+    pkgconf_client_new (error_handler,
+                        NULL /* error_handler_data */,
+                        pkgconf_cross_personality_default ());
 
   assert (c != NULL);
 
@@ -112,7 +114,7 @@ main (int argc, const char* argv[])
    * Bootstrap the package search default paths if not specified explicitly.
    */
   if (default_dirs)
-    pkgconf_pkg_dir_list_build (c);
+    pkgconf_client_dir_list_build (c, pkgconf_cross_personality_default ());
 
   pkgconf_pkg_t* p = pkgconf_pkg_find (c, name);
 
-- 
cgit v1.1