ci: Remove unused workaround after leveldb subtree bump
This commit is contained in:
1 file changed
-26
@@ -44,32 +44,6 @@ echo "=== BEGIN env ==="
|
|||||||
env
|
env
|
||||||
echo "=== END env ==="
|
echo "=== END env ==="
|
||||||
|
|
||||||
# Don't apply patches in the iwyu job, because it relies on the `git diff`
|
|
||||||
# command to detect IWYU errors. It is safe to skip this patch in the iwyu job
|
|
||||||
# because it doesn't run a UB detector.
|
|
||||||
if [[ "${RUN_IWYU}" != true ]]; then
|
|
||||||
# compact->outputs[i].file_size is uninitialized memory, so reading it is UB.
|
|
||||||
# The statistic bytes_written is only used for logging, which is disabled in
|
|
||||||
# CI, so as a temporary minimal fix to work around UB and CI failures, leave
|
|
||||||
# bytes_written unmodified.
|
|
||||||
# See https://github.com/bitcoin/bitcoin/pull/28359#issuecomment-1698694748
|
|
||||||
# Tee patch to stdout to make it clear CI is testing modified code.
|
|
||||||
tee >(patch -p1) <<'EOF'
|
|
||||||
--- a/src/leveldb/db/db_impl.cc
|
|
||||||
+++ b/src/leveldb/db/db_impl.cc
|
|
||||||
@@ -1028,9 +1028,6 @@ Status DBImpl::DoCompactionWork(CompactionState* compact) {
|
|
||||||
stats.bytes_read += compact->compaction->input(which, i)->file_size;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- for (size_t i = 0; i < compact->outputs.size(); i++) {
|
|
||||||
- stats.bytes_written += compact->outputs[i].file_size;
|
|
||||||
- }
|
|
||||||
|
|
||||||
mutex_.Lock();
|
|
||||||
stats_[compact->compaction->level() + 1].Add(stats);
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$RUN_FUZZ_TESTS" = "true" ]; then
|
if [ "$RUN_FUZZ_TESTS" = "true" ]; then
|
||||||
export DIR_FUZZ_IN=${DIR_QA_ASSETS}/fuzz_corpora/
|
export DIR_FUZZ_IN=${DIR_QA_ASSETS}/fuzz_corpora/
|
||||||
if [ ! -d "$DIR_FUZZ_IN" ]; then
|
if [ ! -d "$DIR_FUZZ_IN" ]; then
|
||||||
|
|||||||
Reference in new issue
Block a user