From 23dfd50930bfe3d7135a567e7c67eea21aeece98 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 18 Oct 2019 18:45:54 +0300
Subject: Use $quote() for quoting config.cxx option value in testscripts

---
 tests/pkg-build.testscript | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'tests/pkg-build.testscript')

diff --git a/tests/pkg-build.testscript b/tests/pkg-build.testscript
index 6ce1689..cf9c82c 100644
--- a/tests/pkg-build.testscript
+++ b/tests/pkg-build.testscript
@@ -146,7 +146,9 @@
   $git_extract $src/git/libbaz.tar &$out_git/state1/***
 end
 
-pkg_configure += -d cfg "config.cxx=$config.cxx" 2>!
+config_cxx = config.cxx=$quote($recall($cxx.path) $cxx.mode, true)
+
+pkg_configure += -d cfg $config_cxx 2>!
 pkg_disfigure += -d cfg
 pkg_drop      += -d cfg --yes 2>!
 pkg_fetch     += -d cfg 2>!
@@ -2288,7 +2290,7 @@ test.options += --no-progress
     : as a dependency, so it is built incrementally.
     :
     {
-      $cfg_create cxx "config.cxx=$config.cxx" -d cfg 2>- &cfg/***;
+      $cfg_create cxx $config_cxx -d cfg 2>- &cfg/***;
 
       # Add libhello as the dir repository.
       #
@@ -2800,7 +2802,7 @@ test.options += --no-progress
 {
   test.arguments += --yes
 
-  +$cfg_create cxx "config.cxx=$config.cxx" -d cfg 2>- &cfg/***
+  +$cfg_create cxx $config_cxx -d cfg 2>- &cfg/***
   +cp -r $src/libhello-1.0.0 ./libhello
   +$rep_add libhello --type dir
   +$rep_fetch
@@ -3368,7 +3370,7 @@ test.options += --no-progress
 : keep-out
 :
 {
-  +$cfg_create cxx "config.cxx=$config.cxx" -d cfg 2>- &cfg/***
+  +$cfg_create cxx $config_cxx -d cfg 2>- &cfg/***
 
   # Build libhello as an external package.
   #
@@ -3484,7 +3486,7 @@ test.options += --no-progress
       clone_cfg = cp -pr --no-cleanup ../../cfg ./
 
       +$build 'dist(../../libhello/@./out/)' \
-              "config.cxx=$config.cxx" config.dist.root=./ \
+              $config_cxx config.dist.root=./ \
               config.dist.archives=tar.gz 2>! \
               &libhello-1.0.1/*** &libhello-1.0.1.tar.gz
 
-- 
cgit v1.1