tests: add old_mmap variants with different xlat verbosity levels

* tests/old_mmap-Xabbrev.c: New file.
* tests/old_mmap-Xraw.c: Likewise.
* tests/old_mmap-Xverbose.c: Likewise.
* tests/old_mmap.c (main): Add handling of XLAT_RAW and XLAT_VERBOSE
macros.
* tests/pure_executables.list: Add old_mmap-Xabbrev, old_mmap-Xraw,
and old_mmap-Xverbose.
* tests/.gitignore: Likewise.
* tests/gen_tests.in (old_mmap-Xabbrev, old_mmap-Xraw,
old_mmap-Xverbose): New tests.

diff --git a/tests/.gitignore b/tests/.gitignore
index 8887206628d8d3b3054dc05361aeea0a0f24904d..353b1ce3ae4f74e2d7a8ef2e6fcbbbc632ed2aae 100644 (file)
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -284,6 +284,9 @@ nsyscalls-d
 old_mmap
 old_mmap-P
 old_mmap-v-none
+old_mmap-Xabbrev
+old_mmap-Xraw
+old_mmap-Xverbose
 oldfstat
 oldlstat
 oldselect

diff --git a/tests/gen_tests.in b/tests/gen_tests.in
index c4c567158884d1219a9bd10f28166f977a37e0f1..ad03072428bd1632494c75a783ce4b98d2bb6edf 100644 (file)
--- a/tests/gen_tests.in
+++ b/tests/gen_tests.in
@@ -260,6 +260,9 @@ nlattr_unix_diag_msg                +netlink_sock_diag.test
 old_mmap       -a11 -e trace=mmap
 old_mmap-P     -e trace=mmap -P "/dev/full" 9>>/dev/full
 old_mmap-v-none        -a11 -e trace=mmap -e verbose=none
+old_mmap-Xabbrev       -a11 -e trace=mmap -Xabbrev
+old_mmap-Xraw  -a11 -e trace=mmap -Xraw
+old_mmap-Xverbose      -a11 -e trace=mmap -Xverbose
 oldfstat       -a18 -v -P stat.sample
 oldlstat       -a32 -v -P stat.sample -P /dev/full
 oldselect      -a13 -e trace=select

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

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

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

diff --git a/tests/old_mmap.c b/tests/old_mmap.c
index 35ec428895f73bab34a77e2e3fb7b7f3645623ce..07d572cf8071eabb49fd0c30703f8e193bad0ffc 100644 (file)
--- a/tests/old_mmap.c
+++ b/tests/old_mmap.c
@@ -79,17 +79,41 @@ main(void)
        void *args = tail_memdup(args1_c, sizeof(args1_c));
 
        rc = syscall(__NR_mmap, args);
+# if XLAT_RAW
+       printf("mmap(%#lx, %lu, %#x, %#x|%#x, %d, %#lx) = %ld %s (%m)\n",
+              args1_c[0], args1_c[1], PROT_READ|PROT_EXEC, MAP_FILE, MAP_FIXED,
+              (int) args1_c[4], args1_c[5], rc, errno2name());
+# elif XLAT_VERBOSE
+       printf("mmap(%#lx, %lu, %#x /* PROT_READ|PROT_EXEC */"
+              ", %#x /* MAP_FILE */|%#x /* MAP_FIXED */"
+              ", %d, %#lx) = %ld %s (%m)\n",
+              args1_c[0], args1_c[1], PROT_READ|PROT_EXEC, MAP_FILE, MAP_FIXED,
+              (int) args1_c[4], args1_c[5], rc, errno2name());
+# else
        printf("mmap(%#lx, %lu, PROT_READ|PROT_EXEC, MAP_FILE|MAP_FIXED"
               ", %d, %#lx) = %ld %s (%m)\n",
               args1_c[0], args1_c[1], (int) args1_c[4], args1_c[5],
               rc, errno2name());
+# endif
 
        memcpy(args, args2_c, sizeof(args2_c));
        rc = syscall(__NR_mmap, args);
 # ifndef PATH_TRACING
+#  if XLAT_RAW
+       printf("mmap(NULL, %lu, %#x, %#x|%#x, %d, %#lx) = %#lx\n",
+              args2_c[1], PROT_READ|PROT_WRITE, MAP_PRIVATE, MAP_ANONYMOUS,
+              (int) args2_c[4], args2_c[5], rc);
+#  elif XLAT_VERBOSE
+       printf("mmap(NULL, %lu, %#x /* PROT_READ|PROT_WRITE */"
+              ", %#x /* MAP_PRIVATE */|%#x /* MAP_ANONYMOUS */"
+              ", %d, %#lx) = %#lx\n",
+              args2_c[1], PROT_READ|PROT_WRITE, MAP_PRIVATE, MAP_ANONYMOUS,
+              (int) args2_c[4], args2_c[5], rc);
+#  else
        printf("mmap(NULL, %lu, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS"
               ", %d, %#lx) = %#lx\n",
               args2_c[1], (int) args2_c[4], args2_c[5], rc);
+#  endif
 # endif
 
        void *addr = (void *) rc;

diff --git a/tests/pure_executables.list b/tests/pure_executables.list
index faf56bae6a12c2ca3c763d7b6448d8766b73c5ae..868d694a2661dde9d6c9e044747d0ec8d19013e4 100755 (executable)
--- a/tests/pure_executables.list
+++ b/tests/pure_executables.list
@@ -236,6 +236,9 @@ nlattr_unix_diag_msg
 old_mmap
 old_mmap-P
 old_mmap-v-none
+old_mmap-Xabbrev
+old_mmap-Xraw
+old_mmap-Xverbose
 oldfstat
 oldlstat
 oldselect