aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@users.noreply.github.com>2026-04-08 10:22:15 -0400
committerGitHub <noreply@github.com>2026-04-08 10:22:15 -0400
commitbcc480ae7ad9266f80a2eee54d3a06bb8178868b (patch)
treee51266449357defa92404f2005eb0bea34f25a7a
parent5b5abcce09da3ce1cc8fab57e1571d0ff0966f7b (diff)
parent18a86918d03ccd6b34ede7c4ea67b6d794ee155f (diff)
downloadstasis-bcc480ae7ad9266f80a2eee54d3a06bb8178868b.tar.gz
Merge pull request #130 from jhunkeler/cmake-qol
Cmake QOL
-rw-r--r--.github/workflows/cmake-multi-platform.yml2
-rw-r--r--CMakeLists.txt7
-rw-r--r--tests/CMakeLists.txt2
3 files changed, 6 insertions, 5 deletions
diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
index 85255c4..c4e361f 100644
--- a/.github/workflows/cmake-multi-platform.yml
+++ b/.github/workflows/cmake-multi-platform.yml
@@ -77,6 +77,6 @@ jobs:
- name: Test
working-directory: ${{ steps.strings.outputs.build-output-dir }}
- run: ctest -V --build-config ${{ matrix.build_type }} --output-junit results.xml --test-output-size-passed 65536 --test-output-size-failed 65536
+ run: ctest --build-config ${{ matrix.build_type }} --output-on-failure --output-junit results.xml --test-output-size-passed 65536 --test-output-size-failed 65536
env:
STASIS_SYSCONFDIR: ../../..
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a5576f..bd214ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,10 +8,11 @@ set(CMAKE_C_STANDARD 99)
find_package(LibXml2)
find_package(CURL)
-option(ASAN OFF)
+option(ASAN "Address Analyzer" OFF)
+set(ASAN_OPTIONS "-fsanitize=address,leak,null,undefined")
if (ASAN)
- add_compile_options(-fsanitize=address)
- add_link_options(-fsanitize=address)
+ add_compile_options(${ASAN_OPTIONS} -fno-omit-frame-pointer -g -O0)
+ add_link_options(${ASAN_OPTIONS})
endif()
pkg_check_modules(ZIP libzip)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 08ef833..dd68231 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -44,7 +44,7 @@ foreach(source_file ${source_files})
add_test(${test_executable} ${test_executable})
set_tests_properties(${test_executable}
PROPERTIES
- TIMEOUT 240)
+ TIMEOUT 600)
set_tests_properties(${test_executable}
PROPERTIES
SKIP_RETURN_CODE 127)