[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/5] tests/multiboot: Test exit code for every qemu r
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 3/5] tests/multiboot: Test exit code for every qemu run |
Date: |
Wed, 21 Mar 2018 15:41:05 +0100 |
Testing the exit code only once after a whole group of tests has
completed is not enough, it catches errors only in the very last qemu
invocation. We need to have the check after each qemu run.
The logging and diff with the reference output is still done once per
group to keep things more managable. This is not a problem because the
log file accumulates the output of all runs.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Jack Schwartz <address@hidden>
---
tests/multiboot/run_test.sh | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/tests/multiboot/run_test.sh b/tests/multiboot/run_test.sh
index 0278148b43..bc9c3670af 100755
--- a/tests/multiboot/run_test.sh
+++ b/tests/multiboot/run_test.sh
@@ -38,6 +38,17 @@ run_qemu() {
ret=$?
cat test.out >> test.log
+
+ debugexit=$((ret & 0x1))
+ ret=$((ret >> 1))
+
+ if [ $debugexit != 1 ]; then
+ printf %b "\e[31m ?? \e[0m $kernel $* (no debugexit used, exit code
$ret)\n"
+ pass=0
+ elif [ $ret != 0 ]; then
+ printf %b "\e[31mFAIL\e[0m $kernel $* (exit code $ret)\n"
+ pass=0
+ fi
}
mmap() {
@@ -61,19 +72,8 @@ make all
for t in mmap modules; do
echo > test.log
- $t
-
- debugexit=$((ret & 0x1))
- ret=$((ret >> 1))
pass=1
-
- if [ $debugexit != 1 ]; then
- printf %b "\e[31m ?? \e[0m $t (no debugexit used, exit code $ret)\n"
- pass=0
- elif [ $ret != 0 ]; then
- printf %b "\e[31mFAIL\e[0m $t (exit code $ret)\n"
- pass=0
- fi
+ $t
if ! diff $t.out test.log > /dev/null 2>&1; then
printf %b "\e[31mFAIL\e[0m $t (output difference)\n"
--
2.13.6
- [Qemu-devel] [PULL 0/5] Multiboot patches, Kevin Wolf, 2018/03/21
- [Qemu-devel] [PULL 2/5] multiboot: Check validity of mh_header_addr, Kevin Wolf, 2018/03/21
- [Qemu-devel] [PULL 1/5] multiboot: Reject kernels exceeding the address space, Kevin Wolf, 2018/03/21
- [Qemu-devel] [PULL 4/5] tests/multiboot: Add tests for the a.out kludge, Kevin Wolf, 2018/03/21
- [Qemu-devel] [PULL 5/5] tests/multiboot: Add .gitignore, Kevin Wolf, 2018/03/21
- [Qemu-devel] [PULL 3/5] tests/multiboot: Test exit code for every qemu run,
Kevin Wolf <=
- Re: [Qemu-devel] [PULL 0/5] Multiboot patches, Peter Maydell, 2018/03/22