From b7af04e9262142e953e487e75d91b610f1001ab4 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Sat, 31 Dec 2022 06:52:08 +0100 Subject: tests: discover tool under test from $PATH This enables use in autopkgtests and makes it consistent with the create-and-run.sh test. --- tests/dist-upgrades.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/dist-upgrades.sh') diff --git a/tests/dist-upgrades.sh b/tests/dist-upgrades.sh index 01bcb59..e531f1c 100755 --- a/tests/dist-upgrades.sh +++ b/tests/dist-upgrades.sh @@ -33,16 +33,16 @@ EOF chmod +x upgrade ssh-keygen -f ssh_id -N '' -./debvm-create -k ssh_id.pub -r jessie -z 3 -- --customize-hook="copy-in upgrade /usr/local/bin" +debvm-create -k ssh_id.pub -r jessie -z 3 -- --customize-hook="copy-in upgrade /usr/local/bin" for RELEASE in stretch buster bullseye bookworm sid; do - timeout 15m ./debvm-run -s 2222 & + timeout 15m debvm-run -s 2222 & SSHOPT="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" test "$RELEASE" = stretch && SSHOPT="${SSHOPT} -o PubkeyAcceptedKeyTypes=+ssh-rsa" tests/try-ssh.sh "$SSHOPT -i ssh_id -p 2222 root@localhost" "upgrade $RELEASE" wait done -timeout 5m ./debvm-run -s 2222 & +timeout 5m debvm-run -s 2222 & tests/try-ssh.sh "-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ssh_id -p 2222 root@localhost" poweroff wait -- cgit v1.2.3