From 6030a892a8b4ea5543ceb9048641ecdaf78b3cb8 Mon Sep 17 00:00:00 2001 From: Robert Guo Date: Fri, 4 Feb 2022 09:40:55 -0500 Subject: Revert "SERVER-60832 Readd and fix gcov code coverage variant" This reverts commit bf96dbdca5e9c23cf541cb6f53292a18d837cde5. --- evergreen/functions/code_coverage_data_process.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'evergreen') diff --git a/evergreen/functions/code_coverage_data_process.sh b/evergreen/functions/code_coverage_data_process.sh index a3af4a9f825..c23114884ff 100755 --- a/evergreen/functions/code_coverage_data_process.sh +++ b/evergreen/functions/code_coverage_data_process.sh @@ -6,25 +6,25 @@ if [ -d "./build" ]; then if [ -n "$file_list" ]; then for gcda_file in $file_list; do echo "Processing file $gcda_file" - /opt/mongodbtoolchain/v3/bin/gcov -i "$gcda_file" - base_name=$(echo "$gcda_file" | rev | cut -f1 -d '/' | cut -f2 -d '.' | rev) + /opt/mongodbtoolchain/v3/bin/gcov -i $gcda_file + base_name=$(echo $gcda_file | rev | cut -f1 -d '/' | cut -f2 -d '.' | rev) gcov_file=$base_name.gcda.gcov if [ -f "$gcov_file" ]; then # Add a prefix to the intermediate file, since it does not have a unique name. # Convert the '/' to '#' in the file path. - file_prefix=$(echo "$gcda_file" | sed -e 's,^\./,,' | rev | cut -f2- -d '/' | rev | tr -s '/' '#') - new_gcov_file="$file_prefix #$base_name.gcda.gcov" - if [ ! -f "$new_gcov_file" ]; then + file_prefix=$(echo $gcda_file | sed -e 's,^\./,,' | rev | cut -f2- -d '/' | rev | tr -s '/' '#') + new_gcov_file=$file_prefix #$base_name.gcda.gcov + if [ ! -f $new_gcov_file ]; then echo "Renaming gcov intermediate file $gcov_file to $new_gcov_file" - mv "$gcov_file" "$new_gcov_file" + mv $gcov_file $new_gcov_file else # We treat this as a fatal condition and remove all of the coverage files. echo "Not renaming $gcov_file as $new_gcov_file already exists!" - rm -f ./*.gcda.gcov + rm -f *.gcda.gcov exit 1 fi fi - rm "$gcda_file" + rm $gcda_file done fi fi -- cgit v1.2.1