Switch To Simple Unit Testing Framework

Author: pegvin

.github/workflows/ci.yml

@@ -14,15 +14,32 @@ jobs:
             gen_short_name: "vs17_2022"
             gen_cmake_name: "Visual Studio 17 2022"
 
+          - os: windows-2022
+            arch: Win32
+            gen_short_name: "vs17_2022"
+            gen_cmake_name: "Visual Studio 17 2022"
+
           - os: ubuntu-22.04
             arch: x64
             cc: gcc
             cxx: g++
+            pkgs: gcc
+
+          - os: ubuntu-22.04
+            arch: x32
+            cc: gcc
+            cxx: g++
+            pkgs: gcc-multilib g++-multilib
+            flags: "-m32"
 
           - os: macos-12
             arch: x86_64
             gen: Xcode
 
+          - os: macos-12
+            arch: arm64
+            gen: Xcode
+
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -32,27 +49,9 @@ jobs:
     - name: Install Deps (Linux)
       if: ${{ matrix.os == 'ubuntu-22.04' }}
       run: |
+        sudo dpkg --add-architecture i386
         sudo apt-get update -y
-        sudo apt-get install gcc libcriterion-dev cmake meson ninja-build libgit2-dev libffi-dev -y
-        git clone https://github.com/Snaipe/Criterion.git --recursive
-        cd Criterion
-        meson setup -Dc_std=gnu11 --prefix /usr/local --libdir lib --buildtype plain --force-fallback-for libffi --wrap-mode nodownload build
-        meson compile -C build
-        sudo meson install -C build
-
-    - name: Install Deps (Windows)
-      if: ${{ matrix.os == 'windows-2022' }}
-      run: |
-        choco install cmake meson ninja
-        git clone https://github.com/Snaipe/Criterion.git --recursive
-        cd Criterion
-        meson setup -Dc_std=c11 --prefix /usr/local --libdir lib --buildtype plain --force-fallback-for libffi --wrap-mode nodownload build
-        meson compile -C build
-        meson install -C build
-
-    - name: Install Deps (MacOS)
-      if: ${{ matrix.os == 'macos-12' }}
-      run: brew install criterion
+        sudo apt-get install ${{ matrix.pkgs }} cmake ninja-build -y
 
     - name: Generate Build Files & Build (Linux)
       if: ${{ matrix.os == 'ubuntu-22.04' }}

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "test/minunit"]
+	path = test/minunit
+	url = https://github.com/csprite/minunit

CMakeLists.txt

@@ -24,13 +24,9 @@ if(WIN32 OR CYGWIN)
 endif()
 
 if(FILESYSTEM_BUILD_TESTS)
-	include(./FindCriterion.cmake)
-	if(NOT CRITERION_FOUND)
-		message(FATAL_ERROR "criterion not found")
-	endif()
 	project(FileSystem_Test CXX)
-	add_executable(FileSystem_Test ${CMAKE_CURRENT_SOURCE_DIR}/src/test.cpp)
-	target_include_directories(FileSystem_Test PUBLIC ${CRITERION_INCLUDE_DIRS})
-	target_link_libraries(FileSystem_Test PUBLIC FileSystem ${CRITERION_LIBRARIES} criterion)
+	add_executable(FileSystem_Test ${CMAKE_CURRENT_SOURCE_DIR}/test/test.cpp)
+	target_include_directories(FileSystem_Test PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/test/minunit/)
+	target_link_libraries(FileSystem_Test PUBLIC FileSystem rt)
 endif()
 

FindCriterion.cmake

@@ -0,0 +1,15 @@
+#include "minunit/minunit.h"
+
+MU_TEST(test_check) {
+	mu_check(5 == 7);
+}
+MU_TEST_SUITE(test_suite) {
+	MU_RUN_TEST(test_check);
+}
+
+int main(int argc, char *argv[]) {
+	MU_RUN_SUITE(test_suite);
+	MU_REPORT();
+	return MU_EXIT_CODE;
+}
+