tests: add keyctl variants with different xlat verbosity levels

* tests/keyctl-Xabbrev.c: New file.
* tests/keyctl-Xraw.c: Likewise.
* tests/keyctl-Xverbose.c: Likewise.
* tests/keyctl.c (XARG_STR): New macro.
(do_keyctl): Print command in accordance with XLAT_RAW/XLAT_VERBOSE settings.
(main): Update expected output.
* tests/pure_executables.list: Add keyctl-Xabbrev, keyctl-Xraw,
and keyctl-Xverbose.
* tests/.gitignore: Likewise.
* tests/gen_tests.in (keyctl-Xabbrev, keyctl-Xraw, keyctl-Xverbose): New
tests.

diff --git a/tests/.gitignore b/tests/.gitignore
index 780079b46802b72a00cfd2b3b98bee951cc9b6e4..b39db931b71ef0bdd4d4a38b9e6a3523cf738119 100644 (file)
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -180,6 +180,9 @@ kern_features
 kexec_file_load
 kexec_load
 keyctl
+keyctl-Xabbrev
+keyctl-Xraw
+keyctl-Xverbose
 kill
 ksysent
 ksysent.h

diff --git a/tests/gen_tests.in b/tests/gen_tests.in
index ee249e746c8955caac4c526aa41a8e6bef3b34dc..9a175221a080c8c51233bd7595a646fa2dc6d508 100644 (file)
--- a/tests/gen_tests.in
+++ b/tests/gen_tests.in
@@ -175,6 +175,9 @@ kern_features -a16
 kexec_file_load        -s9
 kexec_load     -s9
 keyctl -a31 -s10
+keyctl-Xabbrev -a31 -s10 -e trace=keyctl -Xabbrev
+keyctl-Xraw    -a13 -s10 -e trace=keyctl -Xraw
+keyctl-Xverbose        -a41 -s10 -e trace=keyctl -Xverbose
 kill   -a12 -esignal=none
 lchown -a30
 lchown32       -a32

diff --git a/tests/keyctl-Xabbrev.c b/tests/keyctl-Xabbrev.c
new file mode 100644 (file)
index 0000000..7b6b0dc
--- /dev/null
+++ b/tests/keyctl-Xabbrev.c
@@ -0,0 +1 @@
+#include "keyctl.c"

diff --git a/tests/keyctl-Xraw.c b/tests/keyctl-Xraw.c
new file mode 100644 (file)
index 0000000..202c22a
--- /dev/null
+++ b/tests/keyctl-Xraw.c
@@ -0,0 +1,2 @@
+#define XLAT_RAW 1
+#include "keyctl.c"

diff --git a/tests/keyctl-Xverbose.c b/tests/keyctl-Xverbose.c
new file mode 100644 (file)
index 0000000..9f9d744
--- /dev/null
+++ b/tests/keyctl-Xverbose.c
@@ -0,0 +1,2 @@
+#define XLAT_VERBOSE 1
+#include "keyctl.c"

diff --git a/tests/keyctl.c b/tests/keyctl.c
index 5d81b80207793738de5336e766727454f95cc2ab..2183266705e93f6f52b72e3ca03e24fa7b1d6e80 100644 (file)
--- a/tests/keyctl.c
+++ b/tests/keyctl.c
@@ -89,6 +89,14 @@ bool buf_in_arg;
 /* From ioctl_dm.c */
 # define STR32 "AbCdEfGhIjKlMnOpQrStUvWxYz012345"
 
+#if XLAT_RAW
+# define XARG_STR(v_) (v_), _STR(v_)
+#elif XLAT_VERBOSE
+# define XARG_STR(v_) (v_), _STR(v_) " /* " #v_ " */"
+#else
+# define XARG_STR ARG_STR
+#endif
+
 /*
  * When this is called with positive size, the buffer provided is an "out"
  * argument and rc contains resulting size (globally defined nul_terminated_buf
@@ -187,7 +195,13 @@ do_keyctl(kernel_ulong_t cmd, const char *cmd_str, ...)
 
        long rc = syscall(__NR_keyctl, cmd, args[0], args[1], args[2], args[3]);
        const char *errstr = sprintrc(rc);
+#if XLAT_RAW
+       printf("keyctl(%#x", (unsigned) cmd);
+#elif XLAT_VERBOSE
+       printf("keyctl(%#x /* %s */", (unsigned) cmd, cmd_str);
+#else
        printf("keyctl(%s", cmd_str);
+#endif
        for (i = 0; i < cnt; i++) {
                printf(", ");
                print_arg(args[i], arg_str[i], arg_fmt[i], arg_sz[i], rc);
@@ -299,8 +313,20 @@ main(void)
 
        static const struct keyctl_dh_params kcdhp_data = {
                KEY_SPEC_GROUP_KEYRING, 1234567890, 3141592653U };
-       static const char *kcdhp_str = "{private=KEY_SPEC_GROUP_KEYRING, "
-               "prime=1234567890, base=-1153374643}";
+       static const char *kcdhp_str = "{private="
+#if XLAT_RAW || XLAT_VERBOSE
+               "-6"
+#endif
+#if XLAT_VERBOSE
+               " /* "
+#endif
+#if !XLAT_RAW
+               "KEY_SPEC_GROUP_KEYRING"
+#endif
+#if XLAT_VERBOSE
+               " */"
+#endif
+               ", prime=1234567890, base=-1153374643}";
 
        /*
         * It's bigger than current hash name size limit, but since it's
@@ -418,7 +444,15 @@ main(void)
 
        /* Invalid command */
        do_keyctl((kernel_ulong_t) 0xbadc0dedfacefeedULL,
-                 "0xfacefeed /* KEYCTL_??? */",
+#if XLAT_VERBOSE
+                 "KEYCTL_???"
+#else
+                 "0xfacefeed"
+# if !XLAT_RAW
+                 " /* KEYCTL_??? */"
+# endif
+#endif
+                 ,
                  sizeof(kernel_ulong_t),
                        (kernel_ulong_t) 0xdeadfee1badc0de5ULL, NULL,
                        kulong_fmt,
@@ -440,7 +474,7 @@ main(void)
                        (kernel_ulong_t) 0xbadc0dedffffffffLLU, "-1", NULL,
                  0UL);
        do_keyctl(ARG_STR(KEYCTL_GET_KEYRING_ID),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_THREAD_KEYRING), "%d",
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_THREAD_KEYRING), "%d",
                  sizeof(int), 3141592653U, NULL, "%d", NULL,
                  0UL);
 
@@ -469,7 +503,7 @@ main(void)
        buf_in_arg = true;
 
        do_keyctl(ARG_STR(KEYCTL_UPDATE),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_REQUESTOR_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_REQUESTOR_KEYRING), NULL,
                  sizeof(char *), ARG_STR(NULL), NULL,
                  sizeof(kernel_ulong_t), (kernel_ulong_t) 0, NULL, ksize_fmt,
                  0UL);
@@ -498,7 +532,7 @@ main(void)
 
        /* KEYCTL_REVOKE */
        do_keyctl(ARG_STR(KEYCTL_REVOKE),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_GROUP_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_GROUP_KEYRING), NULL,
                  0UL);
        do_keyctl(ARG_STR(KEYCTL_REVOKE),
                  sizeof(int32_t), bogus_key1, NULL, "%d",
@@ -513,7 +547,7 @@ main(void)
 
        /* KEYCTL_CHOWN */
        do_keyctl(ARG_STR(KEYCTL_CHOWN),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_REQUESTOR_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_REQUESTOR_KEYRING), NULL,
                  sizeof(uid_t), ARG_STR(-1), NULL,
                  sizeof(gid_t), ARG_STR(-1), NULL,
                  0UL);
@@ -526,8 +560,15 @@ main(void)
 
        /* KEYCTL_SETPERM */
        do_keyctl(ARG_STR(KEYCTL_SETPERM),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_REQKEY_AUTH_KEY), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_REQKEY_AUTH_KEY), NULL,
                  sizeof(uint32_t), 0xffffffffU,
+#if XLAT_RAW || XLAT_VERBOSE
+                       "0xffffffff"
+#endif
+#if XLAT_VERBOSE
+                       " /* "
+#endif
+#if !XLAT_RAW
                        "KEY_POS_VIEW|KEY_POS_READ|KEY_POS_WRITE|"
                        "KEY_POS_SEARCH|KEY_POS_LINK|KEY_POS_SETATTR|"
                        "KEY_USR_VIEW|KEY_USR_READ|KEY_USR_WRITE|"
@@ -536,7 +577,12 @@ main(void)
                        "KEY_GRP_SEARCH|KEY_GRP_LINK|KEY_GRP_SETATTR|"
                        "KEY_OTH_VIEW|KEY_OTH_READ|KEY_OTH_WRITE|"
                        "KEY_OTH_SEARCH|KEY_OTH_LINK|KEY_OTH_SETATTR|"
-                       "0xc0c0c0c0", NULL,
+                       "0xc0c0c0c0"
+#endif
+#if XLAT_VERBOSE
+                       " */"
+#endif
+                       , NULL,
                  0UL);
        do_keyctl(ARG_STR(KEYCTL_SETPERM),
                  sizeof(int32_t), bogus_key1, NULL, "%d",
@@ -544,7 +590,12 @@ main(void)
                  0UL);
        do_keyctl(ARG_STR(KEYCTL_SETPERM),
                  sizeof(kernel_ulong_t), bogus_key3, bogus_key3_str, NULL,
-                 sizeof(uint32_t), 0xc0c0c0c0, "0xc0c0c0c0 /* KEY_??? */",
+                 sizeof(uint32_t), 0xc0c0c0c0,
+                         "0xc0c0c0c0"
+#if !XLAT_RAW
+                         " /* KEY_??? */"
+#endif
+                         ,
                          NULL,
                  0UL);
 
@@ -563,17 +614,17 @@ main(void)
                        (kernel_ulong_t) 0xfeedf157badc0dedLLU, NULL, ksize_fmt,
                  0UL);
        do_keyctl(ARG_STR(KEYCTL_DESCRIBE),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_THREAD_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_THREAD_KEYRING), NULL,
                  (size_t) 9, (uintptr_t) bogus_buf1, NULL, NULL,
                  sizeof(kernel_ulong_t), (kernel_ulong_t) 9, NULL, ksize_fmt,
                  0UL);
        do_keyctl(ARG_STR(KEYCTL_DESCRIBE),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_THREAD_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_THREAD_KEYRING), NULL,
                  (size_t) 256, (uintptr_t) bogus_buf2, NULL, NULL,
                  sizeof(kernel_ulong_t), (kernel_ulong_t) 256, NULL, ksize_fmt,
                  0UL);
        do_keyctl(ARG_STR(KEYCTL_DESCRIBE),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_THREAD_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_THREAD_KEYRING), NULL,
                  (size_t) -4, (uintptr_t) bogus_buf2, NULL, NULL,
                  sizeof(kernel_ulong_t), (kernel_ulong_t) -4, NULL, ksize_fmt,
                  0UL);
@@ -581,7 +632,7 @@ main(void)
 
        /* KEYCTL_CLEAR */
        do_keyctl(ARG_STR(KEYCTL_CLEAR),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_GROUP_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_GROUP_KEYRING), NULL,
                  0UL);
        do_keyctl(ARG_STR(KEYCTL_CLEAR),
                  sizeof(int32_t), bogus_key1, NULL, "%d",
@@ -597,14 +648,14 @@ main(void)
        /* KEYCTL_LINK */
        do_keyctl(ARG_STR(KEYCTL_LINK),
                  sizeof(int32_t), bogus_key1, NULL, "%d",
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_GROUP_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_GROUP_KEYRING), NULL,
                  0UL);
        do_keyctl(ARG_STR(KEYCTL_LINK),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_REQUESTOR_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_REQUESTOR_KEYRING), NULL,
                  sizeof(int32_t), bogus_key2, NULL, "%d",
                  0UL);
        do_keyctl(ARG_STR(KEYCTL_LINK),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_REQUESTOR_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_REQUESTOR_KEYRING), NULL,
                  sizeof(kernel_ulong_t), bogus_key3, bogus_key3_str, NULL,
                  0UL);
 
@@ -612,14 +663,14 @@ main(void)
        /* KEYCTL_UNLINK */
        do_keyctl(ARG_STR(KEYCTL_UNLINK),
                  sizeof(int32_t), bogus_key1, NULL, "%d",
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_GROUP_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_GROUP_KEYRING), NULL,
                  0UL);
        do_keyctl(ARG_STR(KEYCTL_UNLINK),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_REQUESTOR_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_REQUESTOR_KEYRING), NULL,
                  sizeof(int32_t), bogus_key2, NULL, "%d",
                  0UL);
        do_keyctl(ARG_STR(KEYCTL_UNLINK),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_REQUESTOR_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_REQUESTOR_KEYRING), NULL,
                  sizeof(kernel_ulong_t), bogus_key3, bogus_key3_str, NULL,
                  0UL);
 
@@ -628,7 +679,7 @@ main(void)
        buf_in_arg = true;
 
        do_keyctl(ARG_STR(KEYCTL_SEARCH),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_REQUESTOR_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_REQUESTOR_KEYRING), NULL,
                  sizeof(char *), ARG_STR(NULL), NULL,
                  sizeof(char *), ARG_STR(NULL), NULL,
                  sizeof(int32_t), 0, NULL, "%d");
@@ -636,7 +687,7 @@ main(void)
                  sizeof(int32_t), bogus_key1, NULL, "%d",
                  sizeof(char *), (char *) 0xfffffacefffffeedULL, NULL, ptr_fmt,
                  sizeof(char *), (char *) 0xfffff00dfffff157ULL, NULL, ptr_fmt,
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_USER_SESSION_KEYRING),
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_USER_SESSION_KEYRING),
                          NULL);
        do_keyctl(ARG_STR(KEYCTL_SEARCH),
                  sizeof(int32_t), bogus_key2, NULL, "%d",
@@ -657,7 +708,7 @@ main(void)
        /* KEYCTL_RESTRICT_KEYRING */
 
        do_keyctl(ARG_STR(KEYCTL_RESTRICT_KEYRING),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_REQUESTOR_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_REQUESTOR_KEYRING), NULL,
                  sizeof(char *), ARG_STR(NULL), NULL,
                  sizeof(char *), ARG_STR(NULL), NULL,
                          NULL);
@@ -705,17 +756,17 @@ main(void)
                        (kernel_ulong_t) 0xfeedf157badc0dedLLU, NULL, ksize_fmt,
                  0UL);
        do_keyctl(ARG_STR(KEYCTL_READ),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_THREAD_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_THREAD_KEYRING), NULL,
                  (size_t) 9, (uintptr_t) bogus_buf1, NULL, NULL,
                  sizeof(kernel_ulong_t), (kernel_ulong_t) 9, NULL, ksize_fmt,
                  0UL);
        do_keyctl(ARG_STR(KEYCTL_READ),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_THREAD_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_THREAD_KEYRING), NULL,
                  (size_t) 256, (uintptr_t) bogus_buf2, NULL, NULL,
                  sizeof(kernel_ulong_t), (kernel_ulong_t) 256, NULL, ksize_fmt,
                  0UL);
        do_keyctl(ARG_STR(KEYCTL_READ),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_THREAD_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_THREAD_KEYRING), NULL,
                  (size_t) -4, (uintptr_t) bogus_buf2, NULL, NULL,
                  sizeof(kernel_ulong_t), (kernel_ulong_t) -4, NULL, ksize_fmt,
                  0UL);
@@ -751,11 +802,11 @@ main(void)
                        ksize_fmt,
                  sizeof(kernel_ulong_t), bogus_key3, bogus_key3_str, NULL);
        do_keyctl(ARG_STR(KEYCTL_INSTANTIATE),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_GROUP_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_GROUP_KEYRING), NULL,
                  sizeof(long_type_str), long_desc, NULL, NULL,
                  sizeof(kernel_ulong_t),
                        (kernel_ulong_t) sizeof(long_type_str), NULL, ksize_fmt,
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_GROUP_KEYRING), NULL);
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_GROUP_KEYRING), NULL);
 
        buf_in_arg = false;
 
@@ -788,7 +839,7 @@ main(void)
 
        /* KEYCTL_SET_REQKEY_KEYRING */
        do_keyctl(ARG_STR(KEYCTL_SET_REQKEY_KEYRING),
-                 sizeof(int32_t), ARG_STR(KEY_REQKEY_DEFL_NO_CHANGE), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_REQKEY_DEFL_NO_CHANGE), NULL,
                  0UL);
        /*
         * Keep it commented out until proper way of faking syscalls is not
@@ -796,11 +847,15 @@ main(void)
         */
        /* do_keyctl(ARG_STR(KEYCTL_SET_REQKEY_KEYRING),
                  sizeof(int32_t),
-                 ARG_STR(KEY_REQKEY_DEFL_REQUESTOR_KEYRING), NULL, 0UL); */
+                 XARG_STR(KEY_REQKEY_DEFL_REQUESTOR_KEYRING), NULL, 0UL); */
        do_keyctl(ARG_STR(KEYCTL_SET_REQKEY_KEYRING),
                  sizeof(kernel_ulong_t),
                  (kernel_ulong_t) 0xfeedf157badc0dedLLU,
-                 "-1159983635 /* KEY_REQKEY_DEFL_??? */", NULL, 0UL);
+                 "-1159983635"
+#if !XLAT_RAW
+                 " /* KEY_REQKEY_DEFL_??? */"
+#endif
+                 , NULL, 0UL);
 
 
        /* KEYCTL_SET_TIMEOUT */
@@ -822,7 +877,7 @@ main(void)
 
        /* KEYCTL_ASSUME_AUTHORITY */
        do_keyctl(ARG_STR(KEYCTL_ASSUME_AUTHORITY),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_GROUP_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_GROUP_KEYRING), NULL,
                  0UL);
        do_keyctl(ARG_STR(KEYCTL_ASSUME_AUTHORITY),
                  sizeof(int32_t), bogus_key1, NULL, "%d",
@@ -848,17 +903,17 @@ main(void)
                        (kernel_ulong_t) 0xfeedf157badc0dedLLU, NULL, ksize_fmt,
                  0UL);
        do_keyctl(ARG_STR(KEYCTL_GET_SECURITY),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_THREAD_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_THREAD_KEYRING), NULL,
                  (size_t) 9, (uintptr_t) bogus_buf1, NULL, NULL,
                  sizeof(kernel_ulong_t), (kernel_ulong_t) 9, NULL, ksize_fmt,
                  0UL);
        do_keyctl(ARG_STR(KEYCTL_GET_SECURITY),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_THREAD_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_THREAD_KEYRING), NULL,
                  (size_t) 256, (uintptr_t) bogus_buf2, NULL, NULL,
                  sizeof(kernel_ulong_t), (kernel_ulong_t) 256, NULL, ksize_fmt,
                  0UL);
        do_keyctl(ARG_STR(KEYCTL_GET_SECURITY),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_THREAD_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_THREAD_KEYRING), NULL,
                  (size_t) -4, (uintptr_t) bogus_buf2, NULL, NULL,
                  sizeof(kernel_ulong_t), (kernel_ulong_t) -4, NULL, ksize_fmt,
                  0UL);
@@ -893,7 +948,7 @@ main(void)
                  sizeof(kernel_ulong_t),
                        (kernel_ulong_t) 0xfeedf157badc0dedLLU, "3134983661",
                        NULL,
-                 sizeof(uint32_t), ARG_STR(ENODEV), NULL,
+                 sizeof(uint32_t), XARG_STR(ENODEV), NULL,
                  sizeof(kernel_ulong_t), bogus_key3, bogus_key3_str, NULL);
 
 
@@ -923,16 +978,16 @@ main(void)
                          ksize_fmt,
                  sizeof(kernel_ulong_t), bogus_key3, bogus_key3_str, NULL);
        do_keyctl(ARG_STR(KEYCTL_INSTANTIATE_IOV),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_GROUP_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_GROUP_KEYRING), NULL,
                  sizeof(key_iov), key_iov, key_iov_str2, NULL,
                  sizeof(kernel_ulong_t), (kernel_ulong_t) IOV_SIZE, NULL,
                        ksize_fmt,
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_GROUP_KEYRING), NULL);
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_GROUP_KEYRING), NULL);
 
 
        /* KEYCTL_INVALIDATE */
        do_keyctl(ARG_STR(KEYCTL_INVALIDATE),
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_GROUP_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_GROUP_KEYRING), NULL,
                  0UL);
        do_keyctl(ARG_STR(KEYCTL_INVALIDATE),
                  sizeof(int32_t), bogus_key1, NULL, "%d",
@@ -948,7 +1003,7 @@ main(void)
        /* KEYCTL_GET_PERSISTENT */
        do_keyctl(ARG_STR(KEYCTL_GET_PERSISTENT),
                  sizeof(uid_t), ARG_STR(-1), NULL,
-                 sizeof(int32_t), ARG_STR(KEY_SPEC_GROUP_KEYRING), NULL,
+                 sizeof(int32_t), XARG_STR(KEY_SPEC_GROUP_KEYRING), NULL,
                  0UL);
        do_keyctl(ARG_STR(KEYCTL_GET_PERSISTENT),
                  sizeof(uid_t), 2718281828U, NULL, "%u",

diff --git a/tests/pure_executables.list b/tests/pure_executables.list
index 9c7343d53b7ec1ccac64a5c97e5c7ac744bd0ab1..4553c687ca2aeecb8bd70a1468a268f9f9c5b45d 100755 (executable)
--- a/tests/pure_executables.list
+++ b/tests/pure_executables.list
@@ -146,6 +146,9 @@ kern_features
 kexec_file_load
 kexec_load
 keyctl
+keyctl-Xabbrev
+keyctl-Xraw
+keyctl-Xverbose
 kill
 lchown
 lchown32