pine64 · Ralim · Jul 17, 2025 · Jul 7, 2025 · Jul 8, 2025 · Jul 8, 2025
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
       - uses: lukka/get-cmake@latest
       - name: Build blisp tool
         run: |
@@ -47,7 +47,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
       - uses: lukka/get-cmake@latest
       - name: Build blisp tool
         run: |
@@ -68,7 +68,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
       - uses: lukka/get-cmake@latest
       - name: Build blisp tool
         run: |
@@ -101,7 +101,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
       - uses: uraimo/run-on-arch-action@v2
         name: Build artifact
         id: build
@@ -155,3 +155,29 @@ jobs:
           path: |
             artifacts/blisp-*
           if-no-files-found: error
+
+  test-linux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+      - uses: lukka/get-cmake@latest
+      - name: Build blisp tool & unit tests
+        run: |
+          mkdir build
+          cd build
+          cmake .. -DBLISP_BUILD_CLI=ON -DCOMPILE_TESTS=ON
+          cmake --build .
+      - name: Run unit tests
+        run: |
+          cd build
+          for f in $(find . -type f -executable -iname "*_test"); do
+            echo "Running test file $f"
+            "$f"
+            status=$?
+            if [ $status -ne 0 ]; then
+              echo "Test $f failed with exit code $status"
+              exit $status
+            fi
+          done
diff --git a/.gitignore b/.gitignore
@@ -77,4 +77,5 @@ fabric.properties
 .idea/caches/build_file_checksums.ser
 build/
 
-.DS_Store
+.DS_Store
+.cache/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -48,13 +48,13 @@ if(BLISP_USE_SYSTEM_LIBRARIES)
     target_link_libraries(libblisp_static PUBLIC Libserialport::Libserialport)
     target_include_directories(libblisp_obj PUBLIC ${Libserialport_INCLUDE_DIRS})
 else()
-	if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-	target_sources(libblisp_obj PRIVATE
+    if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+        target_sources(libblisp_obj PRIVATE
         ${CMAKE_SOURCE_DIR}/vendor/libserialport/serialport.c
         ${CMAKE_SOURCE_DIR}/vendor/libserialport/timing.c)
 
-	target_include_directories(libblisp_obj PRIVATE ${CMAKE_SOURCE_DIR}/vendor/libserialport)
-	endif()
+        target_include_directories(libblisp_obj PRIVATE ${CMAKE_SOURCE_DIR}/vendor/libserialport)
+    endif()
 
     if(WIN32)
         target_link_libraries(libblisp PRIVATE Setupapi.lib)
@@ -92,7 +92,7 @@ else()
 endif()
 
 include(GNUInstallDirs)
-install(TARGETS libblisp libblisp_static 
+install(TARGETS libblisp libblisp_static
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -105,5 +105,21 @@ endif()
 
 
 if(COMPILE_TESTS)
-    add_subdirectory(tools/blisp/src/cmd/dfu/tests)
+    # Bring in googletest & C++
+    enable_language(CXX)
+    enable_testing()
+    include(FetchContent)
+
+
+    FetchContent_Declare(
+        googletest
+        GIT_REPOSITORY https://github.com/google/googletest.git
+        GIT_TAG v1.17.0
+    )
+    FetchContent_MakeAvailable(googletest)
+    add_library(GTest::GTest INTERFACE IMPORTED)
+    target_link_libraries(GTest::GTest INTERFACE gtest_main)
+
+    add_subdirectory(tools/blisp/src/file_parsers/dfu/tests)
+    add_subdirectory(tools/blisp/src/file_parsers/hex/tests)
 endif(COMPILE_TESTS)
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![GitHub release](https://img.shields.io/github/v/release/pine64/blisp?color=5791ac)](https://github.com/pine64/blisp/releases/tag/v0.0.4)
 
 <img src="./img/Gradient-white-blue-03.png" align="left" width="60" > <br clear="left" />
-# BLISP 
+# BLISP
 
 Bouffalo Labs ISP (in-system-programming) tool & library: an open source tool to flash Bouffalo RISC-V MCUs.
 
@@ -16,13 +16,13 @@ Bouffalo Labs ISP (in-system-programming) tool & library: an open source tool to
 - [x] `bl70x` - BL702 / BL704 / BL706
 <br>
 
-## Supported Devices 
+## Supported Devices
  | System  | <img width="15" src="img/win32.png" /> Windows | <img width="15" src="https://cdn.simpleicons.org/Apple/5791ac" /> MacOS| <img width="17" src="https://cdn.simpleicons.org/Linux/5791ac" /> Linux| <img width="15" src="https://cdn.simpleicons.org/Freebsd/5791ac" /> FreeBSD |
  | :-----: | :------: | :------: | :------: | :------: |
  | Pinecil V2  |<img width="22" src="https://cdn.simpleicons.org/cachet/5791ac" />|<img width="22" src="https://cdn.simpleicons.org/cachet/5791ac" />| <img width="22" src="https://cdn.simpleicons.org/cachet/5791ac" />| <img width="22" src="https://cdn.simpleicons.org/cachet/5791ac" /> |
  | Pinecone  |<img width="22" src="https://cdn.simpleicons.org/cachet/5791ac" />|<img width="22" src="https://cdn.simpleicons.org/cachet/5791ac" />|<img width="22" src="https://cdn.simpleicons.org/cachet/5791ac" />| <img width="22" src="https://cdn.simpleicons.org/cachet/5791ac" /> |
  <br>
- 
+
 ## How to update Pinecil V2
 
 Download the newest release of [Blisp updater here](https://github.com/pine64/blisp/releases/).
@@ -94,6 +94,15 @@ Because this is done at the lowest level of serial communication, the
 displays aren't packet-aware or know about the chip's command set or such.
 This is really only useful for debugging systems-level issues withing
 the device or blisp itself.
+## Running unit tests
+
+```shell
+mkdir build && cd build
+cmake -DBLISP_BUILD_CLI=ON -DCOMPILE_TESTS=ON ..
+cmake --build .
+# Find all compiled unit test files; you can now run these directly
+find . -type f -executable -iname "*_test" -print
+```
 
 ## Troubleshooting
 

diff --git a/tools/blisp/src/file_parsers/CMakeLists.txt b/tools/blisp/src/file_parsers/CMakeLists.txt
@@ -1,6 +1,7 @@
 list(APPEND ADD_INCLUDE
 "${CMAKE_CURRENT_SOURCE_DIR}/bin"
 "${CMAKE_CURRENT_SOURCE_DIR}/dfu"
+"${CMAKE_CURRENT_SOURCE_DIR}/hex"
 "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 
@@ -12,13 +13,15 @@ add_library(file_parsers STATIC
 "${CMAKE_CURRENT_SOURCE_DIR}/bin/bin_file.c"
 "${CMAKE_CURRENT_SOURCE_DIR}/dfu/dfu_file.c"
 "${CMAKE_CURRENT_SOURCE_DIR}/dfu/dfu_crc.c"
+"${CMAKE_CURRENT_SOURCE_DIR}/hex/hex_file.c"
 "${CMAKE_CURRENT_SOURCE_DIR}/parse_file.c"
 "${CMAKE_CURRENT_SOURCE_DIR}/get_file_contents.c"
 )
 
 target_include_directories(file_parsers PUBLIC
 ${CMAKE_CURRENT_SOURCE_DIR}/bin
 ${CMAKE_CURRENT_SOURCE_DIR}/dfu
+${CMAKE_CURRENT_SOURCE_DIR}/hex
 ${CMAKE_CURRENT_SOURCE_DIR}
 
 )
diff --git a/tools/blisp/src/file_parsers/dfu/dfu_file.c b/tools/blisp/src/file_parsers/dfu/dfu_file.c
@@ -78,6 +78,7 @@ int dfu_file_parse(const char* file_path_on_disk,
                    size_t* payload_address) {
   uint8_t* dfu_file_contents = NULL;
   ssize_t file_size = get_file_contents(file_path_on_disk, &dfu_file_contents);
+  // Bubble up the result if it was an error instead of size (a negative value)
   if (file_size < 0) {
     return file_size;
   }

diff --git a/tools/blisp/src/file_parsers/dfu/tests/CMakeLists.txt b/tools/blisp/src/file_parsers/dfu/tests/CMakeLists.txt
@@ -1,31 +1,10 @@
-enable_language(CXX)
-
-enable_testing()
-include(FetchContent)
-
-
-FetchContent_Declare(
-        googletest
-        GIT_REPOSITORY https://github.com/google/googletest.git
-        GIT_TAG release-1.11.0
-)
-FetchContent_MakeAvailable(googletest)
-add_library(GTest::GTest INTERFACE IMPORTED)
-target_link_libraries(GTest::GTest INTERFACE gtest_main)
-
-
-add_executable(dfu_file_test test_dfu_file.cpp ../dfu_file.c ../dfu_crc.c)
+add_executable(dfu_file_test test_dfu_file.cpp ../dfu_file.c ../dfu_crc.c ../../get_file_contents.c)
 
 target_link_libraries(dfu_file_test
         PRIVATE
         GTest::GTest
         )
-include_directories(dfu_file_test PRIVATE ../)
-add_test(dfu_file_test_gtests dfu_file_test)
-
-configure_file(Config.h.in ${CMAKE_BINARY_DIR}/Config.h)
-include_directories(${CMAKE_BINARY_DIR})
-
-set(TEST_APP_NAME dfu_file_tests)
-
-#add_custom_command(TARGET ${TEST_APP_NAME} COMMAND ./${TEST_APP_NAME} POST_BUILD)
+include(GoogleTest)
+include_directories(dfu_file_test PRIVATE ../ ../../)
+target_compile_definitions(dfu_file_test PUBLIC "SOURCE_DIR=\"${CMAKE_SOURCE_DIR}\"")
+gtest_discover_tests(dfu_file_test)
diff --git a/tools/blisp/src/file_parsers/dfu/tests/Config.h.in b/tools/blisp/src/file_parsers/dfu/tests/Config.h.in
diff --git a/tools/blisp/src/file_parsers/dfu/tests/test_dfu_file.cpp b/tools/blisp/src/file_parsers/dfu/tests/test_dfu_file.cpp
@@ -2,16 +2,16 @@
 // Created by ralim on 26/09/22.
 //
 
-#include "Config.h"
-#include "dfu_file.h"
 #include <gtest/gtest.h>
+#include "dfu_file.h"
 TEST(DFU_FILE_PARSER, ParseTestFile) {
-    uint8_t* payload = nullptr;
-    size_t payload_size = 0;
-    size_t payload_address = 0;
-    int res = dfu_file_parse(SOURCE_DIR "/test.dfu", &payload, &payload_size,
-                             &payload_address);
-    ASSERT_EQ(res, 1);
-    ASSERT_EQ(payload_size, 1337);
-    ASSERT_EQ(payload_address, 0x11223344);
-}
+  uint8_t* payload = nullptr;
+  size_t payload_size = 0;
+  size_t payload_address = 0;
+  int res = dfu_file_parse(SOURCE_DIR
+                           "/tools/blisp/src/file_parsers/dfu/tests/test.dfu",
+                           &payload, &payload_size, &payload_address);
+  ASSERT_EQ(res, 1);
+  ASSERT_EQ(payload_size, 1337);
+  ASSERT_EQ(payload_address, 0x11223344);
+}