commit 0e47d123748dfdf251a3e8e865729ff198e8fef2
author Andrew Jeffery <andrew@aj.id.au> Mon May 02 10:08:11 2022 +0930
committer Andrew Jeffery <andrew@aj.id.au> Wed May 04 20:33:05 2022 +0000
tree 1022f4ec055c159c4a336658220a207b9760b44b
parent 625f285d818a5718bccf730f0df81b9e815dfa82

test-qemu: Re-join lines of broken ssh invocation

Change-Id: I49ff248e57d48b79e11811ef60413f632c2e02e0
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>

scripts/test-qemu

diff --git a/scripts/test-qemu b/scripts/test-qemu
index affb2c0..fd8ba8d 100755
--- a/scripts/test-qemu
+++ b/scripts/test-qemu
@@ -45,12 +45,7 @@
             -net user,hostfwd=:127.0.0.1:2222-:22,hostfwd=:127.0.0.1:2443-:443,hostname=qemu" \
     -c 'set timeout 120' \
     -c 'expect timeout { exit 1 } "login:"' \
-    -c 'spawn sshpass -p 0penBmc
-            ssh -o UserKnownHostsFile=/dev/null
-                -o StrictHostKeyChecking=no
-                -p2222
-                root@localhost
-                journalctl -b' \
+    -c 'spawn sshpass -p 0penBmc ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p2222 root@localhost journalctl -b' \
     -c 'expect -i $spawn_id eof'
 
 # AST2500
@@ -65,12 +60,7 @@
             -net user,hostfwd=:127.0.0.1:2222-:22,hostfwd=:127.0.0.1:2443-:443,hostname=qemu" \
     -c 'set timeout 120' \
     -c 'expect timeout { exit 1 } "login:"' \
-    -c 'spawn sshpass -p 0penBmc
-            ssh -o UserKnownHostsFile=/dev/null
-                -o StrictHostKeyChecking=no
-                -p2222
-                root@localhost
-                journalctl -b' \
+    -c 'spawn sshpass -p 0penBmc ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p2222 root@localhost journalctl -b' \
     -c 'expect -i $spawn_id eof'
 
 # AST2600
@@ -96,10 +86,5 @@
             -append \"console=ttyS4,115200n8 rootwait root=PARTLABEL=rofs-a\"" \
     -c 'set timeout 120' \
     -c 'expect timeout { exit 1 } "login:"' \
-    -c 'spawn sshpass -p 0penBmc
-            ssh -o UserKnownHostsFile=/dev/null
-                -o StrictHostKeyChecking=no
-                -p2222
-                root@localhost
-                journalctl -b' \
+    -c 'spawn sshpass -p 0penBmc ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p2222 root@localhost journalctl -b' \
     -c 'expect -i $spawn_id eof'