https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=10e50f9617a851469c007cfe98666c8bc22f960b
commit 10e50f9617a851469c007cfe98666c8bc22f960b Author: Jon Turney <[email protected]> Date: Tue Jul 11 15:27:47 2023 +0100 Cygwin: testsuite: Minor fixes to umask03 Change TCIDs to they match the filename Fix use of "%0" rather than "%o" Record failure on mismatched permissions, rather than immediately breaking See ltp commits fa31d55d, 923b23ff and b846e7bb https://github.com/linux-test-project/ltp/commit/fa31d55d3486830313bd044f7333697ce6124d22 https://github.com/linux-test-project/ltp/commit/923b23ff1fd1b77bd895949f9a6b4508c6485f33 https://github.com/linux-test-project/ltp/commit/b846e7bb9c1e6b00af25fdd28d88a5847fb0b052 Signed-off-by: Jon Turney <[email protected]> Diff: --- winsup/testsuite/winsup.api/ltp/umask03.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/winsup/testsuite/winsup.api/ltp/umask03.c b/winsup/testsuite/winsup.api/ltp/umask03.c index 341da7507..5209f051c 100644 --- a/winsup/testsuite/winsup.api/ltp/umask03.c +++ b/winsup/testsuite/winsup.api/ltp/umask03.c @@ -19,7 +19,7 @@ /* * NAME - * umask01.c + * umask03.c * * DESCRIPTION * Check that umask changes the mask, and that the previous @@ -30,7 +30,7 @@ * corresponds to the previous value set. * * USAGE: <for command-line> - * umask01 [-c n] [-i n] [-I x] [-P x] [-t] + * umask03 [-c n] [-i n] [-I x] [-P x] [-t] * where, -c n : Run n copies concurrently. * -i n : Execute test n times. * -I x : Execute test for x seconds. @@ -51,7 +51,7 @@ #include <sys/stat.h> #include <fcntl.h> -const char *TCID = "umask01"; +const char *TCID = "umask03"; int TST_TOTAL = 1; extern int Tst_count; @@ -68,6 +68,7 @@ main(int argc, char **argv) struct stat statbuf; unsigned mskval = 0000; + int failcnt = 0; int fildes, i; unsigned low9mode; @@ -99,12 +100,13 @@ main(int argc, char **argv) } else { low9mode = statbuf.st_mode & 0777; if (low9mode != (~mskval & 0777)) { - tst_brkm(TBROK, cleanup, - "got %0 expected %o" - "mask didnot take", + tst_resm(TFAIL, + "got mode %o expected %o " + "mask %o did not take", low9mode, - (~mskval & 0777)); - /*NOTREACHED*/ + (~mskval & 0777), + mskval); + failcnt++; } else { tst_resm(TPASS, "Test " "condition: %d, umask: " @@ -114,6 +116,9 @@ main(int argc, char **argv) } close(fildes); } + if (!failcnt) + tst_resm(TPASS, "umask correctly returns the " + "previous value for all masks"); } cleanup(); /*NOTREACHED*/
