From 6d7b80a6d2cb89b960bc8418888b764588e7b5f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nils=20O=2E=20Sel=C3=A5sdal?= <nos@utel.tech>
Date: Wed, 16 Jul 2025 00:50:07 +0200
Subject: [PATCH] Build on osx

---
 test/CMakeLists.txt |   6 +++-
 test/a.out          | Bin 0 -> 24272 bytes
 test/test_runner.c  |   2 ++
 test/test_string.c  |  85 ++++++++++++++++++++++----------------------
 test/test_strv.c    |   4 +--
 5 files changed, 52 insertions(+), 45 deletions(-)
 create mode 100755 test/a.out

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7551094..2d1d056 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,9 +2,13 @@ file(GLOB TEST_SOURCE_FILES test_*.c)
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     include_directories("/opt/homebrew/include")
+    link_directories("/opt/homebrew/lib")
+    list(REMOVE_ITEM TEST_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/test_ringbuf.c)
+else()
+    target_link_libraries(rt)
 endif()
 add_executable(test_runner ${TEST_SOURCE_FILES})
-target_link_libraries(test_runner check ucore rt)
+target_link_libraries(test_runner check ucore)
 
 add_custom_target(runtest COMMAND test_runner
                        DEPENDS test_runner
diff --git a/test/a.out b/test/a.out
new file mode 100755
index 0000000000000000000000000000000000000000..32656cffe72e2f4086f1f705662f8131c5ed35b5
GIT binary patch
literal 24272
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

literal 0
HcmV?d00001

diff --git a/test/test_runner.c b/test/test_runner.c
index fab2441..86aeba1 100644
--- a/test/test_runner.c
+++ b/test/test_runner.c
@@ -66,7 +66,9 @@ static suite_func suites[] = {
     iomux_suite,
     iomux_signal_suite,
     string_suite,
+#ifndef __APPLE__
     ringbuf_suite
+#endif
 
 };
 
diff --git a/test/test_string.c b/test/test_string.c
index 4307be1..6402681 100644
--- a/test/test_string.c
+++ b/test/test_string.c
@@ -7,91 +7,92 @@
 
 
 START_TEST (test_getfields)
-   
+{
    char str[] = "a;b;c";
-   char *letters[5] = {NULL}; 
+   char *letters[5] = {NULL};
 
    int rc = uc_getfields(str, letters, 5, 0, ";");
    ck_assert_int_eq(rc, 3);
-    
+
 
    ck_assert_str_eq("a", letters[0]);
    ck_assert_str_eq("b", letters[1]);
    ck_assert_str_eq("c", letters[2]);
-
+}
 END_TEST
 
 START_TEST (test_getfields_consecutive)
-   
+{
    char str[] = "a;;b;c;;;";
-   char *letters[7] = {NULL}; 
+   char *letters[7] = {NULL};
 
    int rc = uc_getfields(str, letters, 5, 0, ";");
    ck_assert_int_eq(rc, 5);
 
 
- // This result is rather silly, but it's 
+ // This result is rather silly, but it's
  // how getfields works with mflag=0
    ck_assert_str_eq("a", letters[0]);
    ck_assert_str_eq("", letters[1]);
    ck_assert_str_eq("b", letters[2]);
    ck_assert_str_eq("c", letters[3]);
    ck_assert_str_eq(";;", letters[4]);
-
+}
 END_TEST
 
 START_TEST (test_getfields_mflag)
+{
    char str[] = "a;b;c";
-   char *letters[5] = {NULL}; 
+   char *letters[5] = {NULL};
 
    int rc = uc_getfields(str, letters, 5, 1, ";");
    ck_assert_int_eq(rc, 3);
-    
+
 
    ck_assert_str_eq("a", letters[0]);
    ck_assert_str_eq("b", letters[1]);
    ck_assert_str_eq("c", letters[2]);
-
+}
 END_TEST
 
 START_TEST (test_getfields_consecutive_mflag)
-   
+{
    char str[] = "a;;b;c;;;";
-   char *letters[7] = {NULL}; 
+   char *letters[7] = {NULL};
 
    int rc = uc_getfields(str, letters, 7, 1, ";");
    ck_assert_int_eq(rc, 3);
 
 
- // This result is rather silly, but it's 
+ // This result is rather silly, but it's
  // how getfields works with mflag=0
    ck_assert_str_eq("a", letters[0]);
    ck_assert_str_eq("b", letters[1]);
    ck_assert_str_eq("c", letters[2]);
-
+}
 END_TEST
 
 START_TEST (test_getfields_too_many)
-   
+{
    char str[] = "a\r\nb\r\nc\r\nd\r\ne";
-   char *letters[4] = {NULL}; 
+   char *letters[4] = {NULL};
 
    int rc = uc_getfields(str, letters, 4, 0, "\r\n");
    ck_assert_int_eq(rc, 4);
 
- // This result is rather silly, but it's 
+ // This result is rather silly, but it's
  // how getfields works with mflag=0
    ck_assert_str_eq("a", letters[0]);
    ck_assert_str_eq("", letters[1]);
    ck_assert_str_eq("b", letters[2]);
    ck_assert_str_eq("\nc\r\nd\r\ne", letters[3]);
-
+}
 END_TEST
 
 START_TEST (test_getfields_too_many_mflag)
-   
+{
    char str[] = "a\r\nb\r\nc\r\nd\r\ne";
-   char *letters[4] = {NULL}; 
+   char *letters[4] = {NULL};
 
    int rc = uc_getfields(str, letters, 4, 1, "\r\n");
    ck_assert_int_eq(rc, 4);
@@ -100,13 +101,13 @@ START_TEST (test_getfields_too_many_mflag)
    ck_assert_str_eq("b", letters[1]);
    ck_assert_str_eq("c", letters[2]);
    ck_assert_str_eq("d\r\ne", letters[3]);
-
+}
 END_TEST
 
 START_TEST (test_getfields_empty)
-   
+{
    char str[] = "";
-   char *letters[4] = {NULL}; 
+   char *letters[4] = {NULL};
 
    int rc = uc_getfields(str, letters, 4, 0, ";\r\n");
    ck_assert_int_eq(rc, 1);
@@ -115,53 +116,53 @@ START_TEST (test_getfields_empty)
    rc = uc_getfields(str, letters, 4, 1, ";\r\n");
    ck_assert_int_eq(rc, 0);
 
-
+}
 END_TEST
 
 START_TEST (test_gettokens)
-   
+{
    char str[] = "a;b;c";
-   char *letters[5] = {NULL}; 
+   char *letters[5] = {NULL};
 
    int rc = uc_gettokens(str, letters, 5,";");
    ck_assert_int_eq(rc, 3);
-    
+
 
    ck_assert_str_eq("a", letters[0]);
    ck_assert_str_eq("b", letters[1]);
    ck_assert_str_eq("c", letters[2]);
-
+}
 END_TEST
 
 START_TEST (test_gettokens_consecutive)
-   
+{
    char str[] = "a;;;b;;c;";
-   char *letters[5] = {NULL}; 
+   char *letters[5] = {NULL};
 
    int rc = uc_gettokens(str, letters, 5,";");
    ck_assert_int_eq(rc, 3);
-    
+
 
    ck_assert_str_eq("a", letters[0]);
    ck_assert_str_eq("b", letters[1]);
    ck_assert_str_eq("c", letters[2]);
-
+}
 END_TEST
 
 START_TEST (test_gettokens_empty)
-   
+{
    char str[] = "";
-   char *letters[5] = {NULL}; 
+   char *letters[5] = {NULL};
 
    int rc = uc_gettokens(str, letters, 5,";");
    ck_assert_int_eq(rc, 0);
-
+}
 END_TEST
 
 START_TEST (test_gettokens_quotes)
-   
+{
    char str[] = "\"abc\";d;\"e \"";
-   char *letters[5] = {NULL}; 
+   char *letters[5] = {NULL};
 
    int rc = uc_gettokens(str, letters, 5,";");
    ck_assert_int_eq(rc, 3);
@@ -169,13 +170,13 @@ START_TEST (test_gettokens_quotes)
    ck_assert_str_eq("abc", letters[0]);
    ck_assert_str_eq("d", letters[1]);
    ck_assert_str_eq("e ", letters[2]);
-
+}
 END_TEST
 
 START_TEST (test_gettokens_double_quotes)
-   
+{
    char str[] = "\"\"abc\"\";d;\"e\"\"f\"\"\"";
-   char *letters[5] = {NULL}; 
+   char *letters[5] = {NULL};
 
    int rc = uc_gettokens(str, letters, 5,";");
    ck_assert_int_eq(rc, 3);
@@ -183,7 +184,7 @@ START_TEST (test_gettokens_double_quotes)
    ck_assert_str_eq("abc", letters[0]);
    ck_assert_str_eq("d", letters[1]);
    ck_assert_str_eq("e\"f\"", letters[2]);
-
+}
 END_TEST
 
 Suite *string_suite(void)
diff --git a/test/test_strv.c b/test/test_strv.c
index 44a9976..8e53902 100644
--- a/test/test_strv.c
+++ b/test/test_strv.c
@@ -136,6 +136,7 @@ START_TEST (test_strv_append_all_nocopy)
 END_TEST
 
 START_TEST (test_strv_reverse)
+{
     struct UCStrv strv;
 
     uc_strv_init(&strv);
@@ -170,8 +171,7 @@ START_TEST (test_strv_reverse)
     ck_assert_str_eq("string1", strv.strings[2]);
 
     uc_strv_destroy(&strv);
-
-
+}
 END_TEST
 
 Suite *strv_suite(void)