From 6bbf6390d95941cd5ead6eba649edc2a7fec9d21 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Sat, 19 Oct 2019 18:16:40 +0300
Subject: Fix some testscripts properly setting config.cxx variable

---
 tests/pkg-update.testscript | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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

diff --git a/tests/pkg-update.testscript b/tests/pkg-update.testscript
index 9a1cf7d..c50b026 100644
--- a/tests/pkg-update.testscript
+++ b/tests/pkg-update.testscript
@@ -48,7 +48,9 @@
                                     &$out/hello/signature.manifest
 end
 
-pkg_configure += -d cfg config.cxx=$quote($recall($cxx.path) $cxx.mode, true) 2>!
+config_cxx = config.cxx=$quote($recall($cxx.path) $cxx.mode, true)
+
+pkg_configure += -d cfg $config_cxx 2>!
 pkg_disfigure += -d cfg
 pkg_fetch     += -d cfg 2>!
 pkg_purge     += -d cfg
@@ -137,7 +139,7 @@ $* 2>>EOE != 0
 : vars
 :
 {
-  +$clone_cfg
+  +$cfg_create cxx $config_cxx -d cfg 2>- &cfg/***
   +$rep_fetch $rep/hello --trust $cert_fp &cfg/.bpkg/certs/**
 
   : global-and-local
-- 
cgit v1.1