[PATCH kvm-unit-tests] runtime.bash: fix check for parameter files

[PATCH kvm-unit-tests] runtime.bash: fix check for parameter files

[Paolo Bonzini]

We need to check if the file exists, not just if it is a non-empty string.
While an empty $path would have the unfortunate effect that "cat" would
read from stdin, that is not an issue as you can simply not do that.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 scripts/runtime.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

Re: [PATCH kvm-unit-tests] runtime.bash: fix check for parameter files

[Thomas Huth]

On 28/09/2020 13.34, Paolo Bonzini wrote:
> We need to check if the file exists, not just if it is a non-empty string.
> While an empty $path would have the unfortunate effect that "cat" would
> read from stdin, that is not an issue as you can simply not do that.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  scripts/runtime.bash | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/runtime.bash b/scripts/runtime.bash
> index 294e6b1..3121c1f 100644
> --- a/scripts/runtime.bash
> +++ b/scripts/runtime.bash
> @@ -118,7 +118,7 @@ function run()
>      for check_param in "${check[@]}"; do
>          path=${check_param%%=*}
>          value=${check_param#*=}
> -        if [ "$path" ] && [ "$(cat $path)" != "$value" ]; then
> +        if [ -f "$path" ] && [ "$(cat $path)" != "$value" ]; then
>              print_result "SKIP" $testname "" "$path not equal to $value"
>              return 2
>          fi

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH kvm-unit-tests] runtime.bash: fix check for parameter files

[Andrew Jones]

On Mon, Sep 28, 2020 at 07:34:12AM -0400, Paolo Bonzini wrote:
> We need to check if the file exists, not just if it is a non-empty string.
> While an empty $path would have the unfortunate effect that "cat" would
> read from stdin, that is not an issue as you can simply not do that.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  scripts/runtime.bash | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/runtime.bash b/scripts/runtime.bash
> index 294e6b1..3121c1f 100644
> --- a/scripts/runtime.bash
> +++ b/scripts/runtime.bash
> @@ -118,7 +118,7 @@ function run()
>      for check_param in "${check[@]}"; do
>          path=${check_param%%=*}
>          value=${check_param#*=}
> -        if [ "$path" ] && [ "$(cat $path)" != "$value" ]; then
> +        if [ -f "$path" ] && [ "$(cat $path)" != "$value" ]; then
>              print_result "SKIP" $testname "" "$path not equal to $value"
>              return 2
>          fi
> -- 
> 2.26.2
>

Reviewed-by: Andrew Jones <drjones@redhat.com>