Module Name:    src
Committed By:   christos
Date:           Sun Dec 10 15:37:54 UTC 2017

Modified Files:
        src/tests/kernel: Makefile
Added Files:
        src/tests/kernel: h_getprocpath.c h_interpreter.sh t_procpath.sh

Log Message:
Add tests to make sure that the program name is what it is supposed to be.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/tests/kernel/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/kernel/h_getprocpath.c \
    src/tests/kernel/h_interpreter.sh src/tests/kernel/t_procpath.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.49 src/tests/kernel/Makefile:1.50
--- src/tests/kernel/Makefile:1.49	Thu Dec  7 20:19:29 2017
+++ src/tests/kernel/Makefile	Sun Dec 10 10:37:54 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2017/12/08 01:19:29 christos Exp $
+# $NetBSD: Makefile,v 1.50 2017/12/10 15:37:54 christos Exp $
 
 NOMAN=		# defined
 
@@ -22,11 +22,15 @@ TESTS_SH+=	t_umountstress
 TESTS_SH+=	t_ps_strings
 TESTS_SH+=	t_trapsignal
 TESTS_SH+=	t_interp
+TESTS_SH+=	t_procpath
 
 BINDIR=		${TESTSDIR}
 PROGS=		h_ps_strings1
 PROGS+=		h_ps_strings2
 PROGS+=		h_segv
+PROGS+=		h_getprocpath
+PROGS+=		h_interpreter
+SRCS.h_interpreter += h_interpreter.sh
 
 LDADD.t_mqueue+= -lrt
 

Added files:

Index: src/tests/kernel/h_getprocpath.c
diff -u /dev/null src/tests/kernel/h_getprocpath.c:1.1
--- /dev/null	Sun Dec 10 10:37:54 2017
+++ src/tests/kernel/h_getprocpath.c	Sun Dec 10 10:37:54 2017
@@ -0,0 +1,59 @@
+/*-
+ * Copyright (c) 2017 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <err.h>
+#include <sys/sysctl.h>
+
+static int
+getprocpath(char *path, size_t len, pid_t pid)
+{
+	const int name[] = {
+	    CTL_KERN, KERN_PROC_ARGS, pid, KERN_PROC_PATHNAME,
+	};
+     	return sysctl(name, __arraycount(name), path, &len, NULL, 0);
+}
+
+int
+main(int argc, char *argv[])
+{
+	if (argc != 2) {
+		fprintf(stderr, "Usage: %s <pid>\n", getprogname());
+		return EXIT_FAILURE;
+	}
+
+	char buf[MAXPATHLEN];
+	pid_t pid = atoi(argv[1]);
+
+	if (getprocpath(buf, sizeof(buf), pid) == -1)
+		err(EXIT_FAILURE, "sysctl: %d", pid);
+	printf("%s\n", buf);
+	return EXIT_SUCCESS;
+}
Index: src/tests/kernel/h_interpreter.sh
diff -u /dev/null src/tests/kernel/h_interpreter.sh:1.1
--- /dev/null	Sun Dec 10 10:37:54 2017
+++ src/tests/kernel/h_interpreter.sh	Sun Dec 10 10:37:54 2017
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+cmd=$1
+shift
+case "${cmd}" in
+interpreter)
+	"${1}" $$
+	;;
+dot)
+	cp "${1}" .
+	z="./$(basename "${1}")"
+	x=$(${z} -1)
+	case ${x} in
+	/*)	x=$(readlink "${x}");;
+	*)	echo "non absolute path" 1>&2; exit 1;;
+	esac
+
+	e=$(readlink "$(/bin/pwd)/${z}")
+	if [ "${x}" != "${e}" ]; then
+		echo bad: ${x} != ${e} 1>&2
+		exit 1
+	fi
+	;;
+*)
+	echo bad command ${cmd}
+esac
+		
Index: src/tests/kernel/t_procpath.sh
diff -u /dev/null src/tests/kernel/t_procpath.sh:1.1
--- /dev/null	Sun Dec 10 10:37:54 2017
+++ src/tests/kernel/t_procpath.sh	Sun Dec 10 10:37:54 2017
@@ -0,0 +1,72 @@
+# $NetBSD: t_procpath.sh,v 1.1 2017/12/10 15:37:54 christos Exp $
+#
+# Copyright (c) 2017 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Christos Zoulas.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+HELPER=$(atf_get_srcdir)/h_getprocpath
+INTERP=$(atf_get_srcdir)/h_interpreter
+
+atf_test_case absolute_proc
+absolute_proc_head()
+{
+	atf_set "descr" "Test absolute process argv0"
+}
+absolute_proc_body()
+{
+	atf_check -s exit:0 -o "inline:${HELPER}\n" -e "inline:" \
+		${HELPER} -1
+}
+
+atf_test_case interpeter_proc
+interpreter_proc_head()
+{
+	atf_set "descr" "Test interpreter proc contains interpreter"
+}
+interpreter_proc_body()
+{
+	atf_check -s exit:0 -o "inline:/bin/sh\n" -e "inline:" \
+		${INTERP} interpreter ${HELPER}
+}
+
+atf_test_case relative_proc
+relative_proc_head()
+{
+	atf_set "descr" "Test that masking the trapped signal get reset"
+}
+relative_proc_body()
+{
+	atf_check -s exit:0 -o "inline:" -e "inline:" \
+		${INTERP} dot ${HELPER}
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case absolute_proc
+	atf_add_test_case interpreter_proc
+	atf_add_test_case relative_proc
+}

Reply via email to