From 7a95034f10cb3c4152ba7b488882c7430ae2e2d0 Mon Sep 17 00:00:00 2001 From: Amnon Hanuhov Date: Sat, 6 May 2023 16:05:03 +0300 Subject: [PATCH 1/2] gitignore: Add build_tools/pycache/ to gitignore (#486) *.pyc artifacts from running gtest-parallel as part of `make check` are created in this directory --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index e463459363..130bafd770 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,8 @@ sst_dump blob_dump block_cache_trace_analyzer tools/block_cache_analyzer/*.pyc +build_tools/*.pyc +build_tools/pycache/ column_aware_encoding_exp util/build_version.cc build_tools/VALGRIND_LOGS/ From 323e57bf5359401a4fa15c85d7e5b0c05e822f62 Mon Sep 17 00:00:00 2001 From: Amnon Hanuhov Date: Sat, 6 May 2023 16:18:56 +0300 Subject: [PATCH 2/2] Makefile: Remove pycache artifacts after running gtest-parallel (#486) --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 5dabf92456..e083182dc3 100644 --- a/Makefile +++ b/Makefile @@ -958,6 +958,7 @@ OUTPUT_DIR ?= /tmp .PHONY: check_0 check_1 check_0: $(TESTS) $(AM_V_GEN)./build_tools/gtest-parallel --output_dir=$(OUTPUT_DIR) --workers=$(J) --non_gtest_tests $(NON_PARALLEL_TESTS_LIST) $(PARALLEL_TESTS_LIST) + find ./build_tools | grep -E "(pycache|__pycache__|\.pyc$$)" | xargs rm -rf check_1: $(TESTS) $(AM_V_GEN)for t in $(TESTS); do \ @@ -969,6 +970,7 @@ valgrind-exclude-regexp = InlineSkipTest.ConcurrentInsert|TransactionStressTest. .PHONY: valgrind_check_0 valgrind_check_1 valgrind_check_0: $(TESTS) $(AM_V_GEN) $(VALGRIND_VER) $(VALGRIND_OPTS) ./build_tools/gtest-parallel --output_dir=$(OUTPUT_DIR) --workers=$(J) --non_gtest_tests $(NON_PARALLEL_TESTS_LIST) $(PARALLEL_TESTS_LIST) + find ./build_tools | grep -E "(pycache|__pycache__|\.pyc$$)" | xargs rm -rf valgrind_check_1: $(TESTS) $(AM_V_GEN)for t in $(filter-out %skiplist_test options_settable_test,$(TESTS)); do \