| Message ID | 20240619091703.1410186-1-mingli.yu@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | acl: Fix nfs ptest failure | expand |
On 19 Jun 2024, at 10:17, Yu, Mingli via lists.openembedded.org <mingli.yu=eng.windriver.com@lists.openembedded.org> wrote: > +The nfs tests will be put into XPASS/XFAIL category as it defined in > +XFAIL_TESTS target, group all the test only in TESTS target as we prefer > +use PASS/FAIL/SKIP to indicate the result. XPASS/XFAIL is fine, we don’t need to change the tests. > diff --git a/meta/recipes-support/attr/acl/0001-test-nfs-nfsacl.test-Correct-the-check-item.patch b/meta/recipes-support/attr/acl/0001-test-nfs-nfsacl.test-Correct-the-check-item.patch > new file mode 100644 > index 0000000000..f990ca4a31 > --- /dev/null > +++ b/meta/recipes-support/attr/acl/0001-test-nfs-nfsacl.test-Correct-the-check-item.patch > @@ -0,0 +1,51 @@ > +From dfc6328f02821f9c6703f764ec6f53cf81daaab6 Mon Sep 17 00:00:00 2001 > +From: Mingli Yu <mingli.yu@windriver.com> > +Date: Mon, 17 Jun 2024 11:00:43 +0800 > +Subject: [PATCH] test/nfs/nfsacl.test: Correct the check item > + > +The date such as "Jun 13" should take 2 columns, so the expected check > +item "test/sub2" should the column 9. > + # ls test/sub2 -dl > +drwxr-xr-x 2 root root 4096 Jun 13 06:01 test/sub2 > + > +Upstream-Status: Submitted [https://lists.nongnu.org/archive/html/acl-devel/2024-06/msg00002.html] What this why the test is an XFAIL? In which case the previous patch should make it clear that we’re not removing XFAIL because we don’t like it, but because the tests are now fixed. > diff --git a/meta/recipes-support/attr/acl/run-ptest b/meta/recipes-support/attr/acl/run-ptest > index 3af75c84fe..7d88cc8484 100644 > --- a/meta/recipes-support/attr/acl/run-ptest > +++ b/meta/recipes-support/attr/acl/run-ptest > @@ -6,6 +6,7 @@ > > mkdir -p /tmp/acl-ptest/test > cp test/test.* /tmp/acl-ptest/test > +export EXPORT_PATH="/tmp/acl-ptest/test” Whilst you’re here, this looks fragile. Can you use mktemp -d to make a fresh directory for each run? Ross
Hello, On 6/19/24 11:17, Yu, Mingli wrote: > From: Mingli Yu<mingli.yu@windriver.com> > > * The date such as "Jun 13" should take 2 columns, so the expected check > item "test/sub2" should the column 9. > # ls test/sub2 -dl > drwxr-xr-x 2 root root 4096 Jun 13 06:01 test/sub2 > > Corret the check item to fix the below failure in the test/nfsacl.test. > [11] $ find test/sub2 | sort | xargs ls -dl | awk '{print $1,$8}' -- failed > drwxr-xr-x 07:23 != drwxr-xr-x test/sub2 > -rw-r--r-- 07:23 != -rw-r--r-- test/sub2/blah > > * Use the abosulte path otherwise we won't find the expected file blah. > > * The calls to getgrnam_r would always fail because the size of the > buffer was smaller than the minimum (170000) specified in the test > implementations of getgrnam_r and getpwnam_r. Use test_get*_match directly > because getpwnam and getgrnam should never fail on ERANGE. > > This commit fixes the following failure in the test/nfs/nfs-dir.test test: > > [16] $ su bin -- failed > su: user bin does not exist != ~ > > # ./run-ptest > PASS: test/cp.test > PASS: test/getfacl-lfs.test > PASS: test/getfacl-noacl.test > PASS: test/getfacl-recursive.test > PASS: test/malformed-restore.test > PASS: test/misc.test > PASS: test/sbits-restore.test > PASS: test/setfacl-X.test > PASS: test/utf8-filenames.test > PASS: test/root/getfacl.test > PASS: test/root/permissions.test > PASS: test/root/restore.test > PASS: test/root/setfacl.test > PASS: test/nfs/nfsacl.test > PASS: test/nfs/nfs-dir.test > ============================================================================ > Testsuite summary for acl 2.3.2 > ============================================================================ > # TOTAL: 15 > # PASS: 15 > # SKIP: 0 > # XFAIL: 0 > # FAIL: 0 > # XPASS: 0 > # ERROR: 0 > ============================================================================ > > Signed-off-by: Mingli Yu<mingli.yu@windriver.com> > --- The patch is intended to fix a ptest failure, but could it be causing this nfsacl.test failure? Please, check the following output: https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/6734/steps/13/logs/stdio and from the autobuilder logs: FAIL: test/nfs/nfsacl ===================== [6] $ umask 022 -- ok [7] $ mkdir -p test/sub -- ok [8] $ echo blah > test/sub/blah -- ok [10] $ cp -rp test/sub test/sub2 -- ok [11] $ find test/sub2 | sort | xargs ls -dl | awk '{print $1,$9}' -- ok [15] $ rm -rf test/sub2 -- ok [17] $ setfacl -m u:daemon:rwx test/sub -- ok [18] $ setfacl -dm u:daemon:rwx test/sub -- ok [19] $ getfattr -m- test/sub -- failed Can't exec "getfattr": No such file or directory at ./test/run line 369, <TEST_FILE> line 24. != # file: test/sub getfattr: No such file or directory != system.posix_acl_access ~ != system.posix_acl_default ~ != [25] $ cp -rp test/sub test/sub2 -- ok [26] $ find test/sub2 | sort | xargs ls -dl | awk '{print $1,$9}' -- ok [30] $ rm -rf test/sub2 -- ok [32] $ setfacl -m u:daemon:rw test/sub/blah -- ok [33] $ cp -rp test/sub test/sub2 -- ok [34] $ find test/sub2 | sort | xargs ls -dl | awk '{print $1,$9}' -- ok [38] $ rm -rf test/sub2 -- ok [42] $ rm -rf test -- ok 17 commands (16 passed, 1 failed) FAIL test/nfs/nfsacl.test (exit status: 1)
On 6/21/24 18:29, Joao Marcos Costa via lists.openembedded.org wrote: > ** > *CAUTION: This email comes from a non Wind River email account!* > Do not click links or open attachments unless you recognize the sender > and know the content is safe. > > Hello, > > On 6/19/24 11:17, Yu, Mingli wrote: >> From: Mingli Yu<mingli.yu@windriver.com> >> >> * The date such as "Jun 13" should take 2 columns, so the expected check >> item "test/sub2" should the column 9. >> # ls test/sub2 -dl >> drwxr-xr-x 2 root root 4096 Jun 13 06:01 test/sub2 >> >> Corret the check item to fix the below failure in the test/nfsacl.test. >> [11] $ find test/sub2 | sort | xargs ls -dl | awk '{print $1,$8}' -- failed >> drwxr-xr-x 07:23 != drwxr-xr-x test/sub2 >> -rw-r--r-- 07:23 != -rw-r--r-- test/sub2/blah >> >> * Use the abosulte path otherwise we won't find the expected file blah. >> >> * The calls to getgrnam_r would always fail because the size of the >> buffer was smaller than the minimum (170000) specified in the test >> implementations of getgrnam_r and getpwnam_r. Use test_get*_match directly >> because getpwnam and getgrnam should never fail on ERANGE. >> >> This commit fixes the following failure in the test/nfs/nfs-dir.test test: >> >> [16] $ su bin -- failed >> su: user bin does not exist != ~ >> >> # ./run-ptest >> PASS: test/cp.test >> PASS: test/getfacl-lfs.test >> PASS: test/getfacl-noacl.test >> PASS: test/getfacl-recursive.test >> PASS: test/malformed-restore.test >> PASS: test/misc.test >> PASS: test/sbits-restore.test >> PASS: test/setfacl-X.test >> PASS: test/utf8-filenames.test >> PASS: test/root/getfacl.test >> PASS: test/root/permissions.test >> PASS: test/root/restore.test >> PASS: test/root/setfacl.test >> PASS: test/nfs/nfsacl.test >> PASS: test/nfs/nfs-dir.test >> ============================================================================ >> Testsuite summary for acl 2.3.2 >> ============================================================================ >> # TOTAL: 15 >> # PASS: 15 >> # SKIP: 0 >> # XFAIL: 0 >> # FAIL: 0 >> # XPASS: 0 >> # ERROR: 0 >> ============================================================================ >> >> Signed-off-by: Mingli Yu<mingli.yu@windriver.com> >> --- > > The patch is intended to fix a ptest failure, but could it be causing > this nfsacl.test failure? > > Please, check the following output: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/6734/steps/13/logs/stdio > > and from the autobuilder logs: > > FAIL: test/nfs/nfsacl > ===================== > > [6] $ umask 022 -- ok > [7] $ mkdir -p test/sub -- ok > [8] $ echo blah > test/sub/blah -- ok > [10] $ cp -rp test/sub test/sub2 -- ok > [11] $ find test/sub2 | sort | xargs ls -dl | awk '{print $1,$9}' -- ok > [15] $ rm -rf test/sub2 -- ok > [17] $ setfacl -m u:daemon:rwx test/sub -- ok > [18] $ setfacl -dm u:daemon:rwx test/sub -- ok > [19] $ getfattr -m- test/sub -- failed > Can't exec "getfattr": No such file or directory at ./test/run line 369, > <TEST_FILE> line 24. != # file: test/sub > getfattr: No such file or directory != system.posix_acl_access > ~ != system.posix_acl_default I didn't reproduce this failure in my environment. XPASS: test/nfs/nfsacl ====================== [6] $ umask 022 -- ok [7] $ mkdir -p test/sub -- ok [8] $ echo blah > test/sub/blah -- ok [10] $ cp -rp test/sub test/sub2 -- ok [11] $ find test/sub2 | sort | xargs ls -dl | awk '{print $1,$9}' -- ok [15] $ rm -rf test/sub2 -- ok [17] $ setfacl -m u:daemon:rwx test/sub -- ok [18] $ setfacl -dm u:daemon:rwx test/sub -- ok [19] $ getfattr -m- test/sub -- ok [25] $ cp -rp test/sub test/sub2 -- ok [26] $ find test/sub2 | sort | xargs ls -dl | awk '{print $1,$9}' -- ok [30] $ rm -rf test/sub2 -- ok [32] $ setfacl -m u:daemon:rw test/sub/blah -- ok [33] $ cp -rp test/sub test/sub2 -- ok [34] $ find test/sub2 | sort | xargs ls -dl | awk '{print $1,$9}' -- ok [38] $ rm -rf test/sub2 -- ok [42] $ rm -rf test -- ok 17 commands (17 passed, 0 failed) XPASS test/nfs/nfsacl.test (exit status: 0) Thanks, > ~ != > [25] $ cp -rp test/sub test/sub2 -- ok > [26] $ find test/sub2 | sort | xargs ls -dl | awk '{print $1,$9}' -- ok > [30] $ rm -rf test/sub2 -- ok > [32] $ setfacl -m u:daemon:rw test/sub/blah -- ok > [33] $ cp -rp test/sub test/sub2 -- ok > [34] $ find test/sub2 | sort | xargs ls -dl | awk '{print $1,$9}' -- ok > [38] $ rm -rf test/sub2 -- ok > [42] $ rm -rf test -- ok > 17 commands (16 passed, 1 failed) > FAIL test/nfs/nfsacl.test (exit status: 1) > > -- > Best regards, > João Marcos Costa > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#201005): https://lists.openembedded.org/g/openembedded-core/message/201005 > Mute This Topic: https://lists.openembedded.org/mt/106757200/3618448 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [mingli.yu@eng.windriver.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On 6/20/24 00:45, Ross Burton wrote: > CAUTION: This email comes from a non Wind River email account! > Do not click links or open attachments unless you recognize the sender and know the content is safe. > > On 19 Jun 2024, at 10:17, Yu, Mingli via lists.openembedded.org <mingli.yu=eng.windriver.com@lists.openembedded.org> wrote: >> +The nfs tests will be put into XPASS/XFAIL category as it defined in >> +XFAIL_TESTS target, group all the test only in TESTS target as we prefer >> +use PASS/FAIL/SKIP to indicate the result. > > XPASS/XFAIL is fine, we don’t need to change the tests. Okay, I will move back these two cases to XPASS/XFAIL. > >> diff --git a/meta/recipes-support/attr/acl/0001-test-nfs-nfsacl.test-Correct-the-check-item.patch b/meta/recipes-support/attr/acl/0001-test-nfs-nfsacl.test-Correct-the-check-item.patch >> new file mode 100644 >> index 0000000000..f990ca4a31 >> --- /dev/null >> +++ b/meta/recipes-support/attr/acl/0001-test-nfs-nfsacl.test-Correct-the-check-item.patch >> @@ -0,0 +1,51 @@ >> +From dfc6328f02821f9c6703f764ec6f53cf81daaab6 Mon Sep 17 00:00:00 2001 >> +From: Mingli Yu <mingli.yu@windriver.com> >> +Date: Mon, 17 Jun 2024 11:00:43 +0800 >> +Subject: [PATCH] test/nfs/nfsacl.test: Correct the check item >> + >> +The date such as "Jun 13" should take 2 columns, so the expected check >> +item "test/sub2" should the column 9. >> + # ls test/sub2 -dl >> +drwxr-xr-x 2 root root 4096 Jun 13 06:01 test/sub2 >> + >> +Upstream-Status: Submitted [https://lists.nongnu.org/archive/html/acl-devel/2024-06/msg00002.html] > > What this why the test is an XFAIL? In which case the previous patch should make it clear that we’re not removing XFAIL because we don’t like it, but because the tests are now fixed. That's okay, will move back these two cases to XPASS/XFAIL. > >> diff --git a/meta/recipes-support/attr/acl/run-ptest b/meta/recipes-support/attr/acl/run-ptest >> index 3af75c84fe..7d88cc8484 100644 >> --- a/meta/recipes-support/attr/acl/run-ptest >> +++ b/meta/recipes-support/attr/acl/run-ptest >> @@ -6,6 +6,7 @@ >> >> mkdir -p /tmp/acl-ptest/test >> cp test/test.* /tmp/acl-ptest/test >> +export EXPORT_PATH="/tmp/acl-ptest/test” > > Whilst you’re here, this looks fragile. Can you use mktemp -d to make a fresh directory for each run? The directory which used to include not only the test file, but also the file used for test such as test.passwd and test.group, and this directory is preconfigured during build as https://git.openembedded.org/openembedded-core/tree/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch. Thanks, > > Ross >
diff --git a/meta/recipes-support/attr/acl/0001-test-Unify-the-nfs-test-output.patch b/meta/recipes-support/attr/acl/0001-test-Unify-the-nfs-test-output.patch new file mode 100644 index 0000000000..723e6cdca8 --- /dev/null +++ b/meta/recipes-support/attr/acl/0001-test-Unify-the-nfs-test-output.patch @@ -0,0 +1,40 @@ +From db81973228be2b143fdba0e3d959c016122bc29e Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 19 Jun 2024 14:05:44 +0800 +Subject: [PATCH] test: Unify the nfs test output + +The nfs tests will be put into XPASS/XFAIL category as it defined in +XFAIL_TESTS target, group all the test only in TESTS target as we prefer +use PASS/FAIL/SKIP to indicate the result. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + test/Makemodule.am | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/test/Makemodule.am b/test/Makemodule.am +index cffe732..609953b 100644 +--- a/test/Makemodule.am ++++ b/test/Makemodule.am +@@ -1,6 +1,3 @@ +-XFAIL_TESTS = \ +- test/nfs/nfsacl.test \ +- test/nfs/nfs-dir.test + TESTS = \ + test/cp.test \ + test/getfacl-lfs.test \ +@@ -15,7 +12,8 @@ TESTS = \ + test/root/permissions.test \ + test/root/restore.test \ + test/root/setfacl.test \ +- $(XFAIL_TESTS) ++ test/nfs/nfsacl.test \ ++ test/nfs/nfs-dir.test + + EXTRA_DIST += \ + test/make-tree \ +-- +2.34.1 + diff --git a/meta/recipes-support/attr/acl/0001-test-nfs-nfs-dir.test-Use-the-abosulte-path.patch b/meta/recipes-support/attr/acl/0001-test-nfs-nfs-dir.test-Use-the-abosulte-path.patch new file mode 100644 index 0000000000..c48ee9f820 --- /dev/null +++ b/meta/recipes-support/attr/acl/0001-test-nfs-nfs-dir.test-Use-the-abosulte-path.patch @@ -0,0 +1,46 @@ +From e87562e4e03450e380bd1ce8e11c561e8f9653d2 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Mon, 17 Jun 2024 11:22:21 +0800 +Subject: [PATCH] test/nfs/nfs-dir.test: Use the abosulte path + +Use the abosulte path otherwise we won't find the expected file blah. + +Upstream-Status: Submitted [https://lists.nongnu.org/archive/html/acl-devel/2024-06/msg00001.html] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + test/nfs/nfs-dir.test | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/test/nfs/nfs-dir.test b/test/nfs/nfs-dir.test +index 33e5f5f..7216a6e 100644 +--- a/test/nfs/nfs-dir.test ++++ b/test/nfs/nfs-dir.test +@@ -14,7 +14,7 @@ EXPORT_PATH => the path that is mounted at the working directory. + Make sure the file can be accessed before. + + $ su bin +- $ cat test/blah ++ $ cat %{EXPORT_PATH}/test/blah + > blah + + Set up a situation that triggers the bug. +@@ -36,12 +36,12 @@ EXPORT_PATH => the path that is mounted at the working directory. + fail with "Stale NFS file handle" or "Input/output error". + + $ su bin +- $ cat test/blah ++ $ cat %{EXPORT_PATH}/test/blah + > blah + $ sleep 3 +- $ cat test/blah ++ $ cat %{EXPORT_PATH}/test/blah + > blah +- $ cat test/blah ++ $ cat %{EXPORT_PATH}/test/blah + > blah + + Clean up. +-- +2.34.1 + diff --git a/meta/recipes-support/attr/acl/0001-test-nfs-nfsacl.test-Correct-the-check-item.patch b/meta/recipes-support/attr/acl/0001-test-nfs-nfsacl.test-Correct-the-check-item.patch new file mode 100644 index 0000000000..f990ca4a31 --- /dev/null +++ b/meta/recipes-support/attr/acl/0001-test-nfs-nfsacl.test-Correct-the-check-item.patch @@ -0,0 +1,51 @@ +From dfc6328f02821f9c6703f764ec6f53cf81daaab6 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Mon, 17 Jun 2024 11:00:43 +0800 +Subject: [PATCH] test/nfs/nfsacl.test: Correct the check item + +The date such as "Jun 13" should take 2 columns, so the expected check +item "test/sub2" should the column 9. + # ls test/sub2 -dl +drwxr-xr-x 2 root root 4096 Jun 13 06:01 test/sub2 + +Upstream-Status: Submitted [https://lists.nongnu.org/archive/html/acl-devel/2024-06/msg00002.html] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + test/nfs/nfsacl.test | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/test/nfs/nfsacl.test b/test/nfs/nfsacl.test +index 4f37322..dfcc323 100644 +--- a/test/nfs/nfsacl.test ++++ b/test/nfs/nfsacl.test +@@ -8,7 +8,7 @@ The test should be run on an NFS export mount with ACL support. + $ echo blah > test/sub/blah + + $ cp -rp test/sub test/sub2 +- $ find test/sub2 | sort | xargs ls -dl | awk '{print $1,$8}' ++ $ find test/sub2 | sort | xargs ls -dl | awk '{print $1,$9}' + > drwxr-xr-x test/sub2 + > -rw-r--r-- test/sub2/blah + +@@ -23,7 +23,7 @@ The test should be run on an NFS export mount with ACL support. + > + + $ cp -rp test/sub test/sub2 +- $ find test/sub2 | sort | xargs ls -dl | awk '{print $1,$8}' ++ $ find test/sub2 | sort | xargs ls -dl | awk '{print $1,$9}' + > drwxrwxr-x+ test/sub2 + > -rw-r--r-- test/sub2/blah + +@@ -31,7 +31,7 @@ The test should be run on an NFS export mount with ACL support. + + $ setfacl -m u:daemon:rw test/sub/blah + $ cp -rp test/sub test/sub2 +- $ find test/sub2 | sort | xargs ls -dl | awk '{print $1,$8}' ++ $ find test/sub2 | sort | xargs ls -dl | awk '{print $1,$9}' + > drwxrwxr-x+ test/sub2 + > -rw-rw-r--+ test/sub2/blah + +-- +2.34.1 + diff --git a/meta/recipes-support/attr/acl/0001-tests-fix-getpwnam-and-getgrnam.patch b/meta/recipes-support/attr/acl/0001-tests-fix-getpwnam-and-getgrnam.patch new file mode 100644 index 0000000000..2fea254fec --- /dev/null +++ b/meta/recipes-support/attr/acl/0001-tests-fix-getpwnam-and-getgrnam.patch @@ -0,0 +1,67 @@ +From 6398d3fe7a766b4e3cd15bb77fd0f15f7dba52b2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com> +Date: Wed, 19 Jun 2024 11:11:30 +0800 +Subject: [PATCH] tests: fix getpwnam and getgrnam +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The calls to these functions would always fail because the size of the buffer +was smaller than the minimum (170000) specified in the test implementations +of getgrnam_r and getpwnam_r. Use test_get*_match directly because getpwnam +and getgrnam should never fail on ERANGE. + +This commit fixes the following failure in the test/root/restore.test test: + +[21] $ chown bin passwd -- failed +chown: invalid user: ‘bin’ != ~ + +Fixes: 3737f000d3f17cd283f51eeacac21a71a3472053 ("use thread-safe getpwnam_r +and getgrnam_r") + +Upstream-Status: Submitted [https://lists.nongnu.org/archive/html/acl-devel/2024-06/msg00000.html] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + test/test_group.c | 2 +- + test/test_passwd.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/test/test_group.c b/test/test_group.c +index 96dd612..42d6b07 100644 +--- a/test/test_group.c ++++ b/test/test_group.c +@@ -136,7 +136,7 @@ struct group *getgrnam(const char *name) + static struct group grp; + struct group *result; + +- (void) getgrnam_r(name, &grp, buf, sizeof(buf), &result); ++ (void) test_getgr_match(&grp, buf, sizeof buf, &result, match_name, name); + return result; + } + +diff --git a/test/test_passwd.c b/test/test_passwd.c +index 9428bf8..97f2673 100644 +--- a/test/test_passwd.c ++++ b/test/test_passwd.c +@@ -119,7 +119,7 @@ int getpwnam_r(const char *name, struct passwd *pwd, char *buf, size_t buflen, + *result = NULL; + return ERANGE; + } +- last_buflen =- 1; ++ last_buflen = -1; + + return test_getpw_match(pwd, buf, buflen, result, match_name, name); + } +@@ -131,7 +131,7 @@ struct passwd *getpwnam(const char *name) + static struct passwd pwd; + struct passwd *result; + +- (void) getpwnam_r(name, &pwd, buf, sizeof(buf), &result); ++ (void) test_getpw_match(&pwd, buf, sizeof(buf), &result, match_name, name); + return result; + } + +-- +2.34.1 + diff --git a/meta/recipes-support/attr/acl/run-ptest b/meta/recipes-support/attr/acl/run-ptest index 3af75c84fe..7d88cc8484 100644 --- a/meta/recipes-support/attr/acl/run-ptest +++ b/meta/recipes-support/attr/acl/run-ptest @@ -6,6 +6,7 @@ mkdir -p /tmp/acl-ptest/test cp test/test.* /tmp/acl-ptest/test +export EXPORT_PATH="/tmp/acl-ptest/test" set +e make test-suite.log diff --git a/meta/recipes-support/attr/acl_2.3.2.bb b/meta/recipes-support/attr/acl_2.3.2.bb index 6178473873..536ad27de7 100644 --- a/meta/recipes-support/attr/acl_2.3.2.bb +++ b/meta/recipes-support/attr/acl_2.3.2.bb @@ -19,6 +19,10 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.tar.gz \ file://run-ptest \ file://0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch \ file://0001-test-patch-out-failing-bits.patch \ + file://0001-test-nfs-nfsacl.test-Correct-the-check-item.patch \ + file://0001-test-nfs-nfs-dir.test-Use-the-abosulte-path.patch \ + file://0001-tests-fix-getpwnam-and-getgrnam.patch \ + file://0001-test-Unify-the-nfs-test-output.patch \ " SRC_URI[sha256sum] = "5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c"