Skip to content

GH-47033: [C++][Compute] Never use custom gtest main with MSVC #47049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raulcd merged 1 commit into from
Jul 10, 2025
Merged

GH-47033: [C++][Compute] Never use custom gtest main with MSVC #47049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cpp/src/arrow/compute/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ if(ARROW_TESTING AND ARROW_COMPUTE)
add_library(arrow_compute_testing OBJECT ${ARROW_COMPUTE_TESTING_SRCS})
# Even though this is still just an object library we still need to "link"
# arrow_compute_core_testing so that is also included correctly
if(MSVC AND MSVC_VERSION LESS 1930)
if(MSVC)
target_link_libraries(arrow_compute_testing
PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
PUBLIC ${ARROW_GTEST_GTEST_MAIN})
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/arrow/compute/test_env.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ class ComputeKernelEnvironment : public ::testing::Environment {

} // namespace

#if defined(_MSC_VER) && _MSC_VER < 1930
#ifdef _MSC_VER
// Initialize the compute module
::testing::Environment* compute_kernels_env =
::testing::AddGlobalTestEnvironment(new ComputeKernelEnvironment);
#endif

} // namespace arrow::compute

#if !(defined(_MSC_VER) && _MSC_VER < 1930)
#ifndef _MSC_VER
int main(int argc, char** argv) {
::testing::InitGoogleTest(&argc, argv);
::testing::AddGlobalTestEnvironment(new arrow::compute::ComputeKernelEnvironment);
Expand Down
Loading