Revert "glibc: Enable NFS local file locking for glibc tests"

This reverts commit ba4cc296f8cb9d91084f0d55382bf9ee3c1dda97.

We're seeing NFS hangs on the autobuilder in the glibc toolchain tests
when run under qemu system mode. It appears the unfs server
fails and the image than fails trying to access the NFS mount. I can't yet
find a way to see why the unfs3 nfs server fails.

Whilst I don't know for sure this commit is the issue, it does seem likely this
could be the cause, so revert for now to see if the hangs stop.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/lib/oeqa/selftest/cases/glibc.py b/meta/lib/oeqa/selftest/cases/glibc.py
index b2b115972ffb4521f8ae3a67031e7ac1aebb198c..15ba5a83525fdb806fe60c9631c37dc795ff4d4d 100644 (file)
--- a/meta/lib/oeqa/selftest/cases/glibc.py
+++ b/meta/lib/oeqa/selftest/cases/glibc.py
@@ -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,local_lock=all,port={0},mountport={1} \"{2}:{3}\" \"{3}\"".format(nfsport, mountport, qemu.server_ip, tmpdir)
+            mountcmd = "mount -o noac,nfsvers=3,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)))