testsuite/syscalls01: Split out program01 part.

This allows to use normal functions for sockets and similar while
allowing to test the upcoming rtems_bsd_program_opan/close/... for the
program part.

libbsd.py

@@ -2528,6 +2528,7 @@ def tests(mm):
     mod.addTest(mm.generator['test']('rwlock01', ['test_main']))
     mod.addTest(mm.generator['test']('sleep01', ['test_main']))
     mod.addTest(mm.generator['test']('syscalls01', ['test_main']))
+    mod.addTest(mm.generator['test']('program01', ['test_main']))
     mod.addTest(mm.generator['test']('commands01', ['test_main']))
     mod.addTest(mm.generator['test']('usb01', ['init', 'test-file-system'], False))
     mod.addTest(mm.generator['test']('loopback01', ['test_main']))

libbsd_waf.py

@@ -34,7 +34,7 @@ def configure(conf):
 def build(bld):
     # C/C++ flags
     common_flags = []
-    common_flags += ["-O2"]
+    common_flags += ["-O0"]
     common_flags += ["-g"]
     common_flags += ["-fno-strict-aliasing"]
     common_flags += ["-ffreestanding"]
@@ -1407,6 +1407,16 @@ def build(bld):
                 lib = ["m", "z"],
                 install_path = None)
 
+    test_program01 = ['testsuite/program01/test_main.c']
+    bld.program(target = "program01.exe",
+                features = "cprogram",
+                cflags = cflags,
+                includes = includes,
+                source = test_program01,
+                use = ["bsd"],
+                lib = ["m", "z"],
+                install_path = None)
+
     test_rcconf01 = ['testsuite/rcconf01/test_main.c']
     bld.program(target = "rcconf01.exe",
                 features = "cprogram",

testsuite/program01/test_main.c

@@ -0,0 +1,318 @@
+/*
+ * Copyright (c) 2013 embedded brains GmbH.  All rights reserved.
+ *
+ *  embedded brains GmbH
+ *  Dornierstr. 4
+ *  82178 Puchheim
+ *  Germany
+ *  <rtems@embedded-brains.de>
+ *
+ * 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 AUTHOR 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 AUTHOR 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 <err.h>
+#include <assert.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <syslog.h>
+#include <sys/socket.h>
+#include <fcntl.h>
+
+#define RTEMS_BSD_PROGRAM_NO_EXIT_WRAP
+#define RTEMS_BSD_PROGRAM_NO_PRINTF_WRAP
+#include <machine/rtems-bsd-program.h>
+#include <machine/pcpu.h>
+
+#include <rtems.h>
+#include <rtems/libcsupport.h>
+
+#define TEST_NAME "LIBBSD SYSCALLS 1"
+
+typedef void (*no_mem_test_body)(int fd);
+
+typedef struct {
+	no_mem_test_body body;
+	int fd;
+	rtems_id master_task;
+} no_mem_test;
+
+static void
+no_mem_task(rtems_task_argument arg)
+{
+	const no_mem_test *self = (const no_mem_test *) arg;
+	rtems_status_code sc;
+	void *greedy;
+
+	assert(rtems_configuration_get_unified_work_area());
+
+	greedy = rtems_workspace_greedy_allocate(NULL, 0);
+	(*self->body)(self->fd);
+	rtems_workspace_greedy_free(greedy);
+
+	sc = rtems_event_transient_send(self->master_task);
+	assert(sc == RTEMS_SUCCESSFUL);
+
+	sc = rtems_task_suspend(RTEMS_SELF);
+	assert(sc == RTEMS_SUCCESSFUL);
+}
+
+void
+do_no_mem_test(no_mem_test_body body, int fd)
+{
+	no_mem_test test = {
+		.body = body,
+		.fd = fd,
+		.master_task = rtems_task_self()
+	};
+	rtems_status_code sc;
+	rtems_id id;
+	rtems_resource_snapshot snapshot;
+
+	rtems_resource_snapshot_take(&snapshot);
+
+	sc = rtems_task_create(
+		rtems_build_name('N', 'M', 'E', 'M'),
+		RTEMS_MINIMUM_PRIORITY,
+		RTEMS_MINIMUM_STACK_SIZE,
+		RTEMS_DEFAULT_MODES,
+		RTEMS_FLOATING_POINT,
+		&id
+	);
+	assert(sc == RTEMS_SUCCESSFUL);
+
+	sc = rtems_task_start(id, no_mem_task, (rtems_task_argument) &test);
+	assert(sc == RTEMS_SUCCESSFUL);
+
+	sc = rtems_event_transient_receive(RTEMS_WAIT, RTEMS_NO_TIMEOUT);
+	assert(sc == RTEMS_SUCCESSFUL);
+
+	sc = rtems_task_delete(id);
+	assert(sc == RTEMS_SUCCESSFUL);
+
+	assert(rtems_resource_snapshot_check(&snapshot));
+}
+
+static const char prog_name[] = "prog";
+
+static int
+invalid_prog(void *ctx)
+{
+	(void) ctx;
+
+	assert(0);
+}
+
+static int
+invalid_main(int argc, char **argv)
+{
+	(void) argc;
+	(void) argv;
+
+	assert(0);
+}
+
+static void *const some_context = (void *) 0xcafe;
+
+static int
+some_prog(void *ctx)
+{
+	assert(ctx == some_context);
+	assert(strcmp(rtems_bsd_program_get_name(), prog_name) == 0);
+	assert(rtems_bsd_program_get_context() == some_context);
+	errno = 0;
+	rtems_bsd_program_exit(456);
+}
+
+static const int some_argc = 1;
+
+static char *some_argv[] = { "a", NULL };
+
+static int
+some_main(int argc, char **argv)
+{
+	assert(argc == some_argc);
+	assert(argv == some_argv);
+	assert(strcmp(rtems_bsd_program_get_name(), prog_name) == 0);
+	errno = 0;
+	rtems_bsd_program_exit(789);
+}
+
+static void
+no_mem_bsd_program(int fd)
+{
+	(void) fd;
+
+	assert(rtems_bsd_program_call(prog_name, invalid_prog, NULL)
+	    == EXIT_FAILURE);
+	assert(rtems_bsd_program_call_main(prog_name, invalid_main, some_argc,
+	    some_argv) == EXIT_FAILURE);
+	assert(strcmp(rtems_bsd_program_get_name(), "?") == 0);
+	assert(rtems_bsd_program_get_context() == NULL);
+}
+
+static void
+test_bsd_program(void)
+{
+	rtems_resource_snapshot snapshot;
+	int exit_code;
+	void *greedy;
+	char *invalid_argv[2] = { "a", "b" };
+	struct thread *td;
+
+	assert(rtems_configuration_get_unified_work_area());
+
+	puts("test BSD program");
+
+	/* Needs to be called once before the snapshot is taken so that the
+	 * thread structure is already created. */
+	td = rtems_bsd_get_curthread_or_null();
+	assert(td != NULL);
+
+	rtems_resource_snapshot_take(&snapshot);
+
+	do_no_mem_test(no_mem_bsd_program, -1);
+
+	greedy = rtems_workspace_greedy_allocate(NULL, 0);
+	no_mem_bsd_program(-1);
+	rtems_workspace_greedy_free(greedy);
+
+	errno = 0;
+	exit_code = rtems_bsd_program_call_main(prog_name, NULL, 1, invalid_argv);
+	assert(errno == EFAULT);
+	assert(exit_code == EXIT_FAILURE);
+
+	errno = EINVAL;
+	exit_code = rtems_bsd_program_call(prog_name, some_prog, some_context);
+	assert(errno == 0);
+	assert(exit_code == 456);
+	assert(strcmp(rtems_bsd_program_get_name(), "?") == 0);
+	assert(rtems_bsd_program_get_context() == NULL);
+
+	errno = EINVAL;
+	exit_code = rtems_bsd_program_call_main(prog_name, some_main,
+	    some_argc, some_argv);
+	assert(errno == 0);
+	assert(exit_code == 789);
+	assert(strcmp(rtems_bsd_program_get_name(), "?") == 0);
+	assert(rtems_bsd_program_get_context() == NULL);
+
+	assert(rtems_resource_snapshot_check(&snapshot));
+}
+
+static void
+test_warn(void)
+{
+	puts("test warn");
+
+	errno = EAGAIN;
+	warn("%s", "warn");
+
+	errno = ENAMETOOLONG;
+	warn(NULL);
+
+	errno = 0;
+	warnc(EDOM, "%s", "warnc");
+
+	errno = 0;
+	warnc(ERANGE, NULL);
+
+	warnx("%s", "warnx");
+
+	warnx(NULL);
+}
+
+static int
+call_err(void *ctx)
+{
+	errno = EAGAIN;
+	err(10, "%s", "call_err");
+}
+
+static int
+call_err_null(void *ctx)
+{
+	errno = ENAMETOOLONG;
+	err(11, NULL);
+}
+
+static int
+call_errc(void *ctx)
+{
+	errc(12, EDOM, "%s", "call_errc");
+}
+
+static int
+call_errc_null(void *ctx)
+{
+	errc(13, ERANGE, NULL);
+}
+
+static int
+call_errx(void *ctx)
+{
+	errx(14, "%s", "call_errx");
+}
+
+static int
+call_errx_null(void *ctx)
+{
+	errx(15, NULL);
+}
+
+static void
+test_err(void)
+{
+	int exit_code;
+
+	puts("test err");
+
+	exit_code = rtems_bsd_program_call("err", call_err, NULL);
+	assert(exit_code == 10);
+
+	exit_code = rtems_bsd_program_call("err", call_err_null, NULL);
+	assert(exit_code == 11);
+
+	exit_code = rtems_bsd_program_call("errc", call_errc, NULL);
+	assert(exit_code == 12);
+
+	exit_code = rtems_bsd_program_call("errc", call_errc_null, NULL);
+	assert(exit_code == 13);
+
+	exit_code = rtems_bsd_program_call("errx", call_errx, NULL);
+	assert(exit_code == 14);
+
+	exit_code = rtems_bsd_program_call("errx", call_errx_null, NULL);
+	assert(exit_code == 15);
+}
+
+static void
+test_main(void)
+{
+	test_bsd_program();
+	test_warn();
+	test_err();
+
+	exit(0);
+}
+
+#include <rtems/bsd/test/default-init.h>

testsuite/syscalls01/test_main.c

@@ -52,10 +52,6 @@
 #include <unistd.h>
 #include <syslog.h>
 
-#define RTEMS_BSD_PROGRAM_NO_EXIT_WRAP
-#define RTEMS_BSD_PROGRAM_NO_PRINTF_WRAP
-#include <machine/rtems-bsd-program.h>
-
 #include <rtems.h>
 #include <rtems/libcsupport.h>
 
@@ -1552,193 +1548,6 @@ test_kqueue_kevent(void)
 	assert(rtems_resource_snapshot_check(&snapshot));
 }
 
-static const char prog_name[] = "prog";
-
-static int
-invalid_prog(void *ctx)
-{
-	(void) ctx;
-
-	assert(0);
-}
-
-static int
-invalid_main(int argc, char **argv)
-{
-	(void) argc;
-	(void) argv;
-
-	assert(0);
-}
-
-static void *const some_context = (void *) 0xcafe;
-
-static int
-some_prog(void *ctx)
-{
-	assert(ctx == some_context);
-	assert(strcmp(rtems_bsd_program_get_name(), prog_name) == 0);
-	assert(rtems_bsd_program_get_context() == some_context);
-	errno = 0;
-	rtems_bsd_program_exit(456);
-}
-
-static const int some_argc = 1;
-
-static char *some_argv[] = { "a", NULL };
-
-static int
-some_main(int argc, char **argv)
-{
-	assert(argc == some_argc);
-	assert(argv == some_argv);
-	assert(strcmp(rtems_bsd_program_get_name(), prog_name) == 0);
-	errno = 0;
-	rtems_bsd_program_exit(789);
-}
-
-static void
-no_mem_bsd_program(int fd)
-{
-	(void) fd;
-
-	assert(rtems_bsd_program_call(prog_name, invalid_prog, NULL)
-	    == EXIT_FAILURE);
-	assert(rtems_bsd_program_call_main(prog_name, invalid_main, some_argc,
-	    some_argv) == EXIT_FAILURE);
-	assert(strcmp(rtems_bsd_program_get_name(), "?") == 0);
-	assert(rtems_bsd_program_get_context() == NULL);
-}
-
-static void
-test_bsd_program(void)
-{
-	rtems_resource_snapshot snapshot;
-	int exit_code;
-	void *greedy;
-	char *invalid_argv[2] = { "a", "b" };
-
-	assert(rtems_configuration_get_unified_work_area());
-
-	puts("test BSD program");
-
-	rtems_resource_snapshot_take(&snapshot);
-
-	do_no_mem_test(no_mem_bsd_program, -1);
-
-	greedy = rtems_workspace_greedy_allocate(NULL, 0);
-	no_mem_bsd_program(-1);
-	rtems_workspace_greedy_free(greedy);
-
-	errno = 0;
-	exit_code = rtems_bsd_program_call_main(prog_name, NULL, 1, invalid_argv);
-	assert(errno == EFAULT);
-	assert(exit_code == EXIT_FAILURE);
-
-	errno = EINVAL;
-	exit_code = rtems_bsd_program_call(prog_name, some_prog, some_context);
-	assert(errno == 0);
-	assert(exit_code == 456);
-	assert(strcmp(rtems_bsd_program_get_name(), "?") == 0);
-	assert(rtems_bsd_program_get_context() == NULL);
-
-	errno = EINVAL;
-	exit_code = rtems_bsd_program_call_main(prog_name, some_main,
-	    some_argc, some_argv);
-	assert(errno == 0);
-	assert(exit_code == 789);
-	assert(strcmp(rtems_bsd_program_get_name(), "?") == 0);
-	assert(rtems_bsd_program_get_context() == NULL);
-
-	assert(rtems_resource_snapshot_check(&snapshot));
-}
-
-static void
-test_warn(void)
-{
-	puts("test warn");
-
-	errno = EAGAIN;
-	warn("%s", "warn");
-
-	errno = ENAMETOOLONG;
-	warn(NULL);
-
-	errno = 0;
-	warnc(EDOM, "%s", "warnc");
-
-	errno = 0;
-	warnc(ERANGE, NULL);
-
-	warnx("%s", "warnx");
-
-	warnx(NULL);
-}
-
-static int
-call_err(void *ctx)
-{
-	errno = EAGAIN;
-	err(10, "%s", "call_err");
-}
-
-static int
-call_err_null(void *ctx)
-{
-	errno = ENAMETOOLONG;
-	err(11, NULL);
-}
-
-static int
-call_errc(void *ctx)
-{
-	errc(12, EDOM, "%s", "call_errc");
-}
-
-static int
-call_errc_null(void *ctx)
-{
-	errc(13, ERANGE, NULL);
-}
-
-static int
-call_errx(void *ctx)
-{
-	errx(14, "%s", "call_errx");
-}
-
-static int
-call_errx_null(void *ctx)
-{
-	errx(15, NULL);
-}
-
-static void
-test_err(void)
-{
-	int exit_code;
-
-	puts("test err");
-
-	exit_code = rtems_bsd_program_call("err", call_err, NULL);
-	assert(exit_code == 10);
-
-	exit_code = rtems_bsd_program_call("err", call_err_null, NULL);
-	assert(exit_code == 11);
-
-	exit_code = rtems_bsd_program_call("errc", call_errc, NULL);
-	assert(exit_code == 12);
-
-	exit_code = rtems_bsd_program_call("errc", call_errc_null, NULL);
-	assert(exit_code == 13);
-
-	exit_code = rtems_bsd_program_call("errx", call_errx, NULL);
-	assert(exit_code == 14);
-
-	exit_code = rtems_bsd_program_call("errx", call_errx_null, NULL);
-	assert(exit_code == 15);
-}
-
 static void
 test_syslog(void)
 {
@@ -1807,9 +1616,6 @@ test_main(void)
 	test_kqueue_fstat();
 	test_kqueue_kevent();
 
-	test_bsd_program();
-	test_warn();
-	test_err();
 	test_syslog();
 	test_setgethostname();