From 2979d69a05cb16012da06baaa801a1849e9110ce Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Sun, 14 Apr 2024 05:55:58 +0900 Subject: [PATCH] GH-41176: [C++] Stop defining ARROW_TEST_MEMCHECK in config.h.cmake (#41177) ### Rationale for this change We already have `ARROW_VALGRIND`. ### What changes are included in this PR? Remove redundant macro. ### Are these changes tested? Yes. ### Are there any user-facing changes? No. * GitHub Issue: #41176 Authored-by: Sutou Kouhei Signed-off-by: Sutou Kouhei --- cpp/src/arrow/filesystem/test_util.cc | 3 +-- cpp/src/arrow/util/config.h.cmake | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cpp/src/arrow/filesystem/test_util.cc b/cpp/src/arrow/filesystem/test_util.cc index accb7a47ab015..8eb00b8ae44f3 100644 --- a/cpp/src/arrow/filesystem/test_util.cc +++ b/cpp/src/arrow/filesystem/test_util.cc @@ -33,7 +33,6 @@ #include "arrow/testing/future_util.h" #include "arrow/testing/gtest_util.h" #include "arrow/util/async_generator.h" -#include "arrow/util/config.h" #include "arrow/util/io_util.h" #include "arrow/util/key_value_metadata.h" #include "arrow/util/vector.h" @@ -753,7 +752,7 @@ void GenericFileSystemTest::TestGetFileInfoSelector(FileSystem* fs) { } void GenericFileSystemTest::TestGetFileInfoGenerator(FileSystem* fs) { -#if defined(ADDRESS_SANITIZER) || defined(ARROW_TEST_MEMCHECK) +#if defined(ADDRESS_SANITIZER) || defined(ARROW_VALGRIND) if (have_false_positive_memory_leak_with_generator()) { GTEST_SKIP() << "Filesystem have false positive memory leak with generator"; } diff --git a/cpp/src/arrow/util/config.h.cmake b/cpp/src/arrow/util/config.h.cmake index 5ab10c5c49aae..9fbd685084fd5 100644 --- a/cpp/src/arrow/util/config.h.cmake +++ b/cpp/src/arrow/util/config.h.cmake @@ -57,7 +57,6 @@ #cmakedefine ARROW_GCS #cmakedefine ARROW_HDFS #cmakedefine ARROW_S3 -#cmakedefine ARROW_TEST_MEMCHECK #cmakedefine ARROW_USE_GLOG #cmakedefine ARROW_USE_NATIVE_INT128 #cmakedefine ARROW_WITH_BROTLI