diff options
| author |  Abhishek Arya <inferno@chromium.org> | 2020-11-06 08:09:24 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-11-06 08:09:24 -0800 |
| commit | c960b50e0f3060ec4ad16b0d930bcc9cfdb1775d (patch) | |
| tree | d6fe26893da0ab0e8c2a1f5bbe61b14c6cf642a5 /infra | |
| parent | 65cd35731fc91fe700902ec6d0a31993bf4fe0ec (diff) | |
Revert "Use symlink instead of broken -path-equivalence (#4610)" (#4611)
This reverts commit 65cd35731fc91fe700902ec6d0a31993bf4fe0ec.
Diffstat (limited to 'infra')
| -rwxr-xr-x | infra/base-images/base-runner/coverage | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/infra/base-images/base-runner/coverage b/infra/base-images/base-runner/coverage index 492e85a7..d2bd4ddd 100755 --- a/infra/base-images/base-runner/coverage +++ b/infra/base-images/base-runner/coverage @@ -37,13 +37,13 @@ done PROFILE_FILE="$DUMPS_DIR/merged.profdata" SUMMARY_FILE="$REPORT_PLATFORM_DIR/summary.json" -# Create path symlink as $SRC directory from the builder is copied into $OUT/$SRC. -rm -rf $SRC -ln -s $OUT/src $SRC +# Use path mapping, as $SRC directory from the builder is copied into $OUT/$SRC. +PATH_EQUIVALENCE_ARGS="-path-equivalence=/,$OUT" # It's important to use $COVERAGE_EXTRA_ARGS as the last argument, because it # can contain paths to source files / directories which are positional args. -LLVM_COV_COMMON_ARGS="-ignore-filename-regex=.*src/libfuzzer/.* $COVERAGE_EXTRA_ARGS" +LLVM_COV_COMMON_ARGS="$PATH_EQUIVALENCE_ARGS \ + -ignore-filename-regex=.*src/libfuzzer/.* $COVERAGE_EXTRA_ARGS" # Timeout for running a single fuzz target. TIMEOUT=1h @@ -164,7 +164,7 @@ llvm-cov export -summary-only $LLVM_COV_ARGS > $SUMMARY_FILE # Post process HTML report. coverage_helper -v post_process -src-root-dir=/ -summary-file=$SUMMARY_FILE \ - -output-dir=$REPORT_ROOT_DIR + -output-dir=$REPORT_ROOT_DIR $PATH_EQUIVALENCE_ARGS if [[ -n $HTTP_PORT ]]; then # Serve the report locally. |