From 9ae3fa98544edbaeb633e53e942d5b6eadfd625c Mon Sep 17 00:00:00 2001 From: Ke Zhiming Date: Fri, 18 Dec 2020 15:27:52 +0800 Subject: [PATCH] virttest: testcases supported by different arch run failed and all exit Testcases supported by different arch skip run and exit 0. In this way, the remaining testcases can continue to execute Signed-off-by: Ke Zhiming --- tests/virttest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/virttest b/tests/virttest index 2c9d773..be0e421 100755 --- a/tests/virttest +++ b/tests/virttest @@ -253,9 +253,9 @@ logs_dir=$(awk -F= '/logs_dir/{print$2}' "$conf_file" | xargs | sed "s#^~#$(cd ~ [ -z "$logs_dir" ] && die "Not found logs_dir in avocado.conf" if [ "$arch" = "aarch64" ]; then - [ "$vt_machine_type" = "q35" ] && die "$arch vt_machine_type=$vt_machine_type" + [ "$vt_machine_type" = "q35" ] && echo "$arch vt_machine_type=$vt_machine_type, skip run" && exit 0 else - [ "$vt_machine_type" = "arm64-pci" ] && die "$arch vt_machine_type=$vt_machine_type" + [ "$vt_machine_type" = "arm64-pci" ] && echo "$arch vt_machine_type=$vt_machine_type, skip run" && exit 0 fi [ -z "$vt_name" ] && vt_name=$vt_reference -- Gitee