| Message ID | 20190305033319.6825-1-yi.zhang@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [blktests] Fix the failure case which will exit with 0 | expand |
On 3/5/19 12:33 PM, Yi Zhang wrote: > The return value of a failing test was masked by the zoned test check. > Make sure to return either the original or zoned run failed value. > > Fixes: e840e15 ("config: Introduce RUN_ZONED_TESTS variable and > CAN_BE_ZONED flag") > Signed-off-by: Yi Zhang <yi.zhang@redhat.com> > --- > check | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/check b/check > index 819d8f3..c65270e 100755 > --- a/check > +++ b/check > @@ -431,11 +431,14 @@ _run_test() { > > RESULTS_DIR="$OUTPUT/nodev" > _call_test test > + local ret=$? > if (( RUN_ZONED_TESTS && CAN_BE_ZONED )); then > RESULTS_DIR="$OUTPUT/nodev_zoned" > RUN_FOR_ZONED=1 > _call_test test > + ret=$(( ret || $? )) > fi > + return $ret > else > if [[ ${#TEST_DEVS[@]} -eq 0 ]] && \ > declare -fF fallback_device >/dev/null; then Hi Yi Zhang, thank you for the fix for commit e840e15. The change is required, and looks good to me. Reviewed-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
On Tue, Mar 05, 2019 at 11:33:19AM +0800, Yi Zhang wrote: > The return value of a failing test was masked by the zoned test check. > Make sure to return either the original or zoned run failed value. > > Fixes: e840e15 ("config: Introduce RUN_ZONED_TESTS variable and > CAN_BE_ZONED flag") > Signed-off-by: Yi Zhang <yi.zhang@redhat.com> Thanks for the fix, applied.
diff --git a/check b/check index 819d8f3..c65270e 100755 --- a/check +++ b/check @@ -431,11 +431,14 @@ _run_test() { RESULTS_DIR="$OUTPUT/nodev" _call_test test + local ret=$? if (( RUN_ZONED_TESTS && CAN_BE_ZONED )); then RESULTS_DIR="$OUTPUT/nodev_zoned" RUN_FOR_ZONED=1 _call_test test + ret=$(( ret || $? )) fi + return $ret else if [[ ${#TEST_DEVS[@]} -eq 0 ]] && \ declare -fF fallback_device >/dev/null; then
The return value of a failing test was masked by the zoned test check. Make sure to return either the original or zoned run failed value. Fixes: e840e15 ("config: Introduce RUN_ZONED_TESTS variable and CAN_BE_ZONED flag") Signed-off-by: Yi Zhang <yi.zhang@redhat.com> --- check | 3 +++ 1 file changed, 3 insertions(+)