From 68680d7ed2de07d1b67dd6d3c943a7c7736dbd45 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 7 Jul 2022 20:50:25 +0300
Subject: Use [cmdline] type for canned commands in testscripts

---
 tests/ci/data.testscript           | 8 ++++----
 tests/submit/data.testscript       | 8 ++++----
 tests/submit/submit-git.testscript | 6 +++---
 tests/submit/submit-pub.testscript | 2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/ci/data.testscript b/tests/ci/data.testscript
index 74a1527..e269d0d 100644
--- a/tests/ci/data.testscript
+++ b/tests/ci/data.testscript
@@ -34,10 +34,10 @@ root_data_dir = $~/$data_dir
 # The most commonly used submission data directory cloning command that copies
 # it from the parent scope working directory.
 #
-clone_data       = cp --no-cleanup -r ../$data_dir ./
-clone_data_clean = cp --no-cleanup -r ../$data_dir ./ &$data_dir/***
+clone_data       = [cmdline] cp --no-cleanup -r ../$data_dir ./
+clone_data_clean = [cmdline] cp --no-cleanup -r ../$data_dir ./ &$data_dir/***
 
 # Clones the original submission data directory.
 #
-clone_root_data       = cp --no-cleanup -r $root_data_dir ./
-clone_root_data_clean = cp --no-cleanup -r $root_data_dir ./ &$data_dir/***
+clone_root_data       = [cmdline] cp --no-cleanup -r $root_data_dir ./
+clone_root_data_clean = [cmdline] cp --no-cleanup -r $root_data_dir ./ &$data_dir/***
diff --git a/tests/submit/data.testscript b/tests/submit/data.testscript
index 875b4eb..29b607f 100644
--- a/tests/submit/data.testscript
+++ b/tests/submit/data.testscript
@@ -25,10 +25,10 @@ root_data_dir = $~/$data_dir
 # The most commonly used submission data directory cloning command that copies
 # it from the parent scope working directory.
 #
-clone_data       = cp --no-cleanup -r ../$data_dir ./
-clone_data_clean = cp --no-cleanup -r ../$data_dir ./ &$data_dir/***
+clone_data       = [cmdline] cp --no-cleanup -r ../$data_dir ./
+clone_data_clean = [cmdline] cp --no-cleanup -r ../$data_dir ./ &$data_dir/***
 
 # Clones the original submission data directory.
 #
-clone_root_data       = cp --no-cleanup -r $root_data_dir ./
-clone_root_data_clean = cp --no-cleanup -r $root_data_dir ./ &$data_dir/***
+clone_root_data       = [cmdline] cp --no-cleanup -r $root_data_dir ./
+clone_root_data_clean = [cmdline] cp --no-cleanup -r $root_data_dir ./ &$data_dir/***
diff --git a/tests/submit/submit-git.testscript b/tests/submit/submit-git.testscript
index 19650c5..ec87637 100644
--- a/tests/submit/submit-git.testscript
+++ b/tests/submit/submit-git.testscript
@@ -9,14 +9,14 @@
 #
 # test.redirects += 2>!
 
-g = git 2>! >&2
+g = [cmdline] git 2>! >&2
 
 # Create and clone the reference repository.
 #
 root_ref = $~/ref.git
 root_ref_dir = $~/ref
 
-clone_root_ref = cp --no-cleanup -r $root_ref ./ &ref.git/***
+clone_root_ref = [cmdline] cp --no-cleanup -r $root_ref ./ &ref.git/***
 
 +mkdir --no-cleanup $root_ref
 +$g -C $root_ref init --bare &ref.git/***
@@ -44,7 +44,7 @@ root_tgt_url = "file:///$~/tgt.git"
 
 +cp -r $root_ref $root_tgt
 
-clone_root_tgt = cp --no-cleanup -r $root_tgt ./ &tgt.git/***
+clone_root_tgt = [cmdline] cp --no-cleanup -r $root_tgt ./ &tgt.git/***
 
 # Extract the package repository.
 #
diff --git a/tests/submit/submit-pub.testscript b/tests/submit/submit-pub.testscript
index c5d435f..8c042a7 100644
--- a/tests/submit/submit-pub.testscript
+++ b/tests/submit/submit-pub.testscript
@@ -17,7 +17,7 @@ root_rep=$~/pkg-1
 +echo ": 1" >=$root_rep/1/repositories.manifest
 +bpkg rep-create $root_rep/1 2>! &$root_rep/1/packages.manifest
 
-clone_root_rep = cp --no-cleanup -r $root_rep ./ &pkg-1/*** &?pkg.lock
+clone_root_rep = [cmdline] cp --no-cleanup -r $root_rep ./ &pkg-1/*** &?pkg.lock
 
 : args
 {
-- 
cgit v1.1