Skip to content

Commit 28ec8f5

Browse files
kuilpdkuilpd
committed
Disable smart pointer comparison tests
1 parent ad5a6c7 commit 28ec8f5

File tree

1 file changed

+40
-40
lines changed

1 file changed

+40
-40
lines changed

‎lldb/unittests/DIL/DILTests.cpp‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3246,7 +3246,7 @@ TEST_F(EvalTest, TestUniquePtrDeref) {
32463246
#endif
32473247
}
32483248

3249-
TEST_F(EvalTest, TestUniquePtrCompare) {
3249+
TEST_F(EvalTest, DISABLED_TestUniquePtrCompare) {
32503250
#ifdef _WIN32
32513251
// On Windows we're not using `libc++` and therefore the layout of
32523252
// `std::unique_ptr` is different.
@@ -3255,36 +3255,36 @@ TEST_F(EvalTest, TestUniquePtrCompare) {
32553255
// On Linux this assumes the usage of libc++ standard library.
32563256
this->compare_with_lldb_ = false;
32573257

3258-
EXPECT_THAT(Eval("ptr_int == nullptr"), XFail(IsEqual("false")));
3259-
EXPECT_THAT(Eval("ptr_int != nullptr"), XFail(IsEqual("true")));
3260-
EXPECT_THAT(Eval("ptr_int == ptr_int"), XFail(IsEqual("true")));
3258+
EXPECT_THAT(Eval("ptr_int == nullptr"), IsEqual("false"));
3259+
EXPECT_THAT(Eval("ptr_int != nullptr"), IsEqual("true"));
3260+
EXPECT_THAT(Eval("ptr_int == ptr_int"), IsEqual("true"));
32613261

32623262
// C++ doesn't allow comparing unique_ptr with raw pointers, but we allow it
32633263
// for convenience.
3264-
EXPECT_THAT(Eval("ptr_int == 0"), XFail(IsEqual("false")));
3265-
EXPECT_THAT(Eval("ptr_int == (int*)0"), XFail(IsEqual("false")));
3264+
EXPECT_THAT(Eval("ptr_int == 0"), IsEqual("false"));
3265+
EXPECT_THAT(Eval("ptr_int == (int*)0"), IsEqual("false"));
32663266

3267-
EXPECT_THAT(Eval("ptr_float == nullptr"), XFail(IsEqual("false")));
3268-
EXPECT_THAT(Eval("ptr_float != nullptr"), XFail(IsEqual("true")));
3269-
EXPECT_THAT(Eval("ptr_float == (float*)0"), XFail(IsEqual("false")));
3267+
EXPECT_THAT(Eval("ptr_float == nullptr"), IsEqual("false"));
3268+
EXPECT_THAT(Eval("ptr_float != nullptr"), IsEqual("true"));
3269+
EXPECT_THAT(Eval("ptr_float == (float*)0"), IsEqual("false"));
32703270

32713271
EXPECT_THAT(Eval("ptr_float == (int*)0"),
3272-
XFail(IsError("comparison of distinct pointer types")));
3272+
IsError("comparison of distinct pointer types"));
32733273
EXPECT_THAT(Eval("ptr_int == ptr_float"),
3274-
XFail(IsError("comparison of distinct pointer types")));
3274+
IsError("comparison of distinct pointer types"));
32753275

3276-
EXPECT_THAT(Eval("ptr_null == nullptr"), XFail(IsEqual("true")));
3277-
EXPECT_THAT(Eval("ptr_null != nullptr"), XFail(IsEqual("false")));
3276+
EXPECT_THAT(Eval("ptr_null == nullptr"), IsEqual("true"));
3277+
EXPECT_THAT(Eval("ptr_null != nullptr"), IsEqual("false"));
32783278

3279-
EXPECT_THAT(Eval("ptr_void == nullptr"), XFail(IsEqual("false")));
3280-
EXPECT_THAT(Eval("ptr_void != nullptr"), XFail(IsEqual("true")));
3281-
EXPECT_THAT(Eval("ptr_void == ptr_void"), XFail(IsEqual("true")));
3279+
EXPECT_THAT(Eval("ptr_void == nullptr"), IsEqual("false"));
3280+
EXPECT_THAT(Eval("ptr_void != nullptr"), IsEqual("true"));
3281+
EXPECT_THAT(Eval("ptr_void == ptr_void"), IsEqual("true"));
32823282

32833283
// Void pointer can be compared with everything.
3284-
EXPECT_THAT(Eval("ptr_void == (int*)0"), XFail(IsEqual("false")));
3285-
EXPECT_THAT(Eval("ptr_void == (void*)0"), XFail(IsEqual("false")));
3286-
EXPECT_THAT(Eval("ptr_int == ptr_void"), XFail(IsEqual("false")));
3287-
EXPECT_THAT(Eval("ptr_float == ptr_void"), XFail(IsEqual("false")));
3284+
EXPECT_THAT(Eval("ptr_void == (int*)0"), IsEqual("false"));
3285+
EXPECT_THAT(Eval("ptr_void == (void*)0"), IsEqual("false"));
3286+
EXPECT_THAT(Eval("ptr_int == ptr_void"), IsEqual("false"));
3287+
EXPECT_THAT(Eval("ptr_float == ptr_void"), IsEqual("false"));
32883288

32893289
#endif
32903290
}
@@ -3330,7 +3330,7 @@ TEST_F(EvalTest, TestSharedPtrDeref) {
33303330
#endif
33313331
}
33323332

3333-
TEST_F(EvalTest, TestSharedPtrCompare) {
3333+
TEST_F(EvalTest, DISABLED_TestSharedPtrCompare) {
33343334
#ifdef _WIN32
33353335
// On Windows we're not using `libc++` and therefore the layout of
33363336
// `std::shared_ptr` is different.
@@ -3339,36 +3339,36 @@ TEST_F(EvalTest, TestSharedPtrCompare) {
33393339
// On Linux this assumes the usage of libc++ standard library.
33403340
this->compare_with_lldb_ = false;
33413341

3342-
EXPECT_THAT(Eval("ptr_int == nullptr"), XFail(IsEqual("false")));
3343-
EXPECT_THAT(Eval("ptr_int != nullptr"), XFail(IsEqual("true")));
3344-
EXPECT_THAT(Eval("ptr_int == ptr_int"), XFail(IsEqual("true")));
3342+
EXPECT_THAT(Eval("ptr_int == nullptr"), IsEqual("false"));
3343+
EXPECT_THAT(Eval("ptr_int != nullptr"), IsEqual("true"));
3344+
EXPECT_THAT(Eval("ptr_int == ptr_int"), IsEqual("true"));
33453345

33463346
// C++ doesn't allow comparing shared_ptr with raw pointers, but we allow it
33473347
// for convenience.
3348-
EXPECT_THAT(Eval("ptr_int == 0"), XFail(IsEqual("false")));
3349-
EXPECT_THAT(Eval("ptr_int == (int*)0"), XFail(IsEqual("false")));
3348+
EXPECT_THAT(Eval("ptr_int == 0"), IsEqual("false"));
3349+
EXPECT_THAT(Eval("ptr_int == (int*)0"), IsEqual("false"));
33503350

3351-
EXPECT_THAT(Eval("ptr_float == nullptr"), XFail(IsEqual("false")));
3352-
EXPECT_THAT(Eval("ptr_float != nullptr"), XFail(IsEqual("true")));
3353-
EXPECT_THAT(Eval("ptr_float == (float*)0"), XFail(IsEqual("false")));
3351+
EXPECT_THAT(Eval("ptr_float == nullptr"), IsEqual("false"));
3352+
EXPECT_THAT(Eval("ptr_float != nullptr"), IsEqual("true"));
3353+
EXPECT_THAT(Eval("ptr_float == (float*)0"), IsEqual("false"));
33543354

33553355
EXPECT_THAT(Eval("ptr_float == (int*)0"),
3356-
XFail(IsError("comparison of distinct pointer types")));
3356+
IsError("comparison of distinct pointer types"));
33573357
EXPECT_THAT(Eval("ptr_int == ptr_float"),
3358-
XFail(IsError("comparison of distinct pointer types")));
3358+
IsError("comparison of distinct pointer types"));
33593359

3360-
EXPECT_THAT(Eval("ptr_null == nullptr"), XFail(IsEqual("true")));
3361-
EXPECT_THAT(Eval("ptr_null != nullptr"), XFail(IsEqual("false")));
3360+
EXPECT_THAT(Eval("ptr_null == nullptr"), IsEqual("true"));
3361+
EXPECT_THAT(Eval("ptr_null != nullptr"), IsEqual("false"));
33623362

3363-
EXPECT_THAT(Eval("ptr_void == nullptr"), XFail(IsEqual("false")));
3364-
EXPECT_THAT(Eval("ptr_void != nullptr"), XFail(IsEqual("true")));
3365-
EXPECT_THAT(Eval("ptr_void == ptr_void"), XFail(IsEqual("true")));
3363+
EXPECT_THAT(Eval("ptr_void == nullptr"), IsEqual("false"));
3364+
EXPECT_THAT(Eval("ptr_void != nullptr"), IsEqual("true"));
3365+
EXPECT_THAT(Eval("ptr_void == ptr_void"), IsEqual("true"));
33663366

33673367
// Void pointer can be compared with everything.
3368-
EXPECT_THAT(Eval("ptr_void == (int*)0"), XFail(IsEqual("false")));
3369-
EXPECT_THAT(Eval("ptr_void == (void*)0"), XFail(IsEqual("false")));
3370-
EXPECT_THAT(Eval("ptr_int == ptr_void"), XFail(IsEqual("true")));
3371-
EXPECT_THAT(Eval("ptr_float == ptr_void"), XFail(IsEqual("false")));
3368+
EXPECT_THAT(Eval("ptr_void == (int*)0"), IsEqual("false"));
3369+
EXPECT_THAT(Eval("ptr_void == (void*)0"), IsEqual("false"));
3370+
EXPECT_THAT(Eval("ptr_int == ptr_void"), IsEqual("true"));
3371+
EXPECT_THAT(Eval("ptr_float == ptr_void"), IsEqual("false"));
33723372
#endif
33733373
}
33743374

0 commit comments

Comments
 (0)