From fb4e9d58e387af627e3599ddaa2ae553d078b6e1 Mon Sep 17 00:00:00 2001 From: James Nunez Date: Tue, 15 Nov 2016 14:05:49 -0700 Subject: [PATCH] LU-8832 tests: Generalize check of virtual machine The patch for LU-8248, commit 39582273a7a52fb, we added a function, called running_in_vm(), to check if the test is being run in a VM and, if so, ignore the performance results. The check for running in a VM needs to be updated to run correctly in a SLES environment. Test-Parameters: trivial clientdistro=sles11sp4 mdsdistro=sles11sp4 ossdistro=sles11sp4 testlist=sanity Signed-off-by: James Nunez Change-Id: Iebca20c6be81da7fef18e7d486cb59e3f3877eaa Reviewed-on: https://review.whamcloud.com/23774 Reviewed-by: Andreas Dilger Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Bob Glossman --- lustre/tests/test-framework.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 1a13b48..f3eb748 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -1000,7 +1000,8 @@ running_in_vm() { virt=$(dmidecode -s system-product-name | awk '{print $1}') case $virt in - VMware|KVM|VirtualBox|Parallels) echo ${virt,,} ;; + VMware|KVM|VirtualBox|Parallels) + echo $virt | tr '[A-Z]' '[a-z]' ;; *) ;; esac } -- 1.8.3.1