Merge branch 'main' of https://github.com/dreamer-coding/fossil-media

Author: dreamer-coding

.github/ciimage/Dockerfile.ubuntu

@@ -28,4 +28,4 @@ RUN python3 -m pip install --no-cache-dir meson ninja
 # Set environment variables
 ENV CC=/usr/bin/gcc
 ENV CXX=/usr/bin/g++
-ENV LD_LIBRARY_PATH=/usr/local/lib
+ENV LD_LIBRARY_PATH=/usr/local/lib

LICENSE

@@ -1,5 +1,5 @@
 if get_option('with_test').enabled()
-    run_command(['python3', 'tools' / 'generate-runner.py'], check: true)
+    run_command(['python3', 'tools' / 'runner.py'], check: true)
     cards = run_command(['python3', 'tools' / 'wildcard.py'], check: true)
 
     test_cases = ['unit_runner.c', cards.stdout().strip().split('\n')]

code/tests/meson.build

@@ -1,27 +1,37 @@
 import os
 import re
+import sys
 
 
 class TestRunnerGenerator:
     def __init__(self):
         # Set the directory to a subdirectory named 'cases' within the current working directory
         self.directory = os.path.join(os.getcwd(), "cases")
+        # Detect if running on Apple (macOS)
+        self.is_apple = sys.platform == "darwin"
 
     def find_test_groups(self):
-        test_groups = set()
+        c_cpp_groups = set()
+        objc_groups = set()
+        objcpp_groups = set()
         pattern = r"FOSSIL_TEST_GROUP\((\w+)\)"
 
         # Walk through files in the specified directory, 'cases'
         for root, _, files in os.walk(self.directory):
             for file in files:
-                # Search for C and C++ files
-                if (file.startswith("test_") and file.endswith(".c")) or file.endswith(".cpp"):
-                    with open(os.path.join(root, file), "r") as f:
+                if file.startswith("test_"):
+                    file_path = os.path.join(root, file)
+                    with open(file_path, "r") as f:
                         content = f.read()
                         matches = re.findall(pattern, content)
-                        test_groups.update(matches)
+                        if file.endswith(".c") or file.endswith(".cpp"):
+                            c_cpp_groups.update(matches)
+                        elif self.is_apple and file.endswith(".m"):
+                            objc_groups.update(matches)
+                        elif self.is_apple and file.endswith(".mm"):
+                            objcpp_groups.update(matches)
 
-        return list(test_groups)
+        return list(c_cpp_groups), list(objc_groups), list(objcpp_groups)
 
     def generate_c_runner(self, test_groups):
         # Prepare header content for the test runner
@@ -71,7 +81,12 @@ def generate_c_runner(self, test_groups):
 
 # Instantiate the generator, find test groups, and generate the test runner
 generator = TestRunnerGenerator()
-test_groups = generator.find_test_groups()
+c_cpp_groups, objc_groups, objcpp_groups = generator.find_test_groups()
 
-# Generate the test runner for C and C++ tests
+# Only include Objective-C/Objective-C++ groups if on Apple
+test_groups = c_cpp_groups
+if generator.is_apple:
+    test_groups += objc_groups + objcpp_groups
+
+# Generate the test runner for C and C++ (and Objective-C/Objective-C++ on Apple) tests
 generator.generate_c_runner(test_groups)

code/tests/tools/generate-note.py

@@ -1,6 +1,6 @@
 project('Fossil Media', 'c', 'cpp',
     meson_version: '>=1.8.0',
-    license: 'MPL-2.0',
+    license: 'Apache-2.0',
     version: '0.1.0',
     default_options: [
         'c_std=c11,c18',