Skip to content

Commit b145c58

Browse files
committed
KVM: selftests: Make TEST_ASSERT_EQ() output look like normal TEST_ASSERT()
Clean up TEST_ASSERT_EQ() so that the (mostly) raw code is captured in the main assert message, not the helper macro's code. E.g. make this: x86_64/tsc_msrs_test.c:106: __a == __b pid=40470 tid=40470 errno=0 - Success 1 0x000000000040170e: main at tsc_msrs_test.c:106 2 0x0000000000416f23: __libc_start_call_main at libc-start.o:? 3 0x000000000041856f: __libc_start_main_impl at ??:? 4 0x0000000000401ef0: _start at ??:? TEST_ASSERT_EQ(rounded_host_rdmsr(MSR_IA32_TSC), val + 1) failed. rounded_host_rdmsr(MSR_IA32_TSC) is 0 val + 1 is 0x1 look like this: x86_64/tsc_msrs_test.c:106: rounded_host_rdmsr(MSR_IA32_TSC) == val + 1 pid=5737 tid=5737 errno=0 - Success 1 0x0000000000401714: main at tsc_msrs_test.c:106 2 0x0000000000415c23: __libc_start_call_main at libc-start.o:? 3 0x000000000041726f: __libc_start_main_impl at ??:? 4 0x0000000000401e60: _start at ??:? 0 != 0x1 (rounded_host_rdmsr(MSR_IA32_TSC) != val + 1) Opportunstically clean up the formatting of the entire macro. Link: https://lore.kernel.org/r/20230729003643.1053367-3-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 6d85f51 commit b145c58

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,13 @@ void test_assert(bool exp, const char *exp_str,
5353
#define TEST_ASSERT(e, fmt, ...) \
5454
test_assert((e), #e, __FILE__, __LINE__, fmt, ##__VA_ARGS__)
5555

56-
#define TEST_ASSERT_EQ(a, b) do { \
57-
typeof(a) __a = (a); \
58-
typeof(b) __b = (b); \
59-
TEST_ASSERT(__a == __b, \
60-
"TEST_ASSERT_EQ(%s, %s) failed.\n" \
61-
"\t%s is %#lx\n" \
62-
"\t%s is %#lx", \
63-
#a, #b, #a, (unsigned long) __a, #b, (unsigned long) __b); \
56+
#define TEST_ASSERT_EQ(a, b) \
57+
do { \
58+
typeof(a) __a = (a); \
59+
typeof(b) __b = (b); \
60+
test_assert(__a == __b, #a " == " #b, __FILE__, __LINE__, \
61+
"%#lx != %#lx (%s != %s)", \
62+
(unsigned long)(__a), (unsigned long)(__b), #a, #b);\
6463
} while (0)
6564

6665
#define TEST_ASSERT_KVM_EXIT_REASON(vcpu, expected) do { \

0 commit comments

Comments
 (0)