| Message ID | 20200525084340.1454-1-frankja@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [kvm-unit-tests] s390x: stsi: Make output tap13 compatible | expand |
On 25/05/2020 10.43, Janosch Frank wrote: > In tap13 output # is a special character and only "skip" and "todo" > are allowed to come after it. Let's appease our CI environment and > replace # with "count". > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > --- > s390x/stsi.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/s390x/stsi.c b/s390x/stsi.c > index 66b4257..b81cea7 100644 > --- a/s390x/stsi.c > +++ b/s390x/stsi.c > @@ -129,11 +129,11 @@ static void test_3_2_2(void) > } > > report(!memcmp(data->vm[0].uuid, uuid, sizeof(uuid)), "uuid"); > - report(data->vm[0].conf_cpus == smp_query_num_cpus(), "cpu # configured"); > + report(data->vm[0].conf_cpus == smp_query_num_cpus(), "cpu count configured"); > report(data->vm[0].total_cpus == > data->vm[0].reserved_cpus + data->vm[0].conf_cpus, > - "cpu # total == conf + reserved"); > - report(data->vm[0].standby_cpus == 0, "cpu # standby"); > + "cpu count total == conf + reserved"); > + report(data->vm[0].standby_cpus == 0, "cpu count standby"); > report(!memcmp(data->vm[0].name, vm_name, sizeof(data->vm[0].name)), > "VM name == kvm-unit-test"); Reviewed-by: Thomas Huth <thuth@redhat.com>
On 25.05.20 10:43, Janosch Frank wrote: > In tap13 output # is a special character and only "skip" and "todo" > are allowed to come after it. Let's appease our CI environment and > replace # with "count". > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > --- > s390x/stsi.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/s390x/stsi.c b/s390x/stsi.c > index 66b4257..b81cea7 100644 > --- a/s390x/stsi.c > +++ b/s390x/stsi.c > @@ -129,11 +129,11 @@ static void test_3_2_2(void) > } > > report(!memcmp(data->vm[0].uuid, uuid, sizeof(uuid)), "uuid"); > - report(data->vm[0].conf_cpus == smp_query_num_cpus(), "cpu # configured"); > + report(data->vm[0].conf_cpus == smp_query_num_cpus(), "cpu count configured"); > report(data->vm[0].total_cpus == > data->vm[0].reserved_cpus + data->vm[0].conf_cpus, > - "cpu # total == conf + reserved"); > - report(data->vm[0].standby_cpus == 0, "cpu # standby"); > + "cpu count total == conf + reserved"); > + report(data->vm[0].standby_cpus == 0, "cpu count standby"); > report(!memcmp(data->vm[0].name, vm_name, sizeof(data->vm[0].name)), > "VM name == kvm-unit-test"); > > Think you could just have applied a filter on top of the output instead. Reviewed-by: David Hildenbrand <david@redhat.com>
On Mon, 25 May 2020 10:43:40 +0200 Janosch Frank <frankja@linux.ibm.com> wrote: > In tap13 output # is a special character and only "skip" and "todo" > are allowed to come after it. Let's appease our CI environment and > replace # with "count". > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > --- > s390x/stsi.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Cornelia Huck <cohuck@redhat.com>
diff --git a/s390x/stsi.c b/s390x/stsi.c index 66b4257..b81cea7 100644 --- a/s390x/stsi.c +++ b/s390x/stsi.c @@ -129,11 +129,11 @@ static void test_3_2_2(void) } report(!memcmp(data->vm[0].uuid, uuid, sizeof(uuid)), "uuid"); - report(data->vm[0].conf_cpus == smp_query_num_cpus(), "cpu # configured"); + report(data->vm[0].conf_cpus == smp_query_num_cpus(), "cpu count configured"); report(data->vm[0].total_cpus == data->vm[0].reserved_cpus + data->vm[0].conf_cpus, - "cpu # total == conf + reserved"); - report(data->vm[0].standby_cpus == 0, "cpu # standby"); + "cpu count total == conf + reserved"); + report(data->vm[0].standby_cpus == 0, "cpu count standby"); report(!memcmp(data->vm[0].name, vm_name, sizeof(data->vm[0].name)), "VM name == kvm-unit-test");
In tap13 output # is a special character and only "skip" and "todo" are allowed to come after it. Let's appease our CI environment and replace # with "count". Signed-off-by: Janosch Frank <frankja@linux.ibm.com> --- s390x/stsi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)