From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id E63303858426; Fri, 14 Jul 2023 15:28:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E63303858426 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1689348518; bh=oO+Lq9uuHLLqOD0XuRGrEpQQrRdqlXVpfJPvEzTKef0=; h=From:To:Subject:Date:From; b=OsfRpRqCygU6EibkBxAD4fs6YounwafgB2NJuEHas2C6W/FcVLHu7dnu9CEqhEGtA IOe9FDp3x9RH7twCELablghVQOlM0i+Evsuq7prClYjg157u1TJj9/aA5TNwt/1p9Z n3gCUZ2T05xMoy3O89WXY6A9/nMIq4GH0GcomcMI= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Jon Turney To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: testsuite: Minor fixes to umask03 X-Act-Checkin: newlib-cygwin X-Git-Author: Jon Turney X-Git-Refname: refs/heads/master X-Git-Oldrev: 0e8227bbb746a1f85b9983aab7cef78a4fd41c9a X-Git-Newrev: 10e50f9617a851469c007cfe98666c8bc22f960b Message-Id: <20230714152838.E63303858426@sourceware.org> Date: Fri, 14 Jul 2023 15:28:38 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D10e50f9617a= 851469c007cfe98666c8bc22f960b commit 10e50f9617a851469c007cfe98666c8bc22f960b Author: Jon Turney Date: Tue Jul 11 15:27:47 2023 +0100 Cygwin: testsuite: Minor fixes to umask03 =20 Change TCIDs to they match the filename Fix use of "%0" rather than "%o" Record failure on mismatched permissions, rather than immediately break= ing =20 See ltp commits fa31d55d, 923b23ff and b846e7bb =20 https://github.com/linux-test-project/ltp/commit/fa31d55d3486830313bd04= 4f7333697ce6124d22 https://github.com/linux-test-project/ltp/commit/923b23ff1fd1b77bd89594= 9f9a6b4508c6485f33 https://github.com/linux-test-project/ltp/commit/b846e7bb9c1e6b00af25fd= d28d88a5847fb0b052 =20 Signed-off-by: Jon Turney 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/w= insup.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 @@ =20 /* * 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: - * 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 #include =20 -const char *TCID =3D "umask01"; +const char *TCID =3D "umask03"; int TST_TOTAL =3D 1; extern int Tst_count; =20 @@ -68,6 +68,7 @@ main(int argc, char **argv) =09 struct stat statbuf; unsigned mskval =3D 0000; + int failcnt =3D 0; int fildes, i; unsigned low9mode; =20 @@ -99,12 +100,13 @@ main(int argc, char **argv) } else { low9mode =3D statbuf.st_mode & 0777; if (low9mode !=3D (~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*/