From d4ab4ff683807dc42525c38dee8016ea9f4fab3f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 22 Mar 2021 13:52:41 +0000 Subject: [PATCH] tests: Fix test for new libcap output. libcap commit 177cd41803 ("A more compact form for the text representation of capabilities.") changed the format used by cap_to_text(3), breaking our test. Change the test to cope. This will break with older libcap now, but there's not a lot we can do about it. --- generator/actions_core.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator/actions_core.ml b/generator/actions_core.ml index c8741ff00..493f31f50 100644 --- a/generator/actions_core.ml +++ b/generator/actions_core.ml @@ -8039,7 +8039,7 @@ If no capabilities are attached to a file, an empty string is returned." }; InitScratchFS, Always, TestResultString ( [["touch"; "/cap_set_file_0"]; ["cap_set_file"; "/cap_set_file_0"; "cap_chown=p cap_chown+e"]; - ["cap_get_file"; "/cap_set_file_0"]], "= cap_chown+ep"), []; + ["cap_get_file"; "/cap_set_file_0"]], "cap_chown=ep"), []; ]; shortdesc = "set the Linux capabilities attached to a file"; longdesc = "\