From 85f4cc52a11508e42daa5625283410e0d6f3a993 Mon Sep 17 00:00:00 2001 From: joseph Date: Fri, 7 Feb 2014 21:04:10 +0000 Subject: Merge changes between r25087 and r25236 from /fsf/trunk. git-svn-id: svn://svn.eglibc.org/trunk@25237 7b3dc134-2b1b-0410-93df-9e9f96275f8d --- libc/nptl/sysdeps/unix/sysv/linux/tst-setgetname.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'libc/nptl/sysdeps/unix/sysv/linux/tst-setgetname.c') diff --git a/libc/nptl/sysdeps/unix/sysv/linux/tst-setgetname.c b/libc/nptl/sysdeps/unix/sysv/linux/tst-setgetname.c index 2aceba53b..f5693e26c 100644 --- a/libc/nptl/sysdeps/unix/sysv/linux/tst-setgetname.c +++ b/libc/nptl/sysdeps/unix/sysv/linux/tst-setgetname.c @@ -23,6 +23,7 @@ #include #include #include +#include /* New name of process. */ #define NEW_NAME "setname" @@ -99,6 +100,19 @@ do_test (int argc, char **argv) if (res == 0) { res = get_self_comm (gettid (), name_check, TASK_COMM_LEN); + +#if !__ASSUME_PROC_PID_TASK_COMM + /* On this first test we look for ENOENT to be returned from + get_self_comm to indicate that the kernel is older than + 2.6.33 and doesn't contain comm within the proc structure. + In that case we skip the entire test. */ + if (res == ENOENT) + { + printf ("SKIP: The kernel does not have /proc/self/task/%%lu/comm.\n"); + return 0; + } +#endif + if (res == 0) { if (strncmp (name, name_check, strlen (BIG_NAME)) == 0) -- cgit v1.2.1