diff --git a/cpp/tests/iterator/value_iterator_test_numeric.cu b/cpp/tests/iterator/value_iterator_test_numeric.cu index d3d1c12bdc7..39e05ff6832 100644 --- a/cpp/tests/iterator/value_iterator_test_numeric.cu +++ b/cpp/tests/iterator/value_iterator_test_numeric.cu @@ -23,17 +23,5 @@ template struct NumericValueIteratorTest : public IteratorTest {}; TYPED_TEST_SUITE(NumericValueIteratorTest, TestingTypes); -TYPED_TEST(NumericValueIteratorTest, non_null_iterator) -{ - if constexpr (std::is_same_v || std::is_same_v) { - if (getenv("LIBCUDF_MEMCHECK_ENABLED")) { return; } - } - non_null_iterator(*this); -} -TYPED_TEST(NumericValueIteratorTest, null_iterator) -{ - if constexpr (std::is_same_v || std::is_same_v) { - if (getenv("LIBCUDF_MEMCHECK_ENABLED")) { return; } - } - null_iterator(*this); -} +TYPED_TEST(NumericValueIteratorTest, non_null_iterator) { non_null_iterator(*this); } +TYPED_TEST(NumericValueIteratorTest, null_iterator) { null_iterator(*this); } diff --git a/cpp/tests/reductions/reduction_tests.cpp b/cpp/tests/reductions/reduction_tests.cpp index 0ec4cfa34c4..949ffcc26a6 100644 --- a/cpp/tests/reductions/reduction_tests.cpp +++ b/cpp/tests/reductions/reduction_tests.cpp @@ -300,9 +300,6 @@ TYPED_TEST_SUITE(ReductionTest, cudf::test::NumericTypes); TYPED_TEST(ReductionTest, Product) { using T = TypeParam; - if constexpr (std::is_same_v || std::is_same_v) { - if (getenv("LIBCUDF_MEMCHECK_ENABLED")) { return; } - } std::vector int_values({5, -1, 1, 0, 3, 2, 4}); std::vector host_bools({true, true, false, false, true, true, true}); diff --git a/cpp/tests/reductions/segmented_reduction_tests.cpp b/cpp/tests/reductions/segmented_reduction_tests.cpp index 37efc116d2a..668690639a6 100644 --- a/cpp/tests/reductions/segmented_reduction_tests.cpp +++ b/cpp/tests/reductions/segmented_reduction_tests.cpp @@ -87,10 +87,6 @@ TYPED_TEST(SegmentedReductionTest, SumExcludeNulls) TYPED_TEST(SegmentedReductionTest, ProductExcludeNulls) { - if constexpr (std::is_same_v || std::is_same_v) { - if (getenv("LIBCUDF_MEMCHECK_ENABLED")) { return; } - } - // [1, 3, 5], [null, 3, 5], [1], [null], [null, null], [] // values: {1, 3, 5, XXX, 3, 5, 1, XXX, XXX, XXX} // offsets: {0, 3, 6, 7, 8, 10, 10} @@ -141,10 +137,6 @@ TYPED_TEST(SegmentedReductionTest, ProductExcludeNulls) TYPED_TEST(SegmentedReductionTest, MaxExcludeNulls) { - if constexpr (std::is_same_v || std::is_same_v) { - if (getenv("LIBCUDF_MEMCHECK_ENABLED")) { return; } - } - // [1, 2, 3], [1, null, 3], [1], [null], [null, null], [] // values: {1, 2, 3, 1, XXX, 3, 1, XXX, XXX, XXX} // offsets: {0, 3, 6, 7, 8, 10, 10} @@ -193,10 +185,6 @@ TYPED_TEST(SegmentedReductionTest, MaxExcludeNulls) TYPED_TEST(SegmentedReductionTest, MinExcludeNulls) { - if constexpr (std::is_same_v || std::is_same_v) { - if (getenv("LIBCUDF_MEMCHECK_ENABLED")) { return; } - } - // [1, 2, 3], [1, null, 3], [1], [null], [null, null], [] // values: {1, 2, 3, 1, XXX, 3, 1, XXX, XXX, XXX} // offsets: {0, 3, 6, 7, 8, 10, 10} @@ -388,10 +376,6 @@ TYPED_TEST(SegmentedReductionTest, SumIncludeNulls) TYPED_TEST(SegmentedReductionTest, ProductIncludeNulls) { - if constexpr (std::is_same_v || std::is_same_v) { - if (getenv("LIBCUDF_MEMCHECK_ENABLED")) { return; } - } - // [1, 3, 5], [null, 3, 5], [1], [null], [null, null], [] // values: {1, 3, 5, XXX, 3, 5, 1, XXX, XXX, XXX} // offsets: {0, 3, 6, 7, 8, 10, 10} @@ -445,10 +429,6 @@ TYPED_TEST(SegmentedReductionTest, ProductIncludeNulls) TYPED_TEST(SegmentedReductionTest, MaxIncludeNulls) { - if constexpr (std::is_same_v || std::is_same_v) { - if (getenv("LIBCUDF_MEMCHECK_ENABLED")) { return; } - } - // [1, 2, 3], [1, null, 3], [1], [null], [null, null], [] // values: {1, 2, 3, 1, XXX, 3, 1, XXX, XXX, XXX} // offsets: {0, 3, 6, 7, 8, 10, 10} @@ -500,10 +480,6 @@ TYPED_TEST(SegmentedReductionTest, MaxIncludeNulls) TYPED_TEST(SegmentedReductionTest, MinIncludeNulls) { - if constexpr (std::is_same_v || std::is_same_v) { - if (getenv("LIBCUDF_MEMCHECK_ENABLED")) { return; } - } - // [1, 2, 3], [1, null, 3], [1], [null], [null, null], [] // values: {1, 2, 3, 1, XXX, 3, 1, XXX, XXX} // offsets: {0, 3, 6, 7, 8, 10, 10}