Merging upstream version 2.40.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

15 files changed, 53 insertions, 0 deletions

diff --git a/tests/expected/lslocks/lslocks-flock-ex b/tests/expected/lslocks/lslocks-flock-ex
new file mode 100644
index 0000000..b7e6ee2
--- /dev/null
+++ b/tests/expected/lslocks/lslocks-flock-ex
@@ -0,0 +1,4 @@
+test_mkfds FLOCK  WRITE 0 0
+# flock-ex + COMMAND,TYPE,SIZE,MODE,START,END + --raw --noheadings: 0
+util-linux-lslocks-target-file
+# flock-ex + PATH + --raw --noheadings: 0
diff --git a/tests/expected/lslocks/lslocks-flock-ex+HOLDERS b/tests/expected/lslocks/lslocks-flock-ex+HOLDERS
new file mode 100644
index 0000000..3a817e2
--- /dev/null
+++ b/tests/expected/lslocks/lslocks-flock-ex+HOLDERS
@@ -0,0 +1,2 @@
+test_mkfds FLOCK  WRITE 0 0 1,test_mkfds,17\x0a1,test_mkfds,18
+# flock-ex + COMMAND,TYPE,SIZE,MODE,START,END,HOLDERS + --raw --noheadings: 0
diff --git a/tests/expected/lslocks/lslocks-flock-sh b/tests/expected/lslocks/lslocks-flock-sh
new file mode 100644
index 0000000..6188cc1
--- /dev/null
+++ b/tests/expected/lslocks/lslocks-flock-sh
@@ -0,0 +1,4 @@
+test_mkfds FLOCK  READ 0 0
+# flock-sh + COMMAND,TYPE,SIZE,MODE,START,END + --raw --noheadings: 0
+util-linux-lslocks-target-file
+# flock-sh + PATH + --raw --noheadings: 0
diff --git a/tests/expected/lslocks/lslocks-flock-sh+HOLDERS b/tests/expected/lslocks/lslocks-flock-sh+HOLDERS
new file mode 100644
index 0000000..37996b1
--- /dev/null
+++ b/tests/expected/lslocks/lslocks-flock-sh+HOLDERS
@@ -0,0 +1,2 @@
+test_mkfds FLOCK  READ 0 0 1,test_mkfds,17\x0a1,test_mkfds,18
+# flock-sh + COMMAND,TYPE,SIZE,MODE,START,END,HOLDERS + --raw --noheadings: 0
diff --git a/tests/expected/lslocks/lslocks-lease-w b/tests/expected/lslocks/lslocks-lease-w
new file mode 100644
index 0000000..78a0a21
--- /dev/null
+++ b/tests/expected/lslocks/lslocks-lease-w
@@ -0,0 +1,4 @@
+test_mkfds LEASE  WRITE 0 0
+# lease-w + COMMAND,TYPE,SIZE,MODE,START,END + --raw --noheadings: 0
+util-linux-lslocks-target-file
+# lease-w + PATH + --raw --noheadings: 0
diff --git a/tests/expected/lslocks/lslocks-lease-w+HOLDERS b/tests/expected/lslocks/lslocks-lease-w+HOLDERS
new file mode 100644
index 0000000..8c6ab5d
--- /dev/null
+++ b/tests/expected/lslocks/lslocks-lease-w+HOLDERS
@@ -0,0 +1,2 @@
+test_mkfds LEASE  WRITE 0 0 1,test_mkfds,17\x0a1,test_mkfds,18
+# lease-w + COMMAND,TYPE,SIZE,MODE,START,END,HOLDERS + --raw --noheadings: 0
diff --git a/tests/expected/lslocks/lslocks-ofd--w b/tests/expected/lslocks/lslocks-ofd--w
new file mode 100644
index 0000000..20b8bc9
--- /dev/null
+++ b/tests/expected/lslocks/lslocks-ofd--w
@@ -0,0 +1,4 @@
+test_mkfds OFDLCK 1B WRITE 0 0
+# ofd--w + COMMAND,TYPE,SIZE,MODE,START,END + --raw --noheadings: 0
+util-linux-lslocks-target-file
+# ofd--w + PATH + --raw --noheadings: 0
diff --git a/tests/expected/lslocks/lslocks-ofd--w+HOLDERS b/tests/expected/lslocks/lslocks-ofd--w+HOLDERS
new file mode 100644
index 0000000..4ff9158
--- /dev/null
+++ b/tests/expected/lslocks/lslocks-ofd--w+HOLDERS
@@ -0,0 +1,2 @@
+test_mkfds OFDLCK 1B WRITE 0 0 1,test_mkfds,17\x0a1,test_mkfds,18
+# ofd--w + COMMAND,TYPE,SIZE,MODE,START,END,HOLDERS + --raw --noheadings: 0
diff --git a/tests/expected/lslocks/lslocks-ofd-r- b/tests/expected/lslocks/lslocks-ofd-r-
new file mode 100644
index 0000000..bf9e809
--- /dev/null
+++ b/tests/expected/lslocks/lslocks-ofd-r-
@@ -0,0 +1,4 @@
+test_mkfds OFDLCK 1B READ 0 0
+# ofd-r- + COMMAND,TYPE,SIZE,MODE,START,END + --raw --noheadings: 0
+util-linux-lslocks-target-file
+# ofd-r- + PATH + --raw --noheadings: 0
diff --git a/tests/expected/lslocks/lslocks-ofd-r-+HOLDERS b/tests/expected/lslocks/lslocks-ofd-r-+HOLDERS
new file mode 100644
index 0000000..1abbf44
--- /dev/null
+++ b/tests/expected/lslocks/lslocks-ofd-r-+HOLDERS
@@ -0,0 +1,2 @@
+test_mkfds OFDLCK 1B READ 0 0 1,test_mkfds,17\x0a1,test_mkfds,18
+# ofd-r- + COMMAND,TYPE,SIZE,MODE,START,END,HOLDERS + --raw --noheadings: 0
diff --git a/tests/expected/lslocks/lslocks-ofd-rw b/tests/expected/lslocks/lslocks-ofd-rw
new file mode 100644
index 0000000..dd3d71c
--- /dev/null
+++ b/tests/expected/lslocks/lslocks-ofd-rw
@@ -0,0 +1,6 @@
+test_mkfds OFDLCK 3B READ 0 0
+test_mkfds OFDLCK 3B WRITE 2 2
+# ofd-rw + COMMAND,TYPE,SIZE,MODE,START,END + --raw --noheadings: 0
+util-linux-lslocks-target-file
+util-linux-lslocks-target-file
+# ofd-rw + PATH + --raw --noheadings: 0
diff --git a/tests/expected/lslocks/lslocks-ofd-rw+HOLDERS b/tests/expected/lslocks/lslocks-ofd-rw+HOLDERS
new file mode 100644
index 0000000..a105d32
--- /dev/null
+++ b/tests/expected/lslocks/lslocks-ofd-rw+HOLDERS
@@ -0,0 +1,3 @@
+test_mkfds OFDLCK 3B READ 0 0 1,test_mkfds,17\x0a1,test_mkfds,18
+test_mkfds OFDLCK 3B WRITE 2 2 1,test_mkfds,17\x0a1,test_mkfds,18
+# ofd-rw + COMMAND,TYPE,SIZE,MODE,START,END,HOLDERS + --raw --noheadings: 0
diff --git a/tests/expected/lslocks/lslocks-posix--w b/tests/expected/lslocks/lslocks-posix--w
new file mode 100644
index 0000000..2668fcd
--- /dev/null
+++ b/tests/expected/lslocks/lslocks-posix--w
@@ -0,0 +1,4 @@
+test_mkfds POSIX 1B WRITE 0 0
+# posix--w + COMMAND,TYPE,SIZE,MODE,START,END + --raw --noheadings: 0
+util-linux-lslocks-target-file
+# posix--w + PATH + --raw --noheadings: 0
diff --git a/tests/expected/lslocks/lslocks-posix-r- b/tests/expected/lslocks/lslocks-posix-r-
new file mode 100644
index 0000000..5e1113d
--- /dev/null
+++ b/tests/expected/lslocks/lslocks-posix-r-
@@ -0,0 +1,4 @@
+test_mkfds POSIX 1B READ 0 0
+# posix-r- + COMMAND,TYPE,SIZE,MODE,START,END + --raw --noheadings: 0
+util-linux-lslocks-target-file
+# posix-r- + PATH + --raw --noheadings: 0
diff --git a/tests/expected/lslocks/lslocks-posix-rw b/tests/expected/lslocks/lslocks-posix-rw
new file mode 100644
index 0000000..890d96a
--- /dev/null
+++ b/tests/expected/lslocks/lslocks-posix-rw
@@ -0,0 +1,6 @@
+test_mkfds POSIX 3B READ 0 0
+test_mkfds POSIX 3B WRITE 2 2
+# posix-rw + COMMAND,TYPE,SIZE,MODE,START,END + --raw --noheadings: 0
+util-linux-lslocks-target-file
+util-linux-lslocks-target-file
+# posix-rw + PATH + --raw --noheadings: 0