From 1dcf216f9fa662a3a02c3fc938157fbc0bcdf19f Mon Sep 17 00:00:00 2001 From: Puyan Lotfi Date: Tue, 6 Aug 2019 23:25:34 +0000 Subject: [clang][DirectoryWatcher][NFC] Swapping asserts for llvm fatal_error in create I also have replaced all the instances of "auto DW = DirectoryWatcher::create" with llvm::Expected> DW = DirectoryWatcher::create to make it more clear that DirectoryWatcher::create is returning an Expected. I've also allowed for logAllUnhandledErrors to consume errors in the case were DirectoryWatcher::create produces them. Differential Revision: https://reviews.llvm.org/D65829 llvm-svn: 368108 --- .../DirectoryWatcher/DirectoryWatcherTest.cpp | 156 +++++++++++++-------- 1 file changed, 99 insertions(+), 57 deletions(-) (limited to 'clang/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp') diff --git a/clang/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp b/clang/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp index 14ef3460327..485f0eeab05 100644 --- a/clang/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp +++ b/clang/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp @@ -277,14 +277,20 @@ TEST(DirectoryWatcherTest, InitialScanSync) { {EventKind::Modified, "c"}} }; - auto DW = DirectoryWatcher::create( - fixture.TestWatchedDir, - [&TestConsumer](llvm::ArrayRef Events, - bool IsInitial) { - TestConsumer.consume(Events, IsInitial); - }, - /*waitForInitialSync=*/true); - if (!DW) return; + llvm::Expected> DW = + DirectoryWatcher::create( + fixture.TestWatchedDir, + [&TestConsumer](llvm::ArrayRef Events, + bool IsInitial) { + TestConsumer.consume(Events, IsInitial); + }, + /*waitForInitialSync=*/true); + if (!DW) { + logAllUnhandledErrors( + DW.takeError(), llvm::errs(), + "DirectoryWatcherTest Failure on DirectoryWatcher::create(): "); + exit(EXIT_FAILURE); + } checkEventualResultWithTimeout(TestConsumer); } @@ -309,14 +315,20 @@ TEST(DirectoryWatcherTest, InitialScanAsync) { {EventKind::Modified, "c"}} }; - auto DW = DirectoryWatcher::create( - fixture.TestWatchedDir, - [&TestConsumer](llvm::ArrayRef Events, - bool IsInitial) { - TestConsumer.consume(Events, IsInitial); - }, - /*waitForInitialSync=*/false); - if (!DW) return; + llvm::Expected> DW = + DirectoryWatcher::create( + fixture.TestWatchedDir, + [&TestConsumer](llvm::ArrayRef Events, + bool IsInitial) { + TestConsumer.consume(Events, IsInitial); + }, + /*waitForInitialSync=*/false); + if (!DW) { + logAllUnhandledErrors( + DW.takeError(), llvm::errs(), + "DirectoryWatcherTest Failure on DirectoryWatcher::create(): "); + exit(EXIT_FAILURE); + } checkEventualResultWithTimeout(TestConsumer); } @@ -330,14 +342,20 @@ TEST(DirectoryWatcherTest, AddFiles) { {EventKind::Modified, "b"}, {EventKind::Modified, "c"}}}; - auto DW = DirectoryWatcher::create( - fixture.TestWatchedDir, - [&TestConsumer](llvm::ArrayRef Events, - bool IsInitial) { - TestConsumer.consume(Events, IsInitial); - }, - /*waitForInitialSync=*/true); - if (!DW) return; + llvm::Expected> DW = + DirectoryWatcher::create( + fixture.TestWatchedDir, + [&TestConsumer](llvm::ArrayRef Events, + bool IsInitial) { + TestConsumer.consume(Events, IsInitial); + }, + /*waitForInitialSync=*/true); + if (!DW) { + logAllUnhandledErrors( + DW.takeError(), llvm::errs(), + "DirectoryWatcherTest Failure on DirectoryWatcher::create(): "); + exit(EXIT_FAILURE); + } fixture.addFile("a"); fixture.addFile("b"); @@ -356,14 +374,20 @@ TEST(DirectoryWatcherTest, ModifyFile) { {{EventKind::Modified, "a"}}, {{EventKind::Modified, "a"}}}; - auto DW = DirectoryWatcher::create( - fixture.TestWatchedDir, - [&TestConsumer](llvm::ArrayRef Events, - bool IsInitial) { - TestConsumer.consume(Events, IsInitial); - }, - /*waitForInitialSync=*/true); - if (!DW) return; + llvm::Expected> DW = + DirectoryWatcher::create( + fixture.TestWatchedDir, + [&TestConsumer](llvm::ArrayRef Events, + bool IsInitial) { + TestConsumer.consume(Events, IsInitial); + }, + /*waitForInitialSync=*/true); + if (!DW) { + logAllUnhandledErrors( + DW.takeError(), llvm::errs(), + "DirectoryWatcherTest Failure on DirectoryWatcher::create(): "); + exit(EXIT_FAILURE); + } // modify the file { @@ -387,14 +411,20 @@ TEST(DirectoryWatcherTest, DeleteFile) { {{EventKind::Removed, "a"}}, {{EventKind::Modified, "a"}, {EventKind::Removed, "a"}}}; - auto DW = DirectoryWatcher::create( - fixture.TestWatchedDir, - [&TestConsumer](llvm::ArrayRef Events, - bool IsInitial) { - TestConsumer.consume(Events, IsInitial); - }, - /*waitForInitialSync=*/true); - if (!DW) return; + llvm::Expected> DW = + DirectoryWatcher::create( + fixture.TestWatchedDir, + [&TestConsumer](llvm::ArrayRef Events, + bool IsInitial) { + TestConsumer.consume(Events, IsInitial); + }, + /*waitForInitialSync=*/true); + if (!DW) { + logAllUnhandledErrors( + DW.takeError(), llvm::errs(), + "DirectoryWatcherTest Failure on DirectoryWatcher::create(): "); + exit(EXIT_FAILURE); + } fixture.deleteFile("a"); @@ -409,14 +439,20 @@ TEST(DirectoryWatcherTest, DeleteWatchedDir) { {{EventKind::WatchedDirRemoved, ""}, {EventKind::WatcherGotInvalidated, ""}}}; - auto DW = DirectoryWatcher::create( - fixture.TestWatchedDir, - [&TestConsumer](llvm::ArrayRef Events, - bool IsInitial) { - TestConsumer.consume(Events, IsInitial); - }, - /*waitForInitialSync=*/true); - if (!DW) return; + llvm::Expected> DW = + DirectoryWatcher::create( + fixture.TestWatchedDir, + [&TestConsumer](llvm::ArrayRef Events, + bool IsInitial) { + TestConsumer.consume(Events, IsInitial); + }, + /*waitForInitialSync=*/true); + if (!DW) { + logAllUnhandledErrors( + DW.takeError(), llvm::errs(), + "DirectoryWatcherTest Failure on DirectoryWatcher::create(): "); + exit(EXIT_FAILURE); + } remove_directories(fixture.TestWatchedDir); @@ -430,15 +466,21 @@ TEST(DirectoryWatcherTest, InvalidatedWatcher) { {}, {{EventKind::WatcherGotInvalidated, ""}}}; { - auto DW = DirectoryWatcher::create( - fixture.TestWatchedDir, - [&TestConsumer](llvm::ArrayRef Events, - bool IsInitial) { - TestConsumer.consume(Events, IsInitial); - }, - /*waitForInitialSync=*/true); - if (!DW) return; + llvm::Expected> DW = + DirectoryWatcher::create( + fixture.TestWatchedDir, + [&TestConsumer](llvm::ArrayRef Events, + bool IsInitial) { + TestConsumer.consume(Events, IsInitial); + }, + /*waitForInitialSync=*/true); + if (!DW) { + logAllUnhandledErrors( + DW.takeError(), llvm::errs(), + "DirectoryWatcherTest Failure on DirectoryWatcher::create(): "); + exit(EXIT_FAILURE); + } } // DW is destructed here. checkEventualResultWithTimeout(TestConsumer); -} \ No newline at end of file +} -- cgit v1.2.3