test: fix detection of errors from iasl

[Qemu-devel] [PATCH] test: fix detection of errors from iasl

Daniel P. Berrange posted 1 patch 6 years, 6 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20171018131456.17536-1-berrange@redhat.com

Test checkpatch passed

Test docker passed

Test s390x passed

tests/bios-tables-test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[Qemu-devel] [PATCH] test: fix detection of errors from iasl

Posted by Daniel P. Berrange 6 years, 6 months ago

The conditional looking for errors while loading asl files would ignore
errors from loading the expected data, if the actual data succeeded.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 tests/bios-tables-test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index ee441f1e17..be05e8bcc2 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -458,7 +458,7 @@ static void test_acpi_asl(test_data *data)
         exp_asl = normalize_asl(exp_sdt->asl);
 
         /* TODO: check for warnings */
-        g_assert(!err || exp_err);
+        g_assert(!err && !exp_err);
 
         if (g_strcmp0(asl->str, exp_asl->str)) {
             if (exp_err) {
-- 
2.13.6

Re: [Qemu-devel] [PATCH] test: fix detection of errors from iasl

Posted by Michael S. Tsirkin 6 years, 5 months ago

On Wed, Oct 18, 2017 at 02:14:56PM +0100, Daniel P. Berrange wrote:
> The conditional looking for errors while loading asl files would ignore
> errors from loading the expected data, if the actual data succeeded.
> 
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

Problem is, some systems have a broken iasl.  If we can't load expected
data, qemu isn't broken, iasl is, so the test should pass.

I applied this in error, I've reverted this patch now.

> ---
>  tests/bios-tables-test.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> index ee441f1e17..be05e8bcc2 100644
> --- a/tests/bios-tables-test.c
> +++ b/tests/bios-tables-test.c
> @@ -458,7 +458,7 @@ static void test_acpi_asl(test_data *data)
>          exp_asl = normalize_asl(exp_sdt->asl);
>  
>          /* TODO: check for warnings */
> -        g_assert(!err || exp_err);
> +        g_assert(!err && !exp_err);
>  
>          if (g_strcmp0(asl->str, exp_asl->str)) {
>              if (exp_err) {
> -- 
> 2.13.6