tests: add keyctl variants with different xlat verbosity levels

esyr · ldv-alt · commit 42c9ff9cfe3f · 2018-05-25T09:15:03.000Z
* 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
@@ -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
@@ -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
@@ -0,0 +1 @@
+#include "keyctl.c"
diff --git a/tests/keyctl-Xraw.c 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
@@ -0,0 +1,2 @@
+#define XLAT_VERBOSE 1
+#include "keyctl.c"
diff --git a/tests/keyctl.c b/tests/keyctl.c
diff --git a/tests/pure_executables.list b/tests/pure_executables.list

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#define XLAT_RAW 1`
	`2`	`+#include "keyctl.c"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#define XLAT_VERBOSE 1`
	`2`	`+#include "keyctl.c"`