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