diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20240729: rename quick_exit_test to exit_test +OLD_FILES+=usr/tests/lib/libc/stdlib/quick_exit_test + # 20240729: retire ifaddr_byindex OLD_FILES+=usr/share/man/man9/ifaddr_byindex.9.gz diff --git a/lib/libc/tests/stdlib/Makefile b/lib/libc/tests/stdlib/Makefile --- a/lib/libc/tests/stdlib/Makefile +++ b/lib/libc/tests/stdlib/Makefile @@ -3,6 +3,7 @@ ATF_TESTS_C+= clearenv_test ATF_TESTS_C+= dynthr_test ATF_TESTS_C+= heapsort_test +ATF_TESTS_C+= libc_exit_test ATF_TESTS_C+= mergesort_test ATF_TESTS_C+= qsort_test .if ${COMPILER_TYPE} == "clang" @@ -11,7 +12,6 @@ ATF_TESTS_C+= qsort_r_compat_test ATF_TESTS_C+= qsort_r_test ATF_TESTS_C+= qsort_s_test -ATF_TESTS_C+= quick_exit_test ATF_TESTS_C+= set_constraint_handler_s_test ATF_TESTS_C+= strfmon_test ATF_TESTS_C+= tsearch_test @@ -75,7 +75,6 @@ LIBADD.${t}+= netbsd util .endfor -LIBADD.libc_exit_test+= pthread LIBADD.strtod_test+= m SUBDIR+= dynthr_mod diff --git a/lib/libc/tests/stdlib/quick_exit_test.c b/lib/libc/tests/stdlib/libc_exit_test.c rename from lib/libc/tests/stdlib/quick_exit_test.c rename to lib/libc/tests/stdlib/libc_exit_test.c --- a/lib/libc/tests/stdlib/quick_exit_test.c +++ b/lib/libc/tests/stdlib/libc_exit_test.c @@ -12,32 +12,36 @@ #include -static void func_a(void) +static void +func_a(void) { if (write(STDOUT_FILENO, "a", 1) != 1) _Exit(1); } -static void func_b(void) +static void +func_b(void) { if (write(STDOUT_FILENO, "b", 1) != 1) _Exit(1); } -static void func_c(void) +static void +func_c(void) { if (write(STDOUT_FILENO, "c", 1) != 1) _Exit(1); } -static void child(void) +static void +child(void) { - // this will be received by the parent + /* this will be received by the parent */ printf("hello, "); fflush(stdout); - // this won't, because quick_exit() does not flush + /* this won't, because quick_exit() does not flush */ printf("world"); - // these will be called in reverse order, producing "abc" + /* these will be called in reverse order, producing "abc" */ if (at_quick_exit(func_c) != 0 || at_quick_exit(func_b) != 0 || at_quick_exit(func_a) != 0)