Disable fuzzer targets in CI and fix build warnings

branw · Sep 30, 2023 · c49e738 · c49e738
1 parent 5201620
commit c49e738
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,13 +36,17 @@ target_link_options(test-ssb PRIVATE -fsanitize=address,undefined)
 target_link_libraries(test-ssb PRIVATE unofficial::sqlite3::sqlite3)
 
 # Fuzzer targets
-add_executable(fuzz-ssb-terminal-parse src/fuzzers/fuzz_terminal_parse.cpp ${SOURCES})
-target_include_directories(fuzz-ssb-terminal-parse PRIVATE src ext/baro)
+if(DEFINED ENV{GITHUB_ACTIONS})
+    message(STATUS "Skipping fuzzer target build because we are in GitHub Actions")
+else()
+    add_executable(fuzz-ssb-terminal-parse src/fuzzers/fuzz_terminal_parse.cpp ${SOURCES})
+    target_include_directories(fuzz-ssb-terminal-parse PRIVATE src ext/baro)
 
-target_compile_options(fuzz-ssb-terminal-parse PRIVATE -g -O0 -fsanitize=fuzzer,address)
-target_link_libraries(fuzz-ssb-terminal-parse PRIVATE -fsanitize=fuzzer,address)
+    target_compile_options(fuzz-ssb-terminal-parse PRIVATE -g -O0 -fsanitize=fuzzer,address)
+    target_link_libraries(fuzz-ssb-terminal-parse PRIVATE -fsanitize=fuzzer,address)
 
-target_link_libraries(fuzz-ssb-terminal-parse PRIVATE unofficial::sqlite3::sqlite3)
+    target_link_libraries(fuzz-ssb-terminal-parse PRIVATE unofficial::sqlite3::sqlite3)
+endif()
 
 enable_testing()
 add_test(ssb test-ssb)
diff --git a/src/log.h b/src/log.h
@@ -23,10 +23,6 @@ void log_printf(enum log_level level, char const *file, int line, char const *fu
 #define LOG_ERROR(...) log_printf(LOG_LEVEL_ERROR, __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
 #define LOG_FATAL(...) log_printf(LOG_LEVEL_FATAL, __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
 
-#if !defined(MINIMUM_LOG_LEVEL)
-#define MINIMUM_LOG_LEVEL LOG_LEVEL_TRACE
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/main.c b/src/main.c
@@ -84,7 +84,10 @@ int run_standalone(struct db *db) {
         // Flush and send output data
         size_t write_len;
         while (terminal_flush(&state.terminal, buf, 512, &write_len)) {
-            write(STDOUT_FILENO, buf, write_len);
+            size_t const written_len = write(STDOUT_FILENO, buf, write_len);
+            if (written_len != write_len) {
+                LOG_ERROR("Tried writing %d, but only wrote %d", write_len, written_len);
+            }
         }
     }