From 519a1de7d9fe809efc4077933fabbe93a8da9439 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Thu, 20 May 2021 20:19:05 +0200
Subject: More generic makefile layout
---
apps/test/Makefile | 17 ++-------
apps/test/main.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++
apps/test/test.c | 108 -----------------------------------------------------
3 files changed, 112 insertions(+), 121 deletions(-)
create mode 100644 apps/test/main.c
delete mode 100644 apps/test/test.c
(limited to 'apps/test')
diff --git a/apps/test/Makefile b/apps/test/Makefile
index e80b54b..b0e05f3 100644
--- a/apps/test/Makefile
+++ b/apps/test/Makefile
@@ -1,16 +1,7 @@
# MIT License, Copyright (c) 2021 Marvin Borner
-OBJS = test.o fuzz.o
+NAME = test
+OBJS = main.o fuzz.o
+LIBS = -lc
-all: $(OBJS)
- @mkdir -p $(BUILD)/apps/test/
- @$(LD) -o $(BUILD)/apps/test/exec $(LDFLAGS) $^ -lc
-ifeq ($(CONFIG_STRIP), true)
- @$(ST) --strip-all $(BUILD)/apps/test/exec
-endif
-
-clean:
- @$(RM) -f $(OBJS)
-
-%.o: %.c
- @$(CC) -c $(CFLAGS) $< -o $@
+include ../generic.mk
diff --git a/apps/test/main.c b/apps/test/main.c
new file mode 100644
index 0000000..2101412
--- /dev/null
+++ b/apps/test/main.c
@@ -0,0 +1,108 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#include "test.h"
+
+#include <conv.h>
+#include <crypto.h>
+#include <math.h>
+#include <mem.h>
+#include <print.h>
+#include <str.h>
+#include <sys.h>
+
+#define a_mag 0x55
+#define b_mag 0x42
+
+#define TEST(name) static void test_##name(void)
+#define CHECK(exp) pass_or_fail(__FILE__, __LINE__, __func__, #exp, "1", exp);
+#define EQUALS(first, second) \
+ pass_or_fail(__FILE__, __LINE__, __func__, #first, #second, (first) == (second));
+#define EQUALS_STR(first, second) \
+ pass_or_fail(__FILE__, __LINE__, __func__, #first, #second, strcmp((first), (second)) == 0);
+
+static u32 failed;
+
+static void pass_or_fail(const char *file_name, int line_num, const char *func, const char *first,
+ const char *second, int success)
+{
+ failed += success ? 0 : 1;
+ log("\x1B[%s\x1B[0m %s:%d: %s: %s == %s\n", success ? "32m[PASS]" : "31m[FAIL]", file_name,
+ line_num, func, first, second);
+}
+
+TEST(math)
+{
+ EQUALS(pow(2, 3), 8);
+ EQUALS(pow(0, 3), 0);
+ EQUALS(pow(0, 0), 1);
+}
+
+TEST(crypto)
+{
+ const char *text = "Melvix";
+ u32 length = 6;
+
+ EQUALS(crc32(0, text, length), 0x98bb3595);
+
+ const u8 md5_text[16] = {
+ 0x01, 0xdc, 0xaf, 0x55, 0x2a, 0xe5, 0x7a, 0xf2,
+ 0xe5, 0xb4, 0x75, 0xac, 0x0f, 0x38, 0x97, 0x9c,
+ };
+ u8 md5_res[16] = { 0 };
+ md5(text, length, md5_res);
+ EQUALS(memcmp(md5_res, md5_text, 16), 0);
+}
+
+TEST(conv)
+{
+ char buf1[1] = { 0 };
+ char buf2[7] = { 0 };
+ char buf3[5] = { 0 };
+ char buf4[3] = { 0 };
+ EQUALS(atoi("42"), 42);
+ EQUALS_STR(htoa(0x42), "42");
+ EQUALS(htoi("42"), 0x42);
+ EQUALS_STR(itoa(42), "42");
+ EQUALS_STR(conv_base(42, buf1, 0, 0), "");
+ EQUALS_STR(conv_base(42, buf2, 2, 0), "101010");
+ EQUALS_STR(conv_base(424242, buf3, 36, 0), "93ci");
+ EQUALS_STR(conv_base(0xffffffff, buf4, 10, 1), "-1");
+}
+
+TEST(mem)
+{
+ const char *str0 = "";
+ const char *str1 = "";
+ const char *str2 = "12345";
+ const char *str3 = "12345";
+ const char *str4 = "12354";
+ EQUALS(memcmp(str4, str2, strlen(str2)), 1);
+ EQUALS(memcmp(str2, str4, strlen(str2)), -1);
+ EQUALS(memcmp(str2, str3, strlen(str2)), 0);
+ EQUALS(memcmp(str0, str1, strlen(str0)), 0);
+
+ char buf[6] = { 0 };
+ EQUALS_STR(memcpy(buf, "hallo", 6), "hallo");
+
+ char buf2[6] = { 0 };
+ EQUALS_STR(memset(buf2, 'x', 5), "xxxxx");
+}
+
+int main(void)
+{
+ test_math();
+ test_crypto();
+ test_conv();
+ test_mem();
+
+ /* fuzz(); */
+
+ if (failed)
+ log("%d tests failed\n", failed);
+ else
+ log("All tests passed\n");
+
+ boot(SYS_BOOT_SHUTDOWN);
+
+ return 0;
+}
diff --git a/apps/test/test.c b/apps/test/test.c
deleted file mode 100644
index 2101412..0000000
--- a/apps/test/test.c
+++ /dev/null
@@ -1,108 +0,0 @@
-// MIT License, Copyright (c) 2020 Marvin Borner
-
-#include "test.h"
-
-#include <conv.h>
-#include <crypto.h>
-#include <math.h>
-#include <mem.h>
-#include <print.h>
-#include <str.h>
-#include <sys.h>
-
-#define a_mag 0x55
-#define b_mag 0x42
-
-#define TEST(name) static void test_##name(void)
-#define CHECK(exp) pass_or_fail(__FILE__, __LINE__, __func__, #exp, "1", exp);
-#define EQUALS(first, second) \
- pass_or_fail(__FILE__, __LINE__, __func__, #first, #second, (first) == (second));
-#define EQUALS_STR(first, second) \
- pass_or_fail(__FILE__, __LINE__, __func__, #first, #second, strcmp((first), (second)) == 0);
-
-static u32 failed;
-
-static void pass_or_fail(const char *file_name, int line_num, const char *func, const char *first,
- const char *second, int success)
-{
- failed += success ? 0 : 1;
- log("\x1B[%s\x1B[0m %s:%d: %s: %s == %s\n", success ? "32m[PASS]" : "31m[FAIL]", file_name,
- line_num, func, first, second);
-}
-
-TEST(math)
-{
- EQUALS(pow(2, 3), 8);
- EQUALS(pow(0, 3), 0);
- EQUALS(pow(0, 0), 1);
-}
-
-TEST(crypto)
-{
- const char *text = "Melvix";
- u32 length = 6;
-
- EQUALS(crc32(0, text, length), 0x98bb3595);
-
- const u8 md5_text[16] = {
- 0x01, 0xdc, 0xaf, 0x55, 0x2a, 0xe5, 0x7a, 0xf2,
- 0xe5, 0xb4, 0x75, 0xac, 0x0f, 0x38, 0x97, 0x9c,
- };
- u8 md5_res[16] = { 0 };
- md5(text, length, md5_res);
- EQUALS(memcmp(md5_res, md5_text, 16), 0);
-}
-
-TEST(conv)
-{
- char buf1[1] = { 0 };
- char buf2[7] = { 0 };
- char buf3[5] = { 0 };
- char buf4[3] = { 0 };
- EQUALS(atoi("42"), 42);
- EQUALS_STR(htoa(0x42), "42");
- EQUALS(htoi("42"), 0x42);
- EQUALS_STR(itoa(42), "42");
- EQUALS_STR(conv_base(42, buf1, 0, 0), "");
- EQUALS_STR(conv_base(42, buf2, 2, 0), "101010");
- EQUALS_STR(conv_base(424242, buf3, 36, 0), "93ci");
- EQUALS_STR(conv_base(0xffffffff, buf4, 10, 1), "-1");
-}
-
-TEST(mem)
-{
- const char *str0 = "";
- const char *str1 = "";
- const char *str2 = "12345";
- const char *str3 = "12345";
- const char *str4 = "12354";
- EQUALS(memcmp(str4, str2, strlen(str2)), 1);
- EQUALS(memcmp(str2, str4, strlen(str2)), -1);
- EQUALS(memcmp(str2, str3, strlen(str2)), 0);
- EQUALS(memcmp(str0, str1, strlen(str0)), 0);
-
- char buf[6] = { 0 };
- EQUALS_STR(memcpy(buf, "hallo", 6), "hallo");
-
- char buf2[6] = { 0 };
- EQUALS_STR(memset(buf2, 'x', 5), "xxxxx");
-}
-
-int main(void)
-{
- test_math();
- test_crypto();
- test_conv();
- test_mem();
-
- /* fuzz(); */
-
- if (failed)
- log("%d tests failed\n", failed);
- else
- log("All tests passed\n");
-
- boot(SYS_BOOT_SHUTDOWN);
-
- return 0;
-}
--
cgit v1.2.3