Missed files in initial commit - see #343

Signed-off-by: Henry Cox <[email protected]>

.github/workflows/run_test_suite.yml

@@ -94,5 +94,5 @@ jobs:
           #           to fail.
           make check |& tee /dev/stderr \
             | grep -F ' failed, ' | tee /dev/stderr \
-            | grep -F -q ', 3 failed, ' \
+            | grep -F -q ', 2 failed, ' \
             || { echo 'Number of tests expected to fail^^ does not match -- did you break an existing test?' >&2 ; false ; }

tests/lcov/merge/functionBug_1.dat

@@ -0,0 +1,24 @@
+TN:
+SF: my_file.cpp
+FN:9,25,is_within_phase_offset_tolerance(Ouster1DriverConfig const&, std::__1::chrono::duration<long long, std::__1::ratio<1l, 1000l> >, std::__1::chrono::duration<long long, std::__1::ratio<1l, 1000l> >)
+FNDA:0,is_within_phase_offset_tolerance(Ouster1DriverConfig const&, std::__1::chrono::duration<long long, std::__1::ratio<1l, 1000l> >, std::__1::chrono::duration<long long, std::__1::ratio<1l, 1000l> >)
+FNF:1
+FNH:0
+BRDA:12,0,0,-
+BRDA:12,0,1,-
+BRDA:25,0,0,-
+BRDA:25,0,1,-
+BRDA:25,0,2,-
+BRDA:25,0,3,-
+BRF:6
+BRH:0
+DA:12,0
+DA:15,0
+DA:18,0
+DA:22,0
+DA:23,0
+DA:24,0
+DA:25,0
+LF:7
+LH:0
+end_of_record

tests/lcov/merge/functionBug_2.dat

@@ -0,0 +1,28 @@
+TN:
+SF: my_file.cpp
+FN:11,26,is_within_phase_offset_tolerance(Ouster1DriverConfig const&, std::chrono::duration<long, std::ratio<1l, 1000l> >, std::chrono::duration<long, std::ratio<1l, 1000l> >)
+FNDA:1885,is_within_phase_offset_tolerance(Ouster1DriverConfig const&, std::chrono::duration<long, std::ratio<1l, 1000l> >, std::chrono::duration<long, std::ratio<1l, 1000l> >)
+FNF:1
+FNH:1
+BRDA:12,0,0,1
+BRDA:12,0,1,1884
+BRDA:25,0,0,248
+BRDA:25,0,1,1636
+BRDA:25,1,2,210
+BRDA:25,1,3,1426
+BRF:6
+BRH:6
+DA:12,1885
+DA:13,1
+DA:15,1
+DA:18,1884
+DA:20,1884
+DA:21,1884
+DA:22,1884
+DA:23,1884
+DA:24,1884
+DA:25,1884
+DA:26,1885
+LF:11
+LH:11
+end_of_record

tests/lcov/merge/merge.sh

@@ -100,7 +100,8 @@ if [ "${VER[0]}" -lt 5 ] ; then
     FILTER='--filter branch'
 fi
 
-rm -rf *.txt* *.json dumper* intersect*.info* diff*.info* cover_db
+rm -f *.txt* *.json dumper* intersect*.info gen.info func.info inconsistent.info diff* *.log
+rm -rf cover_db
 
 if [ "x$COVER" != 'x' ] && [ 0 != $LOCAL_COVERAGE ] ; then
     cover -delete