test: add option for multiple tests

Author: MaJerle

.github/workflows/build-and-test.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - develop
+      - test
   pull_request:
     branches:
       - develop
@@ -22,14 +23,7 @@ jobs:
           echo "C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin" >> $GITHUB_PATH
           gcc --version
 
-      - name: Build for 32-bit
-        run: |
-          mkdir __build__
-          cd __build__
-          cmake -S.. -T host=x86 -A Win32
-          cmake --build .
-
       - name: Run Tests
-        working-directory: __build__
+        working-directory: tests
         run: |
-          ctest . --output-on-failure -C Debug
+          python test.py --github

.gitignore

@@ -81,6 +81,7 @@ bld/
 [Ll]og/
 _build/
 build/
+__build__/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/

CMakeLists.txt

@@ -6,39 +6,6 @@ project(LwLibPROJECT)
 if(NOT PROJECT_IS_TOP_LEVEL)
     add_subdirectory(lwmem)
 else()
-    # Set default compile flags for GCC
-    if(CMAKE_COMPILER_IS_GNUCXX)
-        message(STATUS "GCC detected, adding compile flags")
-        set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra")
-    endif(CMAKE_COMPILER_IS_GNUCXX)
-
-    enable_testing()
-    add_executable(${PROJECT_NAME})
-    target_sources(${PROJECT_NAME} PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/dev/main.cpp
-        ${CMAKE_CURRENT_LIST_DIR}/tests/lwmem_test.c
-        ${CMAKE_CURRENT_LIST_DIR}/tests/lwmem_test_simple.c
-        ${CMAKE_CURRENT_LIST_DIR}/tests/lwmem_test_region.c
-        ${CMAKE_CURRENT_LIST_DIR}/tests/lwmem_test_available_mem.c
-
-        # win32 port
-        ${CMAKE_CURRENT_LIST_DIR}/lwmem/src/system/lwmem_sys_win32.c
-    )
-    target_include_directories(${PROJECT_NAME} PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}
-        ${CMAKE_CURRENT_LIST_DIR}/dev
-        ${CMAKE_CURRENT_LIST_DIR}/tests
-    )
-
-    # Add subdir with lwmem and link to the project
-    set(LWMEM_OPTS_FILE ${CMAKE_CURRENT_LIST_DIR}/dev/lwmem_opts.h)
-    add_subdirectory(lwmem)
-    target_link_libraries(${PROJECT_NAME} PUBLIC lwmem_cpp)
-
-    # Add compile options to the library, which will propagate options to executable through public link
-    target_compile_definitions(lwmem PUBLIC WIN32 _DEBUG CONSOLE LWMEM_DEV)
-
-    # Add test
-    add_test(NAME Test COMMAND $<TARGET_FILE:${CMAKE_PROJECT_NAME}>)
+    set(TEST_CMAKE_FILE_NAME "test_memory_structure/cmake.cmake")
+    add_subdirectory(tests)
 endif()

docs/examples_src/example_realloc_enlarge_full.c

@@ -1,4 +1,4 @@
-#define ASSERT(x)                                                                                                      \
+#define TEST_ASSERT(x)                                                                                                 \
     do {                                                                                                               \
         if (!(x)) {                                                                                                    \
             printf("Assert failed with condition (" #x ")\r\n");                                                       \
@@ -46,31 +46,31 @@ main(void) {
     printf("State 3a\r\n");
     rptr1 = lwmem_realloc(ptr2, 8);
     lwmem_debug_print(1, 1);
-    ASSERT(rptr1 == ptr2);
+    TEST_ASSERT(rptr1 == ptr2);
 
     /* Create 3b case */
     printf("\r\n------------------------------------------------------------------------\r\n");
     lwmem_debug_restore_to_saved();
     printf("State 3b\r\n");
     rptr2 = lwmem_realloc(ptr2, 20);
     lwmem_debug_print(1, 1);
-    ASSERT(rptr2 == ptr1);
+    TEST_ASSERT(rptr2 == ptr1);
 
     /* Create 3c case */
     printf("\r\n------------------------------------------------------------------------\r\n");
     lwmem_debug_restore_to_saved();
     printf("State 3c\r\n");
     rptr3 = lwmem_realloc(ptr2, 24);
     lwmem_debug_print(1, 1);
-    ASSERT(rptr3 == ptr1);
+    TEST_ASSERT(rptr3 == ptr1);
 
     /* Create 3d case */
     printf("\r\n------------------------------------------------------------------------\r\n");
     lwmem_debug_restore_to_saved();
     printf("State 3d\r\n");
     rptr4 = lwmem_realloc(ptr2, 36);
     lwmem_debug_print(1, 1);
-    ASSERT(rptr4 != ptr1 && rptr4 != ptr2 && rptr4 != ptr3 && rptr4 != ptr4);
+    TEST_ASSERT(rptr4 != ptr1 && rptr4 != ptr2 && rptr4 != ptr3 && rptr4 != ptr4);
 
     return 0;
 }

tests/CMakeLists.txt

@@ -0,0 +1,32 @@
+cmake_minimum_required(VERSION 3.22)
+
+# Setup project
+project(LwLibPROJECT)
+
+# Set default compile flags for GCC
+if(CMAKE_COMPILER_IS_GNUCXX)
+    message(STATUS "GCC detected, adding compile flags")
+    set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra")
+endif(CMAKE_COMPILER_IS_GNUCXX)
+
+enable_testing()
+add_executable(${CMAKE_PROJECT_NAME})
+target_sources(${CMAKE_PROJECT_NAME} PRIVATE
+    ${CMAKE_CURRENT_LIST_DIR}/test_file.cpp
+)
+target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE
+    ${CMAKE_CURRENT_LIST_DIR}/
+)
+
+# Include file that can add more sources and prepare lib parameters
+include(${TEST_CMAKE_FILE_NAME})
+
+# Add subdir with lwmem and link to project
+set(LWMEM_SYS_PORT "win32")
+add_subdirectory("../lwmem" lwmem)
+target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC lwmem_cpp)
+target_compile_definitions(lwmem_cpp PUBLIC LWMEM_DEV)
+
+# Add test
+add_test(NAME Test COMMAND $<TARGET_FILE:${CMAKE_PROJECT_NAME}>)