Commit d0aac332 authored by Andrew Jones's avatar Andrew Jones Committed by Paolo Bonzini
Browse files

KVM: selftests: Use consistent message for test skipping 



Signed-off-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d9eaf19e

tools/testing/selftests/kvm/demand_paging_test.c

+2 −2
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ int main(int argc, char *argv[]) 


int main(void)

{

        printf("skip: Skipping userfaultfd test (missing __NR_userfaultfd)\n");

	print_skip("__NR_userfaultfd must be present for userfaultfd test");

	return KSFT_SKIP;

}

tools/testing/selftests/kvm/dirty_log_test.c

+1 −2
Original line number Diff line number Diff line
@@ -437,8 +437,7 @@ int main(int argc, char *argv[]) 
	dirty_log_manual_caps =

		kvm_check_cap(KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2);

	if (!dirty_log_manual_caps) {

		fprintf(stderr, "KVM_CLEAR_DIRTY_LOG not available, "

				"skipping tests\n");

		print_skip("KVM_CLEAR_DIRTY_LOG not available");

		exit(KSFT_SKIP);

	}

	dirty_log_manual_caps &= (KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE |

tools/testing/selftests/kvm/include/test_util.h

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ static inline int _no_printf(const char *format, ...) { return 0; } 
#define pr_info(...) _no_printf(__VA_ARGS__)

#endif



void print_skip(const char *fmt, ...) __attribute__((format(printf, 1, 2)));



ssize_t test_write(int fd, const void *buf, size_t count);

ssize_t test_read(int fd, void *buf, size_t count);

int test_seq_read(const char *path, char **bufp, size_t *sizep);

tools/testing/selftests/kvm/lib/assert.c

+4 −2
Original line number Diff line number Diff line
@@ -82,8 +82,10 @@ test_assert(bool exp, const char *exp_str, 
		}

		va_end(ap);



		if (errno == EACCES)

			ksft_exit_skip("Access denied - Exiting.\n");

		if (errno == EACCES) {

			print_skip("Access denied - Exiting");

			exit(KSFT_SKIP);

		}

		exit(254);

	}

tools/testing/selftests/kvm/lib/kvm_util.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static void vm_open(struct kvm_vm *vm, int perm) 
		exit(KSFT_SKIP);



	if (!kvm_check_cap(KVM_CAP_IMMEDIATE_EXIT)) {

		fprintf(stderr, "immediate_exit not available, skipping test\n");

		print_skip("immediate_exit not available");

		exit(KSFT_SKIP);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE