Mark Wielaard 1a8da4
commit 0c701ba2a4b10a5f6f3fae31cb0ec6ca034d51d9
Mark Wielaard 1a8da4
Author: Mark Wielaard <mark@klomp.org>
Mark Wielaard 1a8da4
Date:   Fri Dec 7 14:01:20 2018 +0100
Mark Wielaard 1a8da4
Mark Wielaard 1a8da4
    Fix sigkill.stderr.exp for glibc-2.28.
Mark Wielaard 1a8da4
    
Mark Wielaard 1a8da4
    glibc 2.28 filters out some bad signal numbers and returns
Mark Wielaard 1a8da4
    Invalid argument instead of passing such bad signal numbers
Mark Wielaard 1a8da4
    the kernel sigaction syscall. So we won't see such bad signal
Mark Wielaard 1a8da4
    numbers and won't print "bad signal number" ourselves.
Mark Wielaard 1a8da4
    
Mark Wielaard 1a8da4
    Add a new memcheck/tests/sigkill.stderr.exp-glibc-2.28 to catch
Mark Wielaard 1a8da4
    this case.
Mark Wielaard 1a8da4
Mark Wielaard 1a8da4
diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
Mark Wielaard 1a8da4
index 76e0e90..2af4dd1 100644
Mark Wielaard 1a8da4
--- a/memcheck/tests/Makefile.am
Mark Wielaard 1a8da4
+++ b/memcheck/tests/Makefile.am
Mark Wielaard 1a8da4
@@ -260,7 +260,8 @@ EXTRA_DIST = \
Mark Wielaard 1a8da4
 	sh-mem-random.stdout.exp sh-mem-random.vgtest \
Mark Wielaard 1a8da4
 	sigaltstack.stderr.exp sigaltstack.vgtest \
Mark Wielaard 1a8da4
 	sigkill.stderr.exp sigkill.stderr.exp-darwin sigkill.stderr.exp-mips32 \
Mark Wielaard 1a8da4
-	    sigkill.stderr.exp-solaris sigkill.vgtest \
Mark Wielaard 1a8da4
+	    sigkill.stderr.exp-solaris \
Mark Wielaard 1a8da4
+	    sigkill.stderr.exp-glibc-2.28 sigkill.vgtest \
Mark Wielaard 1a8da4
 	signal2.stderr.exp signal2.stdout.exp signal2.vgtest \
Mark Wielaard 1a8da4
 	sigprocmask.stderr.exp sigprocmask.stderr.exp2 sigprocmask.vgtest \
Mark Wielaard 1a8da4
 	static_malloc.stderr.exp static_malloc.vgtest \
Mark Wielaard 1a8da4
diff --git a/memcheck/tests/sigkill.stderr.exp-glibc-2.28 b/memcheck/tests/sigkill.stderr.exp-glibc-2.28
Mark Wielaard 1a8da4
new file mode 100644
Mark Wielaard 1a8da4
index 0000000..0e5f0cb
Mark Wielaard 1a8da4
--- /dev/null
Mark Wielaard 1a8da4
+++ b/memcheck/tests/sigkill.stderr.exp-glibc-2.28
Mark Wielaard 1a8da4
@@ -0,0 +1,197 @@
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 1: Success
Mark Wielaard 1a8da4
+getting signal 1: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 2: Success
Mark Wielaard 1a8da4
+getting signal 2: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 3: Success
Mark Wielaard 1a8da4
+getting signal 3: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 4: Success
Mark Wielaard 1a8da4
+getting signal 4: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 5: Success
Mark Wielaard 1a8da4
+getting signal 5: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 6: Success
Mark Wielaard 1a8da4
+getting signal 6: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 7: Success
Mark Wielaard 1a8da4
+getting signal 7: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 8: Success
Mark Wielaard 1a8da4
+getting signal 8: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 9: Warning: ignored attempt to set SIGKILL handler in sigaction();
Mark Wielaard 1a8da4
+         the SIGKILL signal is uncatchable
Mark Wielaard 1a8da4
+Invalid argument
Mark Wielaard 1a8da4
+getting signal 9: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 10: Success
Mark Wielaard 1a8da4
+getting signal 10: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 11: Success
Mark Wielaard 1a8da4
+getting signal 11: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 12: Success
Mark Wielaard 1a8da4
+getting signal 12: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 13: Success
Mark Wielaard 1a8da4
+getting signal 13: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 14: Success
Mark Wielaard 1a8da4
+getting signal 14: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 15: Success
Mark Wielaard 1a8da4
+getting signal 15: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 16: Success
Mark Wielaard 1a8da4
+getting signal 16: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 17: Success
Mark Wielaard 1a8da4
+getting signal 17: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 18: Success
Mark Wielaard 1a8da4
+getting signal 18: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 19: Warning: ignored attempt to set SIGSTOP handler in sigaction();
Mark Wielaard 1a8da4
+         the SIGSTOP signal is uncatchable
Mark Wielaard 1a8da4
+Invalid argument
Mark Wielaard 1a8da4
+getting signal 19: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 20: Success
Mark Wielaard 1a8da4
+getting signal 20: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 21: Success
Mark Wielaard 1a8da4
+getting signal 21: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 22: Success
Mark Wielaard 1a8da4
+getting signal 22: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 23: Success
Mark Wielaard 1a8da4
+getting signal 23: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 24: Success
Mark Wielaard 1a8da4
+getting signal 24: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 25: Success
Mark Wielaard 1a8da4
+getting signal 25: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 26: Success
Mark Wielaard 1a8da4
+getting signal 26: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 27: Success
Mark Wielaard 1a8da4
+getting signal 27: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 28: Success
Mark Wielaard 1a8da4
+getting signal 28: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 29: Success
Mark Wielaard 1a8da4
+getting signal 29: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 30: Success
Mark Wielaard 1a8da4
+getting signal 30: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 31: Success
Mark Wielaard 1a8da4
+getting signal 31: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 34: Success
Mark Wielaard 1a8da4
+getting signal 34: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 35: Success
Mark Wielaard 1a8da4
+getting signal 35: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 36: Success
Mark Wielaard 1a8da4
+getting signal 36: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 37: Success
Mark Wielaard 1a8da4
+getting signal 37: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 38: Success
Mark Wielaard 1a8da4
+getting signal 38: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 39: Success
Mark Wielaard 1a8da4
+getting signal 39: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 40: Success
Mark Wielaard 1a8da4
+getting signal 40: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 41: Success
Mark Wielaard 1a8da4
+getting signal 41: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 42: Success
Mark Wielaard 1a8da4
+getting signal 42: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 43: Success
Mark Wielaard 1a8da4
+getting signal 43: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 44: Success
Mark Wielaard 1a8da4
+getting signal 44: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 45: Success
Mark Wielaard 1a8da4
+getting signal 45: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 46: Success
Mark Wielaard 1a8da4
+getting signal 46: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 47: Success
Mark Wielaard 1a8da4
+getting signal 47: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 48: Success
Mark Wielaard 1a8da4
+getting signal 48: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 49: Success
Mark Wielaard 1a8da4
+getting signal 49: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 50: Success
Mark Wielaard 1a8da4
+getting signal 50: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 51: Success
Mark Wielaard 1a8da4
+getting signal 51: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 52: Success
Mark Wielaard 1a8da4
+getting signal 52: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 53: Success
Mark Wielaard 1a8da4
+getting signal 53: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 54: Success
Mark Wielaard 1a8da4
+getting signal 54: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 55: Success
Mark Wielaard 1a8da4
+getting signal 55: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 56: Success
Mark Wielaard 1a8da4
+getting signal 56: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 57: Success
Mark Wielaard 1a8da4
+getting signal 57: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 58: Success
Mark Wielaard 1a8da4
+getting signal 58: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 59: Success
Mark Wielaard 1a8da4
+getting signal 59: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 60: Success
Mark Wielaard 1a8da4
+getting signal 60: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 61: Success
Mark Wielaard 1a8da4
+getting signal 61: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 62: Success
Mark Wielaard 1a8da4
+getting signal 62: Success
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+setting signal 65: Invalid argument
Mark Wielaard 1a8da4
+getting signal 65: Invalid argument
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+HEAP SUMMARY:
Mark Wielaard 1a8da4
+    in use at exit: ... bytes in ... blocks
Mark Wielaard 1a8da4
+  total heap usage: ... allocs, ... frees, ... bytes allocated
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+For a detailed leak analysis, rerun with: --leak-check=full
Mark Wielaard 1a8da4
+
Mark Wielaard 1a8da4
+For counts of detected and suppressed errors, rerun with: -v
Mark Wielaard 1a8da4
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
Mark Wielaard 1a8da4
diff -ur valgrind-3.14.0.orig/memcheck/tests/Makefile.in valgrind-3.14.0/memcheck/tests/Makefile.in
Mark Wielaard 1a8da4
--- valgrind-3.14.0.orig/memcheck/tests/Makefile.in	2018-12-13 00:30:45.013839247 +0100
Mark Wielaard 1a8da4
+++ valgrind-3.14.0/memcheck/tests/Makefile.in	2018-12-13 00:30:54.242636002 +0100
Mark Wielaard 1a8da4
@@ -1573,7 +1573,8 @@
Mark Wielaard 1a8da4
 	sh-mem-random.stdout.exp sh-mem-random.vgtest \
Mark Wielaard 1a8da4
 	sigaltstack.stderr.exp sigaltstack.vgtest \
Mark Wielaard 1a8da4
 	sigkill.stderr.exp sigkill.stderr.exp-darwin sigkill.stderr.exp-mips32 \
Mark Wielaard 1a8da4
-	    sigkill.stderr.exp-solaris sigkill.vgtest \
Mark Wielaard 1a8da4
+	    sigkill.stderr.exp-solaris \
Mark Wielaard 1a8da4
+	    sigkill.stderr.exp-glibc-2.28 sigkill.vgtest \
Mark Wielaard 1a8da4
 	signal2.stderr.exp signal2.stdout.exp signal2.vgtest \
Mark Wielaard 1a8da4
 	sigprocmask.stderr.exp sigprocmask.stderr.exp2 sigprocmask.vgtest \
Mark Wielaard 1a8da4
 	static_malloc.stderr.exp static_malloc.vgtest \