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