Module Name:    src
Committed By:   christos
Date:           Sun Sep 15 16:53:58 UTC 2019

Modified Files:
        src/tests/kernel: Makefile
Added Files:
        src/tests/kernel: h_fexecve.c t_fexecve.sh

Log Message:
Add tests for fexecve(2)


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/tests/kernel/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/kernel/h_fexecve.c \
    src/tests/kernel/t_fexecve.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.62 src/tests/kernel/Makefile:1.63
--- src/tests/kernel/Makefile:1.62	Sun Sep 15 12:25:58 2019
+++ src/tests/kernel/Makefile	Sun Sep 15 12:53:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2019/09/15 16:25:58 christos Exp $
+# $NetBSD: Makefile,v 1.63 2019/09/15 16:53:58 christos Exp $
 
 NOMAN=		# defined
 
@@ -28,9 +28,11 @@ TESTS_SH+=	t_trapsignal
 TESTS_SH+=	t_interp
 TESTS_SH+=	t_origin
 TESTS_SH+=	t_procpath
+TESTS_SH+=	t_fexecve
 
 BINDIR=		${TESTSDIR}
-PROGS=		h_ps_strings1
+PROGS=		h_fexecve
+PROGS+=		h_ps_strings1
 PROGS+=		h_ps_strings2
 PROGS+=		h_segv
 PROGS+=		h_getprocpath

Added files:

Index: src/tests/kernel/h_fexecve.c
diff -u /dev/null src/tests/kernel/h_fexecve.c:1.1
--- /dev/null	Sun Sep 15 12:53:58 2019
+++ src/tests/kernel/h_fexecve.c	Sun Sep 15 12:53:58 2019
@@ -0,0 +1,51 @@
+/*	$NetBSD: h_fexecve.c,v 1.1 2019/09/15 16:53:58 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2019 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 <sys/cdefs.h>
+__RCSID("$NetBSD: h_fexecve.c,v 1.1 2019/09/15 16:53:58 christos Exp $");
+
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <err.h>
+
+int
+main(int argc, char *argv[])
+{
+	char *args[] = { argv[1], NULL };
+	int fd = open(args[0], O_RDONLY);
+	if (fd == -1)
+		err(EXIT_FAILURE, "open %s", args[0]);
+	if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
+		err(EXIT_FAILURE, "fcntl");
+	if (fexecve(fd, args, NULL) == -1)
+		err(EXIT_FAILURE, "fexecve");
+	return EXIT_SUCCESS;
+}
Index: src/tests/kernel/t_fexecve.sh
diff -u /dev/null src/tests/kernel/t_fexecve.sh:1.1
--- /dev/null	Sun Sep 15 12:53:58 2019
+++ src/tests/kernel/t_fexecve.sh	Sun Sep 15 12:53:58 2019
@@ -0,0 +1,72 @@
+# $NetBSD: t_fexecve.sh,v 1.1 2019/09/15 16:53:58 christos Exp $
+#
+# Copyright (c) 2019 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_fexecve
+
+atf_test_case fexecve_elf
+fexecve_elf()
+{
+	atf_set "descr" "Test fexecve with ELF executables"
+}
+
+fexecve_elf_body()
+{
+	cat > hello.c << EOF
+#include <stdio.h>
+int main(void) {
+        printf("hello world\n");
+        return 0;
+}
+EOF
+	atf_check -s exit:0 -o ignore -e ignore cc -o hello hello.c
+	atf_check -o inline:"hello world\n" ${HELPER} ./hello
+}
+
+atf_test_case fexecve_script
+fexecve_script()
+{
+	atf_set "descr" "Test fexecve with a shell script"
+}
+
+fexecve_script_body()
+{
+	cat > goodbye << EOF
+#!/bin/sh
+echo goodbye
+EOF
+	atf_check -s exit:0 -o ignore -e ignore chmod +x goodbye
+	atf_check -s exit:0 -o inline:"goodbye\n" ${HELPER} ./goodbye
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case fexecve_elf
+	atf_add_test_case fexecve_script
+}

Reply via email to