s390x: stsi: Make output tap13 compatible
PATCH 1/1 s390x: stsi: Make output tap13 compatible
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".
--- s390x/stsi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
s390x/stsi.c +3 -3
@@ -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" );
Signature · 1 line
2.25.1
Quoted 17 lines · Janosch Frank
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 <[email protected]>--- s390x/stsi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)s390x/stsi.c +0
-0@@ -129,11 +129,11 @@ static void test_3_2_2(void) }report (!memcmp (data->vm[0 ].uuid, uuid,sizeof (uuid)),"uuid" );
s390x/stsi.c static void test_3_2_2(void) · line 138
Quoted 10 lines
s390x/stsi.c +3
-3-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" );
Quoted 19 lines · Janosch Frank
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 <[email protected]>--- s390x/stsi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)s390x/stsi.c +0
-1@@ -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" );
s390x/stsi.c static void test_3_2_2(void) · line 139
Quoted 10 lines
s390x/stsi.c +3
-2+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.
Signature · 3 lines
Thanks, David / dhildenb
Quoted 8 lines · On Mon, 25 May 2020 10:43:40 +0200 Janosch Frank <[email protected]> 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 <[email protected]>--- s390x/stsi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)