|
From: Mark W. <ma...@so...> - 2022-04-06 22:49:55
|
https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=6a35b364c5db0f0c3edb7936de8b75c3995b0882 commit 6a35b364c5db0f0c3edb7936de8b75c3995b0882 Author: Di Chen <di...@re...> Date: Wed Mar 30 07:59:25 2022 +0800 memfd test should be memfd_create test Currently, syscall memfd_create was tested by this: $ perl tests/vg_regtest memcheck/tests/linux/memfd.vgtest Since memfd_secret introduced in kernel 5.14, valgrind should rename the "memfd" test to "memfd_create" test to avoid the ambiguity, so that user will not get confused with the "memfd_secret" test. After this change, syscall memfd_create will be tested by: $ perl tests/vg_regtest memcheck/tests/linux/memfd_create.vgtest Diff: --- .gitignore | 2 +- memcheck/tests/linux/Makefile.am | 4 ++-- memcheck/tests/linux/memfd.vgtest | 3 --- memcheck/tests/linux/{memfd.c => memfd_create.c} | 0 memcheck/tests/linux/{memfd.stderr.exp => memfd_create.stderr.exp} | 4 ++-- memcheck/tests/linux/memfd_create.vgtest | 3 +++ 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 86416f576c..5026fcbc78 100644 --- a/.gitignore +++ b/.gitignore @@ -1100,7 +1100,7 @@ /memcheck/tests/linux/lsframe2 /memcheck/tests/linux/Makefile /memcheck/tests/linux/Makefile.in -/memcheck/tests/linux/memfd +/memcheck/tests/linux/memfd_create /memcheck/tests/linux/rfcomm /memcheck/tests/linux/sigqueue /memcheck/tests/linux/stack_changes diff --git a/memcheck/tests/linux/Makefile.am b/memcheck/tests/linux/Makefile.am index 4f0d838434..d5991dc5e5 100644 --- a/memcheck/tests/linux/Makefile.am +++ b/memcheck/tests/linux/Makefile.am @@ -15,7 +15,7 @@ EXTRA_DIST = \ ioctl-tiocsig.vgtest ioctl-tiocsig.stderr.exp \ lsframe1.vgtest lsframe1.stdout.exp lsframe1.stderr.exp \ lsframe2.vgtest lsframe2.stdout.exp lsframe2.stderr.exp \ - memfd.vgtest memfd.stderr.exp \ + memfd_create.vgtest memfd_create.stderr.exp \ rfcomm.vgtest rfcomm.stderr.exp \ sigqueue.vgtest sigqueue.stderr.exp \ stack_changes.stderr.exp stack_changes.stdout.exp \ @@ -62,7 +62,7 @@ check_PROGRAMS += sys-openat endif if HAVE_MEMFD_CREATE -check_PROGRAMS += memfd +check_PROGRAMS += memfd_create endif if HAVE_COPY_FILE_RANGE diff --git a/memcheck/tests/linux/memfd.vgtest b/memcheck/tests/linux/memfd.vgtest deleted file mode 100644 index 4096401f73..0000000000 --- a/memcheck/tests/linux/memfd.vgtest +++ /dev/null @@ -1,3 +0,0 @@ -prereq: test -e memfd -vgopts: -q --track-origins=yes -prog: memfd diff --git a/memcheck/tests/linux/memfd.c b/memcheck/tests/linux/memfd_create.c similarity index 100% rename from memcheck/tests/linux/memfd.c rename to memcheck/tests/linux/memfd_create.c diff --git a/memcheck/tests/linux/memfd.stderr.exp b/memcheck/tests/linux/memfd_create.stderr.exp similarity index 57% rename from memcheck/tests/linux/memfd.stderr.exp rename to memcheck/tests/linux/memfd_create.stderr.exp index 13009d8ae4..27ccbfe494 100644 --- a/memcheck/tests/linux/memfd.stderr.exp +++ b/memcheck/tests/linux/memfd_create.stderr.exp @@ -1,6 +1,6 @@ Syscall param fcntl(arg) contains uninitialised byte(s) ... - by 0x........: main (memfd.c:72) + by 0x........: main (memfd_create.c:72) Uninitialised value was created by a client request - at 0x........: main (memfd.c:71) + at 0x........: main (memfd_create.c:71) diff --git a/memcheck/tests/linux/memfd_create.vgtest b/memcheck/tests/linux/memfd_create.vgtest new file mode 100644 index 0000000000..13b956333e --- /dev/null +++ b/memcheck/tests/linux/memfd_create.vgtest @@ -0,0 +1,3 @@ +prereq: test -e memfd_create +vgopts: -q --track-origins=yes +prog: memfd_create |