On 07/05/2018 23:08, Shuah Khan (Samsung OSG) wrote:

When kvm test is skipped because of unmet dependencies and/or unsupported configuration, it exits with error which is treated as a fail by the Kselftest framework. This leads to false negative result even when the test could not be run.

Change it to return kselftest skip code when a test gets skipped to clearly report that the test could not be run.

Change it to use ksft_exit_skip() when the test is skipped. In addition, refine test_assert() message to include strerror() string and add explicit check for EACCES to cleary identify when test doesn't run when access is denied to resources required e.g: open /dev/kvm failed, rc: -1 errno: 13

Signed-off-by: Shuah Khan (Samsung OSG) shuah@kernel.org

Changes since v1:

• Don't do root check at the top of assert.
• Instead do check for EACCES.

tools/testing/selftests/kvm/lib/assert.c | 9 +++++++-- tools/testing/selftests/kvm/vmx_tsc_adjust_test.c | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/kvm/lib/assert.c b/tools/testing/selftests/kvm/lib/assert.c index c9f5b7d4ce38..cd01144d27c8 100644 --- a/tools/testing/selftests/kvm/lib/assert.c +++ b/tools/testing/selftests/kvm/lib/assert.c @@ -13,6 +13,8 @@ #include <execinfo.h> #include <sys/syscall.h> +#include "../../kselftest.h"

/* Dumps the current stack trace to stderr. */ static void __attribute__((noinline)) test_dump_stack(void); static void test_dump_stack(void) @@ -70,8 +72,9 @@ test_assert(bool exp, const char *exp_str, fprintf(stderr, "==== Test Assertion Failure ====\n" " %s:%u: %s\n"

• 	"  pid=%d tid=%d\n",
  

• 	file, line, exp_str, getpid(), gettid());
  

• 	"  pid=%d tid=%d - %s\n",
  

• 	file, line, exp_str, getpid(), gettid(),
  

• 	strerror(errno));
  

  test_dump_stack(); if (fmt) { fputs(" ", stderr);

@@ -80,6 +83,8 @@ test_assert(bool exp, const char *exp_str, } va_end(ap);

• if (errno == EACCES)
  

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

  exit(254); }

diff --git a/tools/testing/selftests/kvm/vmx_tsc_adjust_test.c b/tools/testing/selftests/kvm/vmx_tsc_adjust_test.c index 8f7f62093add..62fb73699eb6 100644 --- a/tools/testing/selftests/kvm/vmx_tsc_adjust_test.c +++ b/tools/testing/selftests/kvm/vmx_tsc_adjust_test.c @@ -28,6 +28,8 @@ #include <string.h> #include <sys/ioctl.h> +#include "../kselftest.h"

#ifndef MSR_IA32_TSC_ADJUST #define MSR_IA32_TSC_ADJUST 0x3b #endif @@ -190,7 +192,7 @@ int main(int argc, char *argv[]) if (!(entry->ecx & CPUID_VMX)) { printf("nested VMX not enabled, skipping test");

• return 0;
  

• return KSFT_SKIP;
  

  }

vm = vm_create_default_vmx(VCPU_ID, (void *) l1_guest_code);

Acked-by: Paolo Bonzini pbonzini@redhat.com -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html