Fix CI errors (#962)

* fix distance example * ption 'lcov_branch_coverage' is deprecated. Consider using 'branch_coverage. instead * stuff * hmm i think this should do it * format * more format * check initial error * revert format stuff * display log * yoinks * log * initialise values
uber · Jan 19, 2025 · 9a1f63b · 9a1f63b
1 parent 333c2bc
commit 9a1f63b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -72,7 +72,7 @@ jobs:
           cd build/examples
           cmake -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ../../examples
           make
-          make test
+          env CTEST_OUTPUT_ON_FAILURE=1 make test 
 
   clang-tests:
     name: Test Compile clang ${{ matrix.build_type }} ${{ matrix.compile_opt }}
@@ -132,7 +132,7 @@ jobs:
           cd build/examples
           cmake -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_C_FLAGS="${{ matrix.compile_opt }}" ../../examples
           make
-          make test
+          env CTEST_OUTPUT_ON_FAILURE=1 make test 
 
   valgrind-tests:
     name: Test Valgrind

diff --git a/CMakeTests.cmake b/CMakeTests.cmake
@@ -49,7 +49,7 @@ if(ENABLE_COVERAGE)
     add_custom_target(
         clean-coverage
         # Before running coverage, clear all counters
-        COMMAND lcov --rc lcov_branch_coverage=1 --directory
+        COMMAND lcov --rc branch_coverage=1 --directory
                 '${CMAKE_CURRENT_BINARY_DIR}' --zerocounters
         COMMENT "Zeroing counters")
 endif()

diff --git a/examples/distance.c b/examples/distance.c
@@ -23,6 +23,7 @@
 
 #include <assert.h>
 #include <h3/h3api.h>
+#include <inttypes.h>
 #include <math.h>
 #include <stdio.h>
 
@@ -49,23 +50,25 @@ double haversineDistance(double th1, double ph1, double th2, double ph2) {
 
 int main(int argc, char *argv[]) {
     // 1455 Market St @ resolution 15
-    H3Index h3HQ1;
+    H3Index h3HQ1 = 0;
     stringToH3("8f2830828052d25", &h3HQ1);
     // 555 Market St @ resolution 15
-    H3Index h3HQ2;
+    H3Index h3HQ2 = 0;
     stringToH3("8f283082a30e623", &h3HQ2);
 
-    LatLng geoHQ1, geoHQ2;
+    LatLng geoHQ1 = {0};
+    LatLng geoHQ2 = {0};
     cellToLatLng(h3HQ1, &geoHQ1);
     cellToLatLng(h3HQ2, &geoHQ2);
 
-    int64_t distance;
+    int64_t distance = 0;
     assert(gridDistance(h3HQ1, h3HQ2, &distance) == E_SUCCESS);
 
     printf(
         "origin: (%lf, %lf)\n"
         "destination: (%lf, %lf)\n"
-        "grid distance: %d\n"
+        "grid distance: %" PRId64
+        "\n"
         "distance in km: %lfkm\n",
         radsToDegs(geoHQ1.lat), radsToDegs(geoHQ1.lng), radsToDegs(geoHQ2.lat),
         radsToDegs(geoHQ2.lng), distance,
@@ -75,4 +78,4 @@ int main(int argc, char *argv[]) {
     // destination: (37.789991, -122.402121)
     // grid distance: 2340
     // distance in km: 2.256853km
-}
+}
diff --git a/scripts/coverage.sh.in b/scripts/coverage.sh.in
@@ -49,6 +49,6 @@ binary_dir=${2:-"Missing binary directory"}
 br_exclusion='LCOV_EXCL_BR_LINE|assert\('
 
 cd "${binary_dir}"
-lcov --rc lcov_branch_coverage=1 --rc "lcov_excl_br_line=$br_exclusion" --directory . --capture --output-file coverage.info
-lcov --rc lcov_branch_coverage=1 --rc "lcov_excl_br_line=$br_exclusion" --extract coverage.info "${src_dir}/src/h3lib/*" --output-file coverage.cleaned.info
+lcov --ignore-errors mismatch --rc branch_coverage=1 --rc "lcov_excl_br_line=$br_exclusion" --directory . --capture --output-file coverage.info
+lcov --ignore-errors mismatch --rc branch_coverage=1 --rc "lcov_excl_br_line=$br_exclusion" --extract coverage.info "${src_dir}/src/h3lib/*" --output-file coverage.cleaned.info
 genhtml --branch-coverage -o coverage coverage.cleaned.info --title 'h3 coverage'