From: Alex Zhuravlev Date: Sun, 15 Oct 2023 18:58:07 +0000 (+0300) Subject: LU-17198 tests: running_in_vm to recognize qemu X-Git-Tag: 2.15.59~41 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=9938228dc7e708fd8af93f12d3684f88701a4e5d;p=fs%2Flustre-release.git LU-17198 tests: running_in_vm to recognize qemu qemu is reported in dmidecode's system-manufacturer field, not in system-product-name Test-Parameters: trivial Signed-off-by: Alex Zhuravlev Change-Id: Id7e01ae2825835080d29ebec1750e53b87f5cf04 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52704 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin Reviewed-by: Jian Yu Reviewed-by: Andreas Dilger --- diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 958d5d7..fe752bf 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -1454,7 +1454,15 @@ running_in_vm() { case $virt in VMware|KVM|VirtualBox|Parallels|Bochs) - echo $virt | tr '[A-Z]' '[a-z]' ;; + echo $virt | tr '[A-Z]' '[a-z]' && return;; + + *) ;; + esac + + virt=$(dmidecode -s system-manufacturer | awk '{print $1}') + case $virt in + QEMU) + echo $virt | tr '[A-Z]' '[a-z]' && return;; *) ;; esac }