From 6cca9fab7cda61365b19910fb7b9440cc8bd8ac2 Mon Sep 17 00:00:00 2001 From: Jay Zhuang Date: Tue, 7 Sep 2021 15:38:04 -0700 Subject: [PATCH] Remove asan_symbolize.py for internal asan build (#8737) Summary: asan_symbolize.py is not compatible with python3. Also make it consistent with public CI, which doesn't use asan_symbolize.py And update coverage_test.sh to use python3. Pull Request resolved: https://github.com/facebook/rocksdb/pull/8737 Test Plan: CI Reviewed By: pdillinger Differential Revision: D30702430 Pulled By: jay-zhuang fbshipit-source-id: ef09947b1232294d31b09a855c2f0ce149097dd9 --- build_tools/rocksdb-lego-determinator | 2 +- coverage/coverage_test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build_tools/rocksdb-lego-determinator b/build_tools/rocksdb-lego-determinator index 3af7343ba9..b3484fe8b0 100755 --- a/build_tools/rocksdb-lego-determinator +++ b/build_tools/rocksdb-lego-determinator @@ -594,7 +594,7 @@ ASAN_TEST_COMMANDS="[ $CLEANUP_ENV, { 'name':'Test RocksDB debug under ASAN', -'shell':'cd $WORKING_DIR; set -o pipefail && ($SHM $ASAN $DEBUG $SKIP_FORMAT_CHECKS make $PARALLELISM asan_check || $CONTRUN_NAME=asan_check $TASK_CREATION_TOOL) |& /usr/facebook/ops/scripts/asan_symbolize.py -d', +'shell':'cd $WORKING_DIR; set -o pipefail && $SHM $ASAN $DEBUG $SKIP_FORMAT_CHECKS make $PARALLELISM asan_check || $CONTRUN_NAME=asan_check $TASK_CREATION_TOOL', 'user':'root', $PARSER } diff --git a/coverage/coverage_test.sh b/coverage/coverage_test.sh index 1c83b53c13..afe77f663b 100755 --- a/coverage/coverage_test.sh +++ b/coverage/coverage_test.sh @@ -24,7 +24,7 @@ mkdir -p $COVERAGE_DIR # Find all gcno files to generate the coverage report -PYTHON=${1:-`which python`} +PYTHON=${1:-`which python3`} echo -e "Using $PYTHON" GCNO_FILES=`find $ROOT -name "*.gcno"` $GCOV --preserve-paths --relative-only --no-output $GCNO_FILES 2>/dev/null |