diff options
| author | Riku Voipio <riku.voipio@linaro.org> | 2014-02-05 16:02:29 +0200 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2014-02-05 16:02:29 +0200 |
| commit | c3f217dbdee597d7bd4fb1e8c9b3373482cbd223 (patch) | |
| tree | 89768f0351707496d48336bc11fb40ee786147c2 | |
| parent | 54c97731e94cde96fac4fce8b95b2078be0eea07 (diff) | |
check_return_fail did not work as expected
| -rw-r--r-- | lava/scripts/include/sh-test-lib | 10 | ||||
| -rwxr-xr-x | lava/scripts/test-guest.sh | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lava/scripts/include/sh-test-lib b/lava/scripts/include/sh-test-lib index 6c0e8f2..7e8c562 100644 --- a/lava/scripts/include/sh-test-lib +++ b/lava/scripts/include/sh-test-lib @@ -43,6 +43,16 @@ function check_return_fail() { fi } +function check_return_pass() { + if [ $? -eq 0 ]; then + pass_test + else + fail_test $1 + return 1 + fi +} + + function fail_test() { local reason=$1 echo "${TEST}: FAIL - ${reason}" diff --git a/lava/scripts/test-guest.sh b/lava/scripts/test-guest.sh index 6e59a82..913f6dd 100755 --- a/lava/scripts/test-guest.sh +++ b/lava/scripts/test-guest.sh @@ -79,7 +79,7 @@ loop=`losetup -f --show $ROOTFS_BUILD_FILENAME` TEST="xl-create-guest" xl -vvv create $root/files/guest1.xl -check_return_fail +check_return_pass # Disable exit on error during the waiting loop |