selftests/exec: load_address: conform test to TAP format output
authorMuhammad Usama Anjum <usama.anjum@collabora.com>
Mon, 4 Mar 2024 15:59:24 +0000 (20:59 +0500)
committerKees Cook <keescook@chromium.org>
Wed, 13 Mar 2024 18:54:19 +0000 (11:54 -0700)
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 <usama.anjum@collabora.com>
Link: https://lore.kernel.org/r/20240304155928.1818928-2-usama.anjum@collabora.com
Signed-off-by: Kees Cook <keescook@chromium.org>
tools/testing/selftests/exec/load_address.c

index d487c2f6a61509f6c4feb7930272c33f88d80239..17e3207d34ae7e74779964a44d62c8763d44a087 100644 (file)
@@ -5,6 +5,7 @@
 #include <link.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include "../kselftest.h"
 
 struct Statistics {
        unsigned long long load_address;
@@ -41,28 +42,23 @@ int main(int argc, char **argv)
        unsigned long long misalign;
        int ret;
 
+       ksft_print_header();
+       ksft_set_plan(1);
+
        ret = dl_iterate_phdr(ExtractStatistics, &extracted);
-       if (ret != 1) {
-               fprintf(stderr, "FAILED\n");
-               return 1;
-       }
+       if (ret != 1)
+               ksft_exit_fail_msg("FAILED: dl_iterate_phdr\n");
 
-       if (extracted.alignment == 0) {
-               fprintf(stderr, "No alignment found\n");
-               return 1;
-       } else if (extracted.alignment & (extracted.alignment - 1)) {
-               fprintf(stderr, "Alignment is not a power of 2\n");
-               return 1;
-       }
+       if (extracted.alignment == 0)
+               ksft_exit_fail_msg("FAILED: No alignment found\n");
+       else if (extracted.alignment & (extracted.alignment - 1))
+               ksft_exit_fail_msg("FAILED: Alignment is not a power of 2\n");
 
        misalign = extracted.load_address & (extracted.alignment - 1);
-       if (misalign) {
-               printf("alignment = %llu, load_address = %llu\n",
-                       extracted.alignment, extracted.load_address);
-               fprintf(stderr, "FAILED\n");
-               return 1;
-       }
+       if (misalign)
+               ksft_exit_fail_msg("FAILED: alignment = %llu, load_address = %llu\n",
+                                  extracted.alignment, extracted.load_address);
 
-       fprintf(stderr, "PASS\n");
-       return 0;
+       ksft_test_result_pass("Completed\n");
+       ksft_finished();
 }