From cf154ec0d9b9a24fd086a7c606a16b8f95060aad Mon Sep 17 00:00:00 2001 From: Kenneth Myhra Date: Tue, 29 Mar 2022 21:36:41 +0200 Subject: [PATCH] tt: Port to LibMain --- Userland/Utilities/CMakeLists.txt | 2 +- Userland/Utilities/tt.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt index a2a90b1844..b616167b3e 100644 --- a/Userland/Utilities/CMakeLists.txt +++ b/Userland/Utilities/CMakeLists.txt @@ -210,7 +210,7 @@ target_link_libraries(traceroute LibMain) target_link_libraries(tree LibMain) target_link_libraries(true LibMain) target_link_libraries(truncate LibMain) -target_link_libraries(tt LibPthread) +target_link_libraries(tt LibPthread LibMain) target_link_libraries(umount LibMain) target_link_libraries(uname LibMain) target_link_libraries(uniq LibMain) diff --git a/Userland/Utilities/tt.cpp b/Userland/Utilities/tt.cpp index 574bd140e9..5c0929d2bd 100644 --- a/Userland/Utilities/tt.cpp +++ b/Userland/Utilities/tt.cpp @@ -5,11 +5,11 @@ */ #include +#include #include #include #include #include -#include #include #include #include @@ -22,7 +22,7 @@ static int staying_alive_test(); static int set_stack_test(); static int kill_test(); -int main(int argc, char** argv) +ErrorOr serenity_main(Main::Arguments arguments) { const char* test_name = "n"; @@ -31,7 +31,7 @@ int main(int argc, char** argv) "Exercise error-handling and edge-case paths of the execution environment " "(i.e., Kernel or UE) by doing unusual thread-related things."); args_parser.add_positional_argument(test_name, "Test to run (m = mutex, d = detached, p = priority, s = stack size, t = simple thread test, x = set stack, k = kill, nothing = join race)", "test-name", Core::ArgsParser::Required::No); - args_parser.parse(argc, argv); + args_parser.parse(arguments); if (*test_name == 'm') return mutex_test(); @@ -48,7 +48,7 @@ int main(int argc, char** argv) if (*test_name == 'k') return kill_test(); if (*test_name != 'n') { - args_parser.print_usage(stdout, argv[0]); + args_parser.print_usage(stdout, arguments.argv[0]); return 1; }