]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
Reapply "glibc: Enable NFS local file locking for glibc tests"
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 13 Jan 2026 23:35:27 +0000 (23:35 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 13 Jan 2026 23:35:27 +0000 (23:35 +0000)
This reverts commit 0ed4776533145c901611d7f4f942490e33481335.

The change was not causing the glibc test hangs.

meta/lib/oeqa/selftest/cases/glibc.py

index 15ba5a83525fdb806fe60c9631c37dc795ff4d4d..b2b115972ffb4521f8ae3a67031e7ac1aebb198c 100644 (file)
@@ -79,7 +79,7 @@ class GlibcSelfTestBase(OESelftestTestCase, OEPTestResultTestCase):
             # setup nfs mount
             if qemu.run("mkdir -p \"{0}\"".format(tmpdir))[0] != 0:
                 raise Exception("Failed to setup NFS mount directory on target")
-            mountcmd = "mount -o noac,nfsvers=3,port={0},mountport={1} \"{2}:{3}\" \"{3}\"".format(nfsport, mountport, qemu.server_ip, tmpdir)
+            mountcmd = "mount -o noac,nfsvers=3,local_lock=all,port={0},mountport={1} \"{2}:{3}\" \"{3}\"".format(nfsport, mountport, qemu.server_ip, tmpdir)
             status, output = qemu.run(mountcmd)
             if status != 0:
                 raise Exception("Failed to setup NFS mount on target ({})".format(repr(output)))