From 0e3ef06a33c87a58019bf16b5757a5cac366ef7c Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 8 Aug 2019 16:24:35 +0300
Subject: Combine multiple single-character options into a single argument for
 testscript commands

---
 tests/agent/testscript | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests/agent')

diff --git a/tests/agent/testscript b/tests/agent/testscript
index a069c6c..8e66949 100644
--- a/tests/agent/testscript
+++ b/tests/agent/testscript
@@ -37,7 +37,7 @@ rm = $src_base/btrfs-rmdir /build/machines
     trace: enumerate_machines: skipping $m/: no subvolume link
     EOE
 
-  ln -T -s linux-gcc-1.0 $m/linux-gcc-1
+  ln --no-target-directory -s linux-gcc-1.0 $m/linux-gcc-1
 
   : bootstrap
   :
@@ -52,7 +52,7 @@ rm = $src_base/btrfs-rmdir /build/machines
     trace: enumerate_machines: bootstrapped linux-gcc
     EOE
 
-  ln -T -f -s linux-gcc-1.1 $m/linux-gcc-1
+  ln --no-target-directory -sf linux-gcc-1.1 $m/linux-gcc-1
 
   : re-bootstrap-machine
   :
@@ -122,7 +122,7 @@ rm = $src_base/btrfs-rmdir /build/machines
   m = /build/machines/default/linux-gcc
 
   +$cp
-  +ln -T -s linux-gcc-1.0 $m/linux-gcc-1
+  +ln --no-target-directory -s linux-gcc-1.0 $m/linux-gcc-1
   +$* --dump-machines --verbose 1 >- # Bootstrap.
 
   : no-machine
-- 
cgit v1.1