[PATCH v5 01/13] CI: set LOG_MSG as end-of-test marker consistently

Especially, do not set it to either empty string (not the same as
unset), nor to a message found earlier in the test execution. This
change will allow more consistent waiting for test end regardless of its
result.

Note for dom0less tests - waiting for dom0 prompt is not the right thing
to do, as the actual test is executed in domU, and those are started
asynchronously.

Signed-off-by: Marek Marczykowski-Górecki <[email protected]>
---
New in v5
---
 automation/scripts/qemu-alpine-x86_64.sh        | 1 -
 automation/scripts/qemu-smoke-dom0-arm32.sh     | 1 -
 automation/scripts/qemu-smoke-dom0-arm64.sh     | 1 -
 automation/scripts/qemu-smoke-dom0less-arm32.sh | 5 ++++-
 automation/scripts/qemu-smoke-dom0less-arm64.sh | 1 -
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh
index 242ffca693fe..0c60b2503858 100755
--- a/automation/scripts/qemu-alpine-x86_64.sh
+++ b/automation/scripts/qemu-alpine-x86_64.sh
@@ -81,7 +81,6 @@ export TEST_CMD="qemu-system-x86_64 \
 
 export TEST_LOG="smoke.serial"
 export BOOT_MSG="Latest ChangeSet: "
-export LOG_MSG="Domain-0"
 export PASSED="BusyBox"
 
 ./automation/scripts/console.exp |& sed 's/\r\+$//'
diff --git a/automation/scripts/qemu-smoke-dom0-arm32.sh b/automation/scripts/qemu-smoke-dom0-arm32.sh
index 5dc348c71aa9..4cda80843a84 100755
--- a/automation/scripts/qemu-smoke-dom0-arm32.sh
+++ b/automation/scripts/qemu-smoke-dom0-arm32.sh
@@ -91,7 +91,6 @@ export TEST_CMD="qemu-system-arm \
 export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000"
 export TEST_LOG="${serial_log}"
 export BOOT_MSG="Latest ChangeSet: "
-export LOG_MSG="Domain-0"
 export PASSED="/ #"
 
 ../automation/scripts/console.exp |& sed 's/\r\+$//'
diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh
index 1d673f184251..6defd51ca449 100755
--- a/automation/scripts/qemu-smoke-dom0-arm64.sh
+++ b/automation/scripts/qemu-smoke-dom0-arm64.sh
@@ -101,7 +101,6 @@ export TEST_CMD="qemu-system-aarch64 \
 export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000"
 export BOOT_MSG="Latest ChangeSet: "
 export TEST_LOG="smoke.serial"
-export LOG_MSG="Domain-0"
 export PASSED="BusyBox"
 
 ./automation/scripts/console.exp |& sed 's/\r\+$//'
diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh b/automation/scripts/qemu-smoke-dom0less-arm32.sh
index 20e43b4f049d..fff6d3b56df2 100755
--- a/automation/scripts/qemu-smoke-dom0less-arm32.sh
+++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh
@@ -144,7 +144,10 @@ export TEST_CMD="qemu-system-arm \
 export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000"
 export BOOT_MSG="Latest ChangeSet: "
 export TEST_LOG="${serial_log}"
-export LOG_MSG="${dom0_prompt}"
 export PASSED="${passed}"
 
 ../automation/scripts/console.exp |& sed 's/\r\+$//'
+
+if [ -n "$dom0_prompt" ]; then
+    grep "$dom0_prompt" "${serial_log}"
+fi
diff --git a/automation/scripts/qemu-smoke-dom0less-arm64.sh b/automation/scripts/qemu-smoke-dom0less-arm64.sh
index a9e99f1ae392..0d1244d3dc90 100755
--- a/automation/scripts/qemu-smoke-dom0less-arm64.sh
+++ b/automation/scripts/qemu-smoke-dom0less-arm64.sh
@@ -213,7 +213,6 @@ export TEST_CMD="qemu-system-aarch64 \
 
 export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000"
 export TEST_LOG="smoke.serial"
-export LOG_MSG="Welcome to Alpine Linux"
 export PASSED="${passed}"
 
 ./automation/scripts/console.exp |& sed 's/\r\+$//'
-- 
git-series 0.9.1