Skip to content

Commit 6c7a5e1

Browse files
cachemeifyoucanaokblast
authored andcommitted
[CAS] Fix test fallouts from llvm#114102 (llvm#164457)
Fix MSAN failure and expensive test failure.
1 parent 84576d5 commit 6c7a5e1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

llvm/unittests/CAS/OnDiskGraphDBTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ TEST_F(OnDiskCASTest, OnDiskGraphDBFaultInPolicyConflict) {
283283
OnDiskGraphDB::FaultInPolicy::SingleNode);
284284
}
285285

286-
#if defined(EXPENSIVE_CHECKS)
286+
#if defined(EXPENSIVE_CHECKS) && !defined(_WIN32)
287287
TEST_F(OnDiskCASTest, OnDiskGraphDBSpaceLimit) {
288288
setMaxOnDiskCASMappingSize();
289289
unittest::TempDir Temp("ondiskcas", /*Unique=*/true);

llvm/unittests/CAS/OnDiskKeyValueDBTest.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ TEST_F(OnDiskCASTest, OnDiskKeyValueDBTest) {
3333
}
3434

3535
ValueType ValW = valueFromString("world");
36-
ArrayRef<char> Val;
36+
std::optional<ArrayRef<char>> Val;
3737
ASSERT_THAT_ERROR(DB->put(digest("hello"), ValW).moveInto(Val), Succeeded());
38-
EXPECT_EQ(Val, ArrayRef(ValW));
38+
EXPECT_EQ(*Val, ArrayRef(ValW));
3939
ASSERT_THAT_ERROR(
4040
DB->put(digest("hello"), valueFromString("other")).moveInto(Val),
4141
Succeeded());
42-
EXPECT_EQ(Val, ArrayRef(ValW));
42+
EXPECT_EQ(*Val, ArrayRef(ValW));
4343

4444
{
4545
std::optional<ArrayRef<char>> Val;

0 commit comments

Comments
 (0)