[v2,1/4] KVM: s390: selftests: Use TAP interface in the memop test

The memop test currently does not have any output (unless one of the
TEST_ASSERT statement fails), so it's hard to say for a user whether
a certain new sub-test has been included in the binary or not. Let's
make this a little bit more user-friendly and include some TAP output
via the kselftests.h interface.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tools/testing/selftests/kvm/s390x/memop.c | 90 ++++++++++++++++++-----
 1 file changed, 73 insertions(+), 17 deletions(-)

On 4/19/22 20:58, Thomas Huth wrote:
> The memop test currently does not have any output (unless one of the
> TEST_ASSERT statement fails), so it's hard to say for a user whether
> a certain new sub-test has been included in the binary or not. Let's
> make this a little bit more user-friendly and include some TAP output
> via the kselftests.h interface.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Janosch Frank <frankja@linux.ibm.com>

> ---
>   tools/testing/selftests/kvm/s390x/memop.c | 90 ++++++++++++++++++-----
>   1 file changed, 73 insertions(+), 17 deletions(-)
> 
> diff --git a/tools/testing/selftests/kvm/s390x/memop.c b/tools/testing/selftests/kvm/s390x/memop.c
> index b04c2c1b3c30..ad9fe86c0592 100644
> --- a/tools/testing/selftests/kvm/s390x/memop.c
> +++ b/tools/testing/selftests/kvm/s390x/memop.c
> @@ -12,6 +12,7 @@
>   
>   #include "test_util.h"
>   #include "kvm_util.h"
> +#include "kselftest.h"
>   
>   enum mop_target {
>   	LOGICAL,
> @@ -648,33 +649,88 @@ static void test_errors(void)
>   	kvm_vm_free(t.kvm_vm);
>   }
>   
> +struct testdef {
> +	const char *name;
> +	void (*test)(void);
> +	int cap;
> +} testlist[] = {
> +	{
> +		.name = "simple copy",
> +		.test = test_copy,
> +	},
> +	{
> +		.name = "generic error checks",
> +		.test = test_errors,
> +	},
> +	{
> +		.name = "copy with storage keys",
> +		.test = test_copy_key,
> +		.cap = KVM_CAP_S390_MEM_OP_EXTENSION,
> +	},
> +	{
> +		.name = "copy with key storage protection override",
> +		.test = test_copy_key_storage_prot_override,
> +		.cap = KVM_CAP_S390_MEM_OP_EXTENSION,
> +	},
> +	{
> +		.name = "copy with key fetch protection",
> +		.test = test_copy_key_fetch_prot,
> +		.cap = KVM_CAP_S390_MEM_OP_EXTENSION,
> +	},
> +	{
> +		.name = "copy with key fetch protection override",
> +		.test = test_copy_key_fetch_prot_override,
> +		.cap = KVM_CAP_S390_MEM_OP_EXTENSION,
> +	},
> +	{
> +		.name = "error checks with key",
> +		.test = test_errors_key,
> +		.cap = KVM_CAP_S390_MEM_OP_EXTENSION,
> +	},
> +	{
> +		.name = "error checks with key storage protection override",
> +		.test = test_errors_key_storage_prot_override,
> +		.cap = KVM_CAP_S390_MEM_OP_EXTENSION,
> +	},
> +	{
> +		.name = "error checks without key fetch prot override",
> +		.test = test_errors_key_fetch_prot_override_not_enabled,
> +		.cap = KVM_CAP_S390_MEM_OP_EXTENSION,
> +	},
> +	{
> +		.name = "error checks with key fetch prot override",
> +		.test = test_errors_key_fetch_prot_override_enabled,
> +		.cap = KVM_CAP_S390_MEM_OP_EXTENSION,
> +	},
> +};
> +
>   int main(int argc, char *argv[])
>   {
> -	int memop_cap, extension_cap;
> +	int memop_cap, extension_cap, idx;
>   
>   	setbuf(stdout, NULL);	/* Tell stdout not to buffer its content */
>   
> +	ksft_print_header();
> +
>   	memop_cap = kvm_check_cap(KVM_CAP_S390_MEM_OP);
>   	extension_cap = kvm_check_cap(KVM_CAP_S390_MEM_OP_EXTENSION);
>   	if (!memop_cap) {
> -		print_skip("CAP_S390_MEM_OP not supported");
> -		exit(KSFT_SKIP);
> +		ksft_exit_skip("CAP_S390_MEM_OP not supported.\n");
>   	}
>   
> -	test_copy();
> -	if (extension_cap > 0) {
> -		test_copy_key();
> -		test_copy_key_storage_prot_override();
> -		test_copy_key_fetch_prot();
> -		test_copy_key_fetch_prot_override();
> -		test_errors_key();
> -		test_errors_key_storage_prot_override();
> -		test_errors_key_fetch_prot_override_not_enabled();
> -		test_errors_key_fetch_prot_override_enabled();
> -	} else {
> -		print_skip("storage key memop extension not supported");
> +	ksft_set_plan(ARRAY_SIZE(testlist));
> +
> +	for (idx = 0; idx < ARRAY_SIZE(testlist); idx++) {
> +		if (!testlist[idx].cap || (extension_cap &&
> +		    testlist[idx].cap == KVM_CAP_S390_MEM_OP_EXTENSION)) {
> +			testlist[idx].test();
> +			ksft_test_result_pass("%s\n", testlist[idx].name);
> +		} else {
> +			ksft_test_result_skip("%s - capability %d not supported\n",
> +					      testlist[idx].name,
> +					      testlist[idx].cap);
> +		}
>   	}
> -	test_errors();
>   
> -	return 0;
> +	ksft_finished();
>   }