FIX: geninfo_auto_base = 1

Author: ldorau

scripts/coverage/coverage_capture.sh

@@ -9,6 +9,39 @@ set -e
 
 set -x
 
-# --exclude "*proxy_lib_new_delete.h*"
-lcov --capture --directory . --exclude "/usr/*" --exclude "*/build/_deps/*" --exclude "*/examples/*" --exclude "*/test/*" --exclude "*/src/critnib/*" --exclude "*/src/ravl/*" --output-file $OUTPUT_NAME || \
-	( echo && lcov --capture --directory . --exclude "/usr/*" --exclude "*/build/_deps/*" --exclude "*/examples/*" --exclude "*/test/*" --exclude "*/src/critnib/*" --exclude "*/src/ravl/*" --ignore-errors mismatch,unused --output-file $OUTPUT_NAME )
+lcov --capture  --directory . \
+--exclude "/usr/*" \
+--exclude "*/build/*" \
+--exclude "*/benchmark/*" \
+--exclude "*/examples/*" \
+--exclude "*/test/*" \
+--exclude "*/src/critnib/*" \
+--exclude "*/src/ravl/*" \
+--exclude "*proxy_lib_new_delete.h" \
+--output-file $OUTPUT_NAME || \
+	( echo "RETRY after ERROR !!!:" && \
+	lcov --capture --directory . \
+	--exclude "/usr/*" \
+	--exclude "*/build/*" \
+	--exclude "*/benchmark/*" \
+	--exclude "*/examples/*" \
+	--exclude "*/test/*" \
+	--exclude "*/src/critnib/*" \
+	--exclude "*/src/ravl/*" \
+	--exclude "*proxy_lib_new_delete.h" \
+	--ignore-errors mismatch,unused,negative,corrupt \
+	--output-file $OUTPUT_NAME )
+
+# Most common UMF source code directory on most GH CI runners
+COMMON_UMF_DIR=/home/runner/work/unified-memory-framework/unified-memory-framework
+
+# Get the current UMF source code directory
+# This is ${CURRENT_UMF_DIR}/scripts/coverage/coverage_capture.sh file, so
+CURRENT_UMF_DIR=$(realpath $(dirname $0)/../..)
+
+# Coverage (lcov) has to be run in the same directory on all runners:
+# /home/runner/work/unified-memory-framework/unified-memory-framework/build
+# to be able to merge all results, so we have to replace the paths if they are different:
+if [ "$CURRENT_UMF_DIR" != "$COMMON_UMF_DIR" ]; then
+	sed -i "s|$CURRENT_UMF_DIR|$COMMON_UMF_DIR|g" $OUTPUT_NAME
+fi

scripts/coverage/merge_coverage_files.sh

@@ -6,35 +6,15 @@
 [ "$1" != "" ] && PREFIX="$1" || PREFIX="exports-coverage"
 [ "$2" != "" ] && OUTPUT_NAME="$2" || OUTPUT_NAME="total_coverage"
 
-GROUP=$(groups | cut -d' ' -f1)
-
-# The source code of UMF is located in /home/runner/work/unified-memory-framework/unified-memory-framework.
-UMF_DIR=/home/runner/work/unified-memory-framework/unified-memory-framework
-
-# Create required links:
-# LINKS="
-# /home/testuser
-# /home/test-user/actions-runner/_work/unified-memory-framework/unified-memory-framework
-# /home/test-user/shared-action-runner/_work/unified-memory-framework/unified-memory-framework
-# /home/test-user/shared-actions-runner/_work/unified-memory-framework/unified-memory-framework
-# /opt/actions-runner/_work/unified-memory-framework/unified-memory-framework"
-cat ./path-* | sort | uniq
-LINKS=$(cat ./path-* | sort | uniq | xargs)
-
-for link in $LINKS; do
-	[ -e $link ] && continue # continue if already exists
-	sudo mkdir -p $link # create all subdirectories
-	sudo rm -r $link # remove the last directory
-	sudo ln -s $UMF_DIR $link # create the link
-	sudo chown $USER:$GROUP $link # set permissions
-	ls -al $link # check the link
-done
-
 OPTS=""
 for file in $(ls -1 ${PREFIX}-*); do
 	OPTS="$OPTS -a $file"
 done
 
 set -x
 
-lcov -o $OUTPUT_NAME $OPTS
+lcov $OPTS -o $OUTPUT_NAME  || \
+	( echo "RETRY after ERROR !!!:" && \
+	lcov $OPTS \
+	--ignore-errors mismatch,unused,negative,corrupt \
+	--output-file $OUTPUT_NAME )