mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
automation: call expect script with redirected standard error
In the console expect script, "send_error" will send a message to standard error. Current use of this script redirects only standard output into a pipeline. This causes the error messages to sometimes appear hidden in the middle of the test logs. Redirect also standard error to clearly show when a test has timed out or hit EOF. Signed-off-by: Victor Lira <victorm.lira@amd.com> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
This commit is contained in:
1 parent
949cc342d4
commit
a406195c15
12 files changed
+12
-12
No files matched your search
+1
-1
@@ -166,7 +166,7 @@ task:
|
||||
export TEST_LOG="serial-${FREEBSD_BUILD}-${XTF_ARCH}.txt"
|
||||
export PASSED="Test result: SUCCESS"
|
||||
export TEST_TIMEOUT=120
|
||||
./automation/scripts/console.exp | sed 's/\r\+$//'
|
||||
./automation/scripts/console.exp |& sed 's/\r\+$//'
|
||||
|
||||
always:
|
||||
serial_artifacts:
|
||||
|
||||
@@ -114,7 +114,7 @@ function xtf_run_test()
|
||||
{
|
||||
rm -f ${TEST_LOG}
|
||||
export BOOT_MSG PASSED TEST_CMD TEST_LOG UBOOT_CMD
|
||||
./console.exp | sed 's/\r\+$//'
|
||||
./console.exp |& sed 's/\r\+$//'
|
||||
}
|
||||
|
||||
# Setup environment and run an XTF test.
|
||||
|
||||
@@ -84,4 +84,4 @@ export BOOT_MSG="Latest ChangeSet: "
|
||||
export LOG_MSG="Domain-0"
|
||||
export PASSED="BusyBox"
|
||||
|
||||
./automation/scripts/console.exp | sed 's/\r\+$//'
|
||||
./automation/scripts/console.exp |& sed 's/\r\+$//'
|
||||
@@ -96,4 +96,4 @@ export BOOT_MSG="Latest ChangeSet: "
|
||||
export LOG_MSG="Domain-0"
|
||||
export PASSED="/ #"
|
||||
|
||||
../automation/scripts/console.exp | sed 's/\r\+$//'
|
||||
../automation/scripts/console.exp |& sed 's/\r\+$//'
|
||||
@@ -106,4 +106,4 @@ export TEST_LOG="smoke.serial"
|
||||
export LOG_MSG="Domain-0"
|
||||
export PASSED="BusyBox"
|
||||
|
||||
./automation/scripts/console.exp | sed 's/\r\+$//'
|
||||
./automation/scripts/console.exp |& sed 's/\r\+$//'
|
||||
@@ -149,4 +149,4 @@ export TEST_LOG="${serial_log}"
|
||||
export LOG_MSG="${dom0_prompt}"
|
||||
export PASSED="${passed}"
|
||||
|
||||
../automation/scripts/console.exp | sed 's/\r\+$//'
|
||||
../automation/scripts/console.exp |& sed 's/\r\+$//'
|
||||
@@ -218,4 +218,4 @@ export TEST_LOG="smoke.serial"
|
||||
export LOG_MSG="Welcome to Alpine Linux"
|
||||
export PASSED="${passed}"
|
||||
|
||||
./automation/scripts/console.exp | sed 's/\r\+$//'
|
||||
./automation/scripts/console.exp |& sed 's/\r\+$//'
|
||||
@@ -24,4 +24,4 @@ export TEST_CMD="qemu-system-ppc64 \
|
||||
export TEST_LOG="${serial_log}"
|
||||
export PASSED="Hello, ppc64le!"
|
||||
|
||||
./automation/scripts/console.exp | sed 's/\r\+$//'
|
||||
./automation/scripts/console.exp |& sed 's/\r\+$//'
|
||||
@@ -16,4 +16,4 @@ export TEST_CMD="qemu-system-riscv64 \
|
||||
export TEST_LOG="smoke.serial"
|
||||
export PASSED="All set up"
|
||||
|
||||
./automation/scripts/console.exp | sed 's/\r\+$//'
|
||||
./automation/scripts/console.exp |& sed 's/\r\+$//'
|
||||
@@ -292,7 +292,7 @@ export LOG_MSG="\nWelcome to Alpine Linux"
|
||||
export TEST_CMD="ssh $CONTROLLER console"
|
||||
export TEST_LOG="smoke.serial"
|
||||
export TEST_TIMEOUT="$timeout"
|
||||
./automation/scripts/console.exp | sed 's/\r\+$//'
|
||||
./automation/scripts/console.exp |& sed 's/\r\+$//'
|
||||
TEST_RESULT=$?
|
||||
|
||||
if [ -n "$retrieve_xml" ]; then
|
||||
|
||||
@@ -173,7 +173,7 @@ export BOOT_MSG="Latest ChangeSet: "
|
||||
export TEST_CMD="cat ${SERIAL_DEV}"
|
||||
export TEST_LOG="smoke.serial"
|
||||
|
||||
./automation/scripts/console.exp | sed 's/\r\+$//'
|
||||
./automation/scripts/console.exp |& sed 's/\r\+$//'
|
||||
TEST_RESULT=$?
|
||||
sh "/scratch/gitlab-runner/${TEST_BOARD}.sh" 2
|
||||
exit ${TEST_RESULT}
|
||||
@@ -137,7 +137,7 @@ export LOG_MSG="Welcome to Alpine Linux"
|
||||
export TEST_CMD="cat ${SERIAL_DEV}"
|
||||
export TEST_LOG="smoke.serial"
|
||||
|
||||
./automation/scripts/console.exp | sed 's/\r\+$//'
|
||||
./automation/scripts/console.exp |& sed 's/\r\+$//'
|
||||
TEST_RESULT=$?
|
||||
sh "/scratch/gitlab-runner/zcu102.sh" 2
|
||||
exit ${TEST_RESULT}
|
||||