From a3e27d361919392eeb0086ed93b105d8301c7913 Mon Sep 17 00:00:00 2001
From: dzwdz
Date: Tue, 26 Jul 2022 19:31:06 +0200
Subject: user: move the POSIX-y stuff to the proper header files

---
 src/user/app/init/tests/main.c      |  6 ++++--
 src/user/app/init/tests/main.h      | 18 ------------------
 src/user/app/init/tests/pipe.c      |  5 +++--
 src/user/app/init/tests/semaphore.c |  6 ++++--
 src/user/app/init/tests/stress.c    |  4 ++--
 src/user/app/init/tests/tests.h     | 20 ++++++++++++++++++++
 6 files changed, 33 insertions(+), 26 deletions(-)
 delete mode 100644 src/user/app/init/tests/main.h
 create mode 100644 src/user/app/init/tests/tests.h

(limited to 'src/user/app/init/tests')

diff --git a/src/user/app/init/tests/main.c b/src/user/app/init/tests/main.c
index 4f8e858..cf59925 100644
--- a/src/user/app/init/tests/main.c
+++ b/src/user/app/init/tests/main.c
@@ -1,10 +1,12 @@
 #define TEST_MACROS
+#include "tests.h"
 #include <camellia/errno.h>
 #include <camellia/execbuf.h>
 #include <camellia/flags.h>
 #include <camellia/syscalls.h>
-#include <user/app/init/tests/main.h>
-#include <user/lib/stdlib.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 static void run_forked(void (*fn)()) {
 	if (!fork()) {
diff --git a/src/user/app/init/tests/main.h b/src/user/app/init/tests/main.h
deleted file mode 100644
index ed11c5e..0000000
--- a/src/user/app/init/tests/main.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-void stress_all(void);
-void test_all(void);
-
-void test_pipe(void);
-void test_semaphore(void);
-
-#ifdef TEST_MACROS
-
-#define argify(str) str, sizeof(str) - 1
-#define test_fail() do { \
-	printf("\033[31m" "TEST FAILED: %s:%xh\n" "\033[0m", __func__, __LINE__); \
-	_syscall_exit(0); \
-} while (0)
-#define assert(cond) if (!(cond)) test_fail();
-
-#endif
diff --git a/src/user/app/init/tests/pipe.c b/src/user/app/init/tests/pipe.c
index 227007a..f7005f8 100644
--- a/src/user/app/init/tests/pipe.c
+++ b/src/user/app/init/tests/pipe.c
@@ -1,8 +1,9 @@
 #define TEST_MACROS
+#include "tests.h"
 #include <camellia/flags.h>
 #include <camellia/syscalls.h>
-#include <user/app/init/tests/main.h>
-#include <user/lib/stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 static const char *pipe_msgs[2] = {"hello", "world"};
 
diff --git a/src/user/app/init/tests/semaphore.c b/src/user/app/init/tests/semaphore.c
index b55db9e..fc0cc10 100644
--- a/src/user/app/init/tests/semaphore.c
+++ b/src/user/app/init/tests/semaphore.c
@@ -1,9 +1,11 @@
 #define TEST_MACROS
+#include "tests.h"
 #include <camellia/flags.h>
 #include <camellia/syscalls.h>
-#include <user/app/init/tests/main.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
 #include <user/lib/esemaphore.h>
-#include <user/lib/stdlib.h>
 
 static void odd(handle_t out, struct evil_sem *sem1, struct evil_sem *sem2) {
 	_syscall_write(out, "1", 1, -1);
diff --git a/src/user/app/init/tests/stress.c b/src/user/app/init/tests/stress.c
index f797611..e620f0a 100644
--- a/src/user/app/init/tests/stress.c
+++ b/src/user/app/init/tests/stress.c
@@ -1,8 +1,8 @@
 #define TEST_MACROS
+#include "tests.h"
 #include <camellia/flags.h>
 #include <camellia/syscalls.h>
-#include <user/app/init/tests/main.h>
-#include <user/lib/stdlib.h>
+#include <unistd.h>
 
 static void run_forked(void (*fn)()) {
 	if (!fork()) {
diff --git a/src/user/app/init/tests/tests.h b/src/user/app/init/tests/tests.h
new file mode 100644
index 0000000..23ed1e3
--- /dev/null
+++ b/src/user/app/init/tests/tests.h
@@ -0,0 +1,20 @@
+#pragma once
+#include <camellia/syscalls.h>
+#include <stdio.h>
+
+void stress_all(void);
+void test_all(void);
+
+void test_pipe(void);
+void test_semaphore(void);
+
+#ifdef TEST_MACROS
+
+#define argify(str) str, sizeof(str) - 1
+#define test_fail() do { \
+	printf("\033[31m" "TEST FAILED: %s:%xh\n" "\033[0m", __func__, __LINE__); \
+	_syscall_exit(0); \
+} while (0)
+#define assert(cond) if (!(cond)) test_fail();
+
+#endif
-- 
cgit v1.2.3