From f5b11ba042f96905d15b16b4127b65cb639d2ff8 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 19 Apr 2017 10:33:02 +0200 Subject: Minor improvement --- tests/agent/testscript | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'tests/agent') diff --git a/tests/agent/testscript b/tests/agent/testscript index 6e9d319..c5396b4 100644 --- a/tests/agent/testscript +++ b/tests/agent/testscript @@ -28,13 +28,12 @@ rm = $src_base/btrfs-rmdir /build/machines test.options += --dump-machines --fake-bootstrap m = /build/machines/default/linux-gcc - u = https://example.org/?dummy +$cp : no-current-machine-symlink : - $* --toolchain-id 123 $u 2>>"EOE" + $* --toolchain-id 123 2>>"EOE" trace: enumerate_machines: skipping $m/: no subvolume link EOE @@ -42,7 +41,7 @@ rm = $src_base/btrfs-rmdir /build/machines : bootstrap : - $* --toolchain-id 123 $u >>EOO 2>>~"%EOE%d" + $* --toolchain-id 123 >>EOO 2>>~"%EOE%d" : 1 id: linux-gcc-1.0 name: linux-gcc @@ -57,7 +56,7 @@ rm = $src_base/btrfs-rmdir /build/machines : re-bootstrap-machine : - $* --toolchain-id 123 $u >>EOO 2>>~"%EOE%d" + $* --toolchain-id 123 >>EOO 2>>~"%EOE%d" : 1 id: linux-gcc-1.1 name: linux-gcc @@ -72,7 +71,7 @@ rm = $src_base/btrfs-rmdir /build/machines : re-bootstrap-toolchain : - $* --toolchain-id 124 $u >>EOO 2>>~"%EOE%d" + $* --toolchain-id 124 >>EOO 2>>~"%EOE%d" : 1 id: linux-gcc-1.1 name: linux-gcc @@ -89,7 +88,7 @@ rm = $src_base/btrfs-rmdir /build/machines : re-bootstrap-bbot : - $* --toolchain-id 124 $u >>EOO 2>>~"%EOE%d" + $* --toolchain-id 124 >>EOO 2>>~"%EOE%d" : 1 id: linux-gcc-1.1 name: linux-gcc @@ -106,7 +105,7 @@ rm = $src_base/btrfs-rmdir /build/machines : re-bootstrap-bbot-newer : - $* --toolchain-id 124 $u 2>>~"%EOE%d" + $* --toolchain-id 124 2>>~"%EOE%d" %trace: enumerate_machines: btrfs subvolume snapshot $m/linux-gcc-1.1 $m/linux-gcc-default-\\.+% trace: enumerate_machines: ignoring $m/linux-gcc-default/: old bbot %trace: enumerate_machines: btrfs subvolume delete $m/linux-gcc-default-\\.+% @@ -121,15 +120,14 @@ rm = $src_base/btrfs-rmdir /build/machines test.options += --fake-bootstrap --fake-build --fake-request - m = /build/machines/default/linux-gcc - u = https://example.org/?dummy +$cp +ln -T -s linux-gcc-1.0 $m/linux-gcc-1 - +$* --dump-machines --verbose 1 $u >- # Bootstrap. + +$* --dump-machines --verbose 1 >- # Bootstrap. : no-machine : - $* --dump-task $u <>~"%EOE%d" + $* --dump-task <>~"%EOE%d" : 1 name: foo version: 1.2.3 @@ -142,7 +140,7 @@ rm = $src_base/btrfs-rmdir /build/machines : result : - $* --dump-result $u <>EOO 2>>~"%EOE%d" + $* --dump-result <>EOO 2>>~"%EOE%d" : 1 name: foo version: 1.2.3 -- cgit v1.1