From d2a4682d868290f1a5e0e4c4aac91f6f900bb0ad Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 8 Jul 2022 16:13:23 +0300
Subject: Fix some tests to match canned command line semantics

---
 tests/cfg-create.testscript    | 2 +-
 tests/pkg-build.testscript     | 2 +-
 tests/pkg-configure.testscript | 2 +-
 tests/pkg-update.testscript    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/cfg-create.testscript b/tests/cfg-create.testscript
index e69629d..f22bd57 100644
--- a/tests/cfg-create.testscript
+++ b/tests/cfg-create.testscript
@@ -3,7 +3,7 @@
 
 .include common.testscript
 
-config_cxx = config.cxx=$quote($recall($cxx.path) $cxx.config.mode, true)
+config_cxx = [cmdline] config.cxx=$quote($recall($cxx.path) $cxx.config.mode, true)
 
 cfg_create += 2>!
 
diff --git a/tests/pkg-build.testscript b/tests/pkg-build.testscript
index fe2e4b2..0e6eafe 100644
--- a/tests/pkg-build.testscript
+++ b/tests/pkg-build.testscript
@@ -433,7 +433,7 @@ posix = ($cxx.target.class != 'windows')
   $git_extract $src/git/libbaz.tar &$out_git/state1/***
 end
 
-config_cxx = config.cxx=$quote($recall($cxx.path) $cxx.config.mode, true)
+config_cxx = [cmdline] config.cxx=$quote($recall($cxx.path) $cxx.config.mode, true)
 
 cfg_create    += 2>!
 cfg_link      += 2>!
diff --git a/tests/pkg-configure.testscript b/tests/pkg-configure.testscript
index 1c049b6..2374460 100644
--- a/tests/pkg-configure.testscript
+++ b/tests/pkg-configure.testscript
@@ -70,7 +70,7 @@
   cp -r $src/t8a $out/t8a && $rep_create $out/t8a &$out/t8a/packages.manifest
 end
 
-test.arguments += config.cxx=$quote($recall($cxx.path) $cxx.config.mode, true)
+test.arguments += config.cxx=$quote($recall($cxx.path) $cxx.config.mode)
 
 pkg_disfigure += -d cfg
 pkg_fetch     += -d cfg 2>!
diff --git a/tests/pkg-update.testscript b/tests/pkg-update.testscript
index f0a8f64..89833d4 100644
--- a/tests/pkg-update.testscript
+++ b/tests/pkg-update.testscript
@@ -47,7 +47,7 @@
                                     &$out/hello/signature.manifest
 end
 
-config_cxx = config.cxx=$quote($recall($cxx.path) $cxx.config.mode, true)
+config_cxx = [cmdline] config.cxx=$quote($recall($cxx.path) $cxx.config.mode, true)
 
 pkg_configure += -d cfg $config_cxx 2>!
 pkg_disfigure += -d cfg
-- 
cgit v1.1