[PATCH kvm-unit-tests] runtime.bash: skip test when checked file doesn't exist

[PATCH kvm-unit-tests] runtime.bash: skip test when checked file doesn't exist

[Vitaly Kuznetsov]

Currently, we have the following check condition in x86/unittests.cfg:

check = /sys/module/kvm_intel/parameters/allow_smaller_maxphyaddr=Y

the check, however, passes successfully on AMD because the checked file
is just missing. This doesn't sound right, reverse the check: fail
if the content of the file doesn't match the expectation or if the
file is not there.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
 scripts/runtime.bash | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/runtime.bash b/scripts/runtime.bash
index 3121c1ffdae8..f94c094de03b 100644
--- a/scripts/runtime.bash
+++ b/scripts/runtime.bash
@@ -118,7 +118,10 @@ function run()
     for check_param in "${check[@]}"; do
         path=${check_param%%=*}
         value=${check_param#*=}
-        if [ -f "$path" ] && [ "$(cat $path)" != "$value" ]; then
+	if [ -z "$path" ]; then
+            continue
+	fi
+        if [ ! -f "$path" ] || [ "$(cat $path)" != "$value" ]; then
             print_result "SKIP" $testname "" "$path not equal to $value"
             return 2
         fi
-- 
2.25.4

Re: [PATCH kvm-unit-tests] runtime.bash: skip test when checked file doesn't exist

[Thomas Huth]

On 14/10/2020 17.42, Vitaly Kuznetsov wrote:
> Currently, we have the following check condition in x86/unittests.cfg:
> 
> check = /sys/module/kvm_intel/parameters/allow_smaller_maxphyaddr=Y
> 
> the check, however, passes successfully on AMD because the checked file
> is just missing. This doesn't sound right, reverse the check: fail
> if the content of the file doesn't match the expectation or if the
> file is not there.
> 
> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> ---
>  scripts/runtime.bash | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/runtime.bash b/scripts/runtime.bash
> index 3121c1ffdae8..f94c094de03b 100644
> --- a/scripts/runtime.bash
> +++ b/scripts/runtime.bash
> @@ -118,7 +118,10 @@ function run()
>      for check_param in "${check[@]}"; do
>          path=${check_param%%=*}
>          value=${check_param#*=}
> -        if [ -f "$path" ] && [ "$(cat $path)" != "$value" ]; then
> +	if [ -z "$path" ]; then
> +            continue
> +	fi

That runtime.bash script seems to use spaces for indentation, not tabs ...
so could you please use spaces for your patch, too?

 Thanks,
  Thomas

Re: [PATCH kvm-unit-tests] runtime.bash: skip test when checked file doesn't exist

[Vitaly Kuznetsov]

Thomas Huth <thuth@redhat.com> writes:

> On 14/10/2020 17.42, Vitaly Kuznetsov wrote:
>> Currently, we have the following check condition in x86/unittests.cfg:
>> 
>> check = /sys/module/kvm_intel/parameters/allow_smaller_maxphyaddr=Y
>> 
>> the check, however, passes successfully on AMD because the checked file
>> is just missing. This doesn't sound right, reverse the check: fail
>> if the content of the file doesn't match the expectation or if the
>> file is not there.
>> 
>> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
>> ---
>>  scripts/runtime.bash | 5 ++++-
>>  1 file changed, 4 insertions(+), 1 deletion(-)
>> 
>> diff --git a/scripts/runtime.bash b/scripts/runtime.bash
>> index 3121c1ffdae8..f94c094de03b 100644
>> --- a/scripts/runtime.bash
>> +++ b/scripts/runtime.bash
>> @@ -118,7 +118,10 @@ function run()
>>      for check_param in "${check[@]}"; do
>>          path=${check_param%%=*}
>>          value=${check_param#*=}
>> -        if [ -f "$path" ] && [ "$(cat $path)" != "$value" ]; then
>> +	if [ -z "$path" ]; then
>> +            continue
>> +	fi
>
> That runtime.bash script seems to use spaces for indentation, not tabs ...
> so could you please use spaces for your patch, too?
>

Yea, trusted my editior to do the right thing and it let me down... v2
is coming!

-- 
Vitaly