FIX: geninfo_auto_base = 1

Author: ldorau

scripts/coverage/coverage_capture.sh

@@ -5,10 +5,61 @@
 
 set -e
 
+set -x ################### DEBUG !!!!!!!!!!!!!!!!!!!!!!!
+
 [ "$1" != "" ] && OUTPUT_NAME="$1" || OUTPUT_NAME="total_coverage"
 
+# 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)/../..)
+
+################### DEBUG !!!!!!!!!!!!!!!!!!!!!!!
+if [ 0 -eq 1 ]; then
+	# Create the symbolic link $COMMON_UMF_DIR that points to $CURRENT_UMF_DIR:
+	[ -e $COMMON_UMF_DIR ] && rm -rf $COMMON_UMF_DIR || ( ls -al $COMMON_UMF_DIR && exit 1 ) # remove the old link/directory
+	sudo mkdir -p $(dirname $COMMON_UMF_DIR) # create all subdirectories
+	sudo ln -s $CURRENT_UMF_DIR $COMMON_UMF_DIR # create the symbolic link
+	GROUP=$(groups | cut -d' ' -f1) # get the main group of the current user
+	sudo chown $USER:$GROUP $COMMON_UMF_DIR # change owner and group to the current user's one
+	ls -al $COMMON_UMF_DIR # check the link
+
+	# Replace $CURRENT_UMF_DIR with $COMMON_UMF_DIR during "lcov --capture" command.
+	# From the lcovrc(5) manual:
+	# Adjust path to source files by removing or changing path
+	# components that match the specified pattern (Perl regular
+	# expression format)
+	# geninfo_adjust_src_path = /tmp/build => /usr/src
+	echo "geninfo_adjust_src_path = \"s#$CURRENT_UMF_DIR#$COMMON_UMF_DIR#g\"" | tee ${HOME}/.lcovrc
+else
+	rm -f ${HOME}/.lcovrc
+fi
+
 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 "*/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 "*/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 )
+
+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,10 +6,10 @@
 [ "$1" != "" ] && PREFIX="$1" || PREFIX="exports-coverage"
 [ "$2" != "" ] && OUTPUT_NAME="$2" || OUTPUT_NAME="total_coverage"
 
-GROUP=$(groups | cut -d' ' -f1)
+# 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
+# UMF_DIR=/home/runner/work/unified-memory-framework/unified-memory-framework
 
 # Create required links:
 # LINKS="
@@ -18,17 +18,17 @@ UMF_DIR=/home/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
+# 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
@@ -37,4 +37,4 @@ done
 
 set -x
 
-lcov -o $OUTPUT_NAME $OPTS
+lcov $OPTS -o $OUTPUT_NAME