fix: add git to aarch64 container in CI (ada-url#652)

* fix: add git to aarch64 container in CI * add permissions * set ctest timeout * fix: keep just sanitizers * Update CMakeLists.txt * Update aarch64.yml: simplify as much as possible. * Update aarch64.yml: reenable sanitizer * Update CMakeLists.txt * fix: try without leak detection * fix: use bound checker --------- Co-authored-by: Yagiz Nizipli <yagiz@nizipli.com>
CarlosEduR · May 14, 2024 · 77dc0d0 · 77dc0d0
1 parent 2cea09f
commit 77dc0d0
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 12 deletions.
diff --git a/.github/workflows/aarch64.yml b/.github/workflows/aarch64.yml
@@ -13,6 +13,9 @@ on:
       - '**.md'
       - 'docs/**'
 
+permissions:
+  contents: read
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -22,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        shared: [ON, OFF]
+        shared: [OFF]
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
       - uses: uraimo/run-on-arch-action@v2
@@ -33,11 +36,11 @@ jobs:
         with:
           arch: aarch64
           githubToken: ${{ github.token }}
-          distro: ubuntu_latest
+          distro: ubuntu22.04
           install: |
             apt-get update -q -y
-            apt-get install -y cmake make g++ ninja-build
+            apt-get install -y cmake make g++ ninja-build git
           run: |
-            cmake -DADA_SANITIZE=ON -DADA_DEVELOPMENT_CHECKS=ON -DBUILD_SHARED_LIBS=${{matrix.shared}} -G Ninja -B build
-            cmake --build build -j=2
+            cmake -DADA_SANITIZE_BOUNDS_STRICT=ON -DBUILD_SHARED_LIBS=${{matrix.shared}} -B build
+            cmake --build build
             ctest --test-dir build
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -59,6 +59,7 @@ if(ADA_TESTING OR ADA_BENCHMARKS OR ADA_TOOLS)
 
   if (ADA_TESTING AND NOT EMSCRIPTEN)
     if(Git_FOUND)
+      set(CTEST_TEST_TIMEOUT 5)
       message(STATUS "The tests are enabled.")
       add_subdirectory(tests)
     else()

diff --git a/cmake/ada-flags.cmake b/cmake/ada-flags.cmake
@@ -8,6 +8,9 @@ option(ADA_SANITIZE_UNDEFINED "Sanitize undefined behaviour" OFF)
 if(ADA_SANITIZE)
   message(STATUS "Address sanitizer enabled.")
 endif()
+if(ADA_SANITIZE_WITHOUT_LEAKS)
+  message(STATUS "Address sanitizer (but not leak) enabled.")
+endif()
 if(ADA_SANITIZE_UNDEFINED)
   message(STATUS "Undefined sanitizer enabled.")
 endif()
@@ -35,7 +38,7 @@ if (ADA_COVERAGE)
 endif()
 
 if (NOT CMAKE_BUILD_TYPE)
-  if(ADA_SANITIZE OR ADA_SANITIZE_BOUNDS_STRICT OR ADA_SANITIZE_UNDEFINED)
+  if(ADA_SANITIZE OR ADA_SANITIZE_WITHOUT_LEAKS OR ADA_SANITIZE_BOUNDS_STRICT OR ADA_SANITIZE_UNDEFINED)
     message(STATUS "No build type selected, default to Debug because you have sanitizers.")
     set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE)
   else()

diff --git a/cmake/add-cpp-test.cmake b/cmake/add-cpp-test.cmake
@@ -14,6 +14,9 @@ function(add_cpp_test TEST_NAME)
     add_compile_options(-fsanitize=address -fno-omit-frame-pointer -fno-sanitize-recover=all)
     add_compile_definitions(ASAN_OPTIONS=detect_leaks=1)
   endif()
+  if(ADA_SANITIZE_WITHOUT_LEAKS)
+    add_compile_options(-fsanitize=address -fno-omit-frame-pointer -fno-sanitize-recover=all)
+  endif()
   if(ADA_SANITIZE_BOUNDS_STRICT)
     add_compile_options(-fsanitize=bounds-strict -fno-sanitize-recover=all)
     add_link_options(-fsanitize=bounds-strict)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -50,6 +50,10 @@ if(ADA_SANITIZE)
   target_compile_definitions(ada INTERFACE ASAN_OPTIONS=detect_leaks=1)
   target_link_libraries(ada INTERFACE -fsanitize=address  -fno-omit-frame-pointer -fno-sanitize-recover=all)
 endif()
+if(ADA_SANITIZE_WITHOUT_LEAKS)
+  target_compile_options(ada INTERFACE -fsanitize=address  -fno-omit-frame-pointer -fno-sanitize-recover=all)
+  target_link_libraries(ada INTERFACE -fsanitize=address  -fno-omit-frame-pointer -fno-sanitize-recover=all)
+endif()
 
 if(ADA_LOGGING)
   target_compile_definitions(ada PRIVATE ADA_LOGGING=1)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -39,12 +39,12 @@ else()
   target_link_libraries(ada_c PRIVATE simdjson GTest::gtest_main)
   target_link_libraries(url_search_params PRIVATE simdjson GTest::gtest_main)
 
-  gtest_discover_tests(wpt_tests)
-  gtest_discover_tests(url_components)
-  gtest_discover_tests(basic_tests)
-  gtest_discover_tests(from_file_tests)
-  gtest_discover_tests(ada_c)
-  gtest_discover_tests(url_search_params)
+  gtest_discover_tests(wpt_tests PROPERTIES TEST_DISCOVERY_TIMEOUT 600)
+  gtest_discover_tests(url_components PROPERTIES TEST_DISCOVERY_TIMEOUT 600)
+  gtest_discover_tests(basic_tests PROPERTIES TEST_DISCOVERY_TIMEOUT 600)
+  gtest_discover_tests(from_file_tests PROPERTIES TEST_DISCOVERY_TIMEOUT 600)
+  gtest_discover_tests(ada_c PROPERTIES TEST_DISCOVERY_TIMEOUT 600)
+  gtest_discover_tests(url_search_params PROPERTIES TEST_DISCOVERY_TIMEOUT 600)
 
   if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9)