Skip to content

Commit c409506

Browse files
musamaanjumkees
authored andcommitted
selftests/exec: load_address: conform test to TAP format output
Conform the layout, informational and status messages to TAP. No functional change is intended other than the layout of output messages. Signed-off-by: Muhammad Usama Anjum <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Kees Cook <[email protected]>
1 parent 99f5819 commit c409506

File tree

1 file changed

+15
-19
lines changed

1 file changed

+15
-19
lines changed

tools/testing/selftests/exec/load_address.c

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <link.h>
66
#include <stdio.h>
77
#include <stdlib.h>
8+
#include "../kselftest.h"
89

910
struct Statistics {
1011
unsigned long long load_address;
@@ -41,28 +42,23 @@ int main(int argc, char **argv)
4142
unsigned long long misalign;
4243
int ret;
4344

45+
ksft_print_header();
46+
ksft_set_plan(1);
47+
4448
ret = dl_iterate_phdr(ExtractStatistics, &extracted);
45-
if (ret != 1) {
46-
fprintf(stderr, "FAILED\n");
47-
return 1;
48-
}
49+
if (ret != 1)
50+
ksft_exit_fail_msg("FAILED: dl_iterate_phdr\n");
4951

50-
if (extracted.alignment == 0) {
51-
fprintf(stderr, "No alignment found\n");
52-
return 1;
53-
} else if (extracted.alignment & (extracted.alignment - 1)) {
54-
fprintf(stderr, "Alignment is not a power of 2\n");
55-
return 1;
56-
}
52+
if (extracted.alignment == 0)
53+
ksft_exit_fail_msg("FAILED: No alignment found\n");
54+
else if (extracted.alignment & (extracted.alignment - 1))
55+
ksft_exit_fail_msg("FAILED: Alignment is not a power of 2\n");
5756

5857
misalign = extracted.load_address & (extracted.alignment - 1);
59-
if (misalign) {
60-
printf("alignment = %llu, load_address = %llu\n",
61-
extracted.alignment, extracted.load_address);
62-
fprintf(stderr, "FAILED\n");
63-
return 1;
64-
}
58+
if (misalign)
59+
ksft_exit_fail_msg("FAILED: alignment = %llu, load_address = %llu\n",
60+
extracted.alignment, extracted.load_address);
6561

66-
fprintf(stderr, "PASS\n");
67-
return 0;
62+
ksft_test_result_pass("Completed\n");
63+
ksft_finished();
6864
}

0 commit comments

Comments
 (0)