From 8562fbebb7bcc6b6c07938d6866b4092715c2a55 Mon Sep 17 00:00:00 2001 From: Aina Niemetz Date: Wed, 3 Mar 2021 19:06:53 -0800 Subject: [PATCH] Fix nightlies. (#6048) --- test/unit/context/context_black.cpp | 3 +++ test/unit/util/binary_heap_black.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/test/unit/context/context_black.cpp b/test/unit/context/context_black.cpp index 3e59bda83..05a0c0157 100644 --- a/test/unit/context/context_black.cpp +++ b/test/unit/context/context_black.cpp @@ -199,6 +199,8 @@ TEST_F(TestContextBlack, pre_post_notify) d_context.reset(nullptr); } +// TODO: reenable after #2607 is merged in (issue 6047) +#if 0 TEST_F(TestContextBlack, top_scope_context_obj) { // this test's implementation is based on the fact that a @@ -236,6 +238,7 @@ TEST_F(TestContextBlack, top_scope_context_obj) ASSERT_EQ(x.d_nsaves, 1); ASSERT_EQ(y.d_nsaves, 2); } +#endif } // namespace test } // namespace CVC4 diff --git a/test/unit/util/binary_heap_black.cpp b/test/unit/util/binary_heap_black.cpp index a6a84f6e6..d0838951c 100644 --- a/test/unit/util/binary_heap_black.cpp +++ b/test/unit/util/binary_heap_black.cpp @@ -71,7 +71,7 @@ TEST_F(TestUtilBlackBinaryHeap, heap_series) ASSERT_EQ(heap.top(), 5); ASSERT_EQ(heap.size(), 1u); ASSERT_FALSE(heap.empty()); - ASSERT_NE(heap.begin(), heap.end()); + ASSERT_FALSE(heap.begin() == heap.end()); ASSERT_EQ(*h5, 5); ASSERT_EQ(*heap.begin(), 5); ASSERT_NO_THROW(heap.erase(h5)); -- 2.30.2