[libvirt] [PATCH 02/10] virt-aa-helper: Generalize test for firmware paths

[Guido Günther]

On Tue, May 23, 2017 at 06:22:40PM +0200, Stefan Bader wrote:
> From: Christian Ehrhardt <christian.ehrhardt at canonical.com>
> 
> This replaces individual tests for firmware locations by
> a generic function which will simplify having additional
> locations in the future.
> 
> Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
> Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
> ---
>  tests/virt-aa-helper-test | 29 ++++++++++++++++-------------
>  1 file changed, 16 insertions(+), 13 deletions(-)
> 
> diff --git a/tests/virt-aa-helper-test b/tests/virt-aa-helper-test
> index c05afc1..73f3080 100755
> --- a/tests/virt-aa-helper-test
> +++ b/tests/virt-aa-helper-test
> @@ -145,6 +145,20 @@ testme() {
>      fi
>  }
>  
> +testfw() {
> +    title="$1"
> +    fwpath="$2"
> +
> +    if [ -f "$fwpath" ]; then
> +        sed -e "s,###UUID###,$uuid,g"  \
> +            -e "s,###DISK###,$disk1,g" \
> +            -e "s,</os>,<loader readonly='yes' type='pflash'>$fwpath</loader></os>,g" "$template_xml" > "$test_xml"
> +        testme "0" "$title" "-r -u $valid_uuid" "$test_xml"
> +    else
> +        echo "Skipping FW $title test. Could not find $fwpath"
> +    fi
> +}
> +
>  # Expected failures
>  echo "Expected failures:" >$output
>  testme "1" "invalid arg" "-z"
> @@ -291,19 +305,8 @@ sed -e "s,###UUID###,$uuid,g" -e "s,###DISK###,$disk1,g" -e "s,</os>,<kernel>$tm
>  touch "$tmpdir/kernel"
>  testme "0" "kernel" "-r -u $valid_uuid" "$test_xml"
>  
> -if [ -f /usr/share/ovmf/OVMF.fd ]; then
> -    sed -e "s,###UUID###,$uuid,g"  \
> -        -e "s,###DISK###,$disk1,g" \
> -        -e "s,</os>,<loader readonly='yes' type='pflash'>/usr/share/ovmf/OVMF.fd</loader></os>,g" "$template_xml" > "$test_xml"
> -    testme "0" "ovmf" "-r -u $valid_uuid" "$test_xml"
> -elif [ -f /usr/share/OVMF/OVMF.fd ]; then
> -    sed -e "s,###UUID###,$uuid,g"  \
> -        -e "s,###DISK###,$disk1,g" \
> -        -e "s,</os>,<loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF.fd</loader></os>,g" "$template_xml" > "$test_xml"
> -    testme "0" "ovmf" "-r -u $valid_uuid" "$test_xml"
> -else
> -    echo "Skipping OVMF test. Could not find /usr/share/ovmf/OVMF.fd or /usr/share/OVMF/OVMF.fd"
> -fi
> +testfw "ovmf (old path)" "/usr/share/ovmf/OVMF.fd"
> +testfw "OVMF (new path)" "/usr/share/OVMF/OVMF_CODE.fd"
>  
>  sed -e "s,###UUID###,$uuid,g" -e "s,###DISK###,$disk1,g" -e "s,</os>,<initrd>$tmpdir/initrd</initrd></os>,g" "$template_xml" > "$test_xml"
>  touch "$tmpdir/initrd"
> -- 
> 2.7.4
> 
> --
> libvir-list mailing list
> libvir-list at redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
> 
ACK.
 -- Guido