dddd

Author: RenjiSann

util/build-run-test-coverage-linux.sh

@@ -24,7 +24,12 @@
 
 # TODO: Do not instrument 3rd party librairies to save space and performance
 
-set -ux
+# Exit the script if an unexpected error arise
+set -e
+# Treat unset variables as errors
+set -u
+# Print expanded commands to stdout before running them
+set -x
 
 ME="${0}"
 ME_dir="$(dirname -- "$(readlink -fm -- "${ME}")")"
@@ -33,8 +38,7 @@ REPO_main_dir="$(dirname -- "${ME_dir}")"
 FEATURES_OPTION=${FEATURES_OPTION:-"--features feat_os_unix"}
 COVERAGE_DIR=${COVERAGE_DIR:-"${REPO_main_dir}/coverage"}
 
-LLVM_BIN_PATH="$(rustc --print sysroot)/lib/rustlib/x86_64-unknown-linux-gnu/bin"
-LLVM_PROFDATA="${LLVM_BIN_PATH}/llvm-profdata"
+LLVM_PROFDATA="$(find $(rustc --print sysroot) -name llvm-profdata)"
 
 PROFRAW_DIR="${COVERAGE_DIR}/traces"
 PROFDATA_DIR="${COVERAGE_DIR}/data"
@@ -68,13 +72,15 @@ for UTIL in ${UTIL_LIST}; do
     | grep -v 'SKIP'
     # Note: Do not print the skipped tests on the output as there will be many.
 
-    echo -e "${UTIL} trace generation: $(du -h -d1 ${PROFRAW_DIR})" >> "${REPORT_DIR}/usage"
+    echo -e "${UTIL} trace generation: $(du -h -d1 ${PROFRAW_DIR} | cut -f 1)" >> "${REPORT_DIR}/usage"
 
     # Aggregate all the profraw files into a profdata file
     "${LLVM_PROFDATA}" merge \
         -sparse \
         -o "${PROFDATA_DIR}/${UTIL}.profdata" \
-        ${PROFRAW_DIR}/*.profraw
+        ${PROFRAW_DIR}/*.profraw \
+    || true
+    # We don't want an error in `llvm-profdata` to abort the whole program
 
     # Clear the trace directory to free up space
     rm -rf "${PROFRAW_DIR}" && mkdir -p "${PROFRAW_DIR}"