Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-01-28 12:30:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Use ASSERT_THAT_ERROR instead of logAllUnhandledErrors/exit

Browse Source 
Summary: ASSERT_THAT_ERROR looks like the intended helper for use in tests.

Reviewers: plotfi, jkorous, compnerd

Subscribers: mgorny, dexonsmith, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D65853

llvm-svn: 368399
This commit is contained in:
Dmitri Gribenko 2019-08-09 06:14:54 +00:00
parent 5bb4518116
commit e187336374
2 changed files with 10 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/unittests/DirectoryWatcher/CMakeLists.txt
View File

@ -10,8 +10,9 @@ if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "Linux")
target_link_libraries(DirectoryWatcherTests
PRIVATE
LLVMTestingSupport
clangDirectoryWatcher
clangBasic
)
endif()
endif()

50
clang/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp
View File

@ -10,6 +10,7 @@
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Testing/Support/Error.h"
#include "gtest/gtest.h"
#include <condition_variable>
#include <future>
@ -284,12 +285,7 @@ TEST(DirectoryWatcherTest, InitialScanSync) {
TestConsumer.consume(Events, IsInitial);
},
/*waitForInitialSync=*/true);
if (!DW) {
logAllUnhandledErrors(
DW.takeError(), llvm::errs(),
"DirectoryWatcherTest Failure on DirectoryWatcher::create(): ");
exit(EXIT_FAILURE);
}
ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
checkEventualResultWithTimeout(TestConsumer);
}
@ -322,12 +318,7 @@ TEST(DirectoryWatcherTest, InitialScanAsync) {
TestConsumer.consume(Events, IsInitial);
},
/*waitForInitialSync=*/false);
if (!DW) {
logAllUnhandledErrors(
DW.takeError(), llvm::errs(),
"DirectoryWatcherTest Failure on DirectoryWatcher::create(): ");
exit(EXIT_FAILURE);
}
ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
checkEventualResultWithTimeout(TestConsumer);
}
@ -349,12 +340,7 @@ TEST(DirectoryWatcherTest, AddFiles) {
TestConsumer.consume(Events, IsInitial);
},
/*waitForInitialSync=*/true);
if (!DW) {
logAllUnhandledErrors(
DW.takeError(), llvm::errs(),
"DirectoryWatcherTest Failure on DirectoryWatcher::create(): ");
exit(EXIT_FAILURE);
}
ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
fixture.addFile("a");
fixture.addFile("b");
@ -381,12 +367,7 @@ TEST(DirectoryWatcherTest, ModifyFile) {
TestConsumer.consume(Events, IsInitial);
},
/*waitForInitialSync=*/true);
if (!DW) {
logAllUnhandledErrors(
DW.takeError(), llvm::errs(),
"DirectoryWatcherTest Failure on DirectoryWatcher::create(): ");
exit(EXIT_FAILURE);
}
ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
// modify the file
{
@ -418,12 +399,7 @@ TEST(DirectoryWatcherTest, DeleteFile) {
TestConsumer.consume(Events, IsInitial);
},
/*waitForInitialSync=*/true);
if (!DW) {
logAllUnhandledErrors(
DW.takeError(), llvm::errs(),
"DirectoryWatcherTest Failure on DirectoryWatcher::create(): ");
exit(EXIT_FAILURE);
}
ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
fixture.deleteFile("a");
@ -446,12 +422,7 @@ TEST(DirectoryWatcherTest, DeleteWatchedDir) {
TestConsumer.consume(Events, IsInitial);
},
/*waitForInitialSync=*/true);
if (!DW) {
logAllUnhandledErrors(
DW.takeError(), llvm::errs(),
"DirectoryWatcherTest Failure on DirectoryWatcher::create(): ");
exit(EXIT_FAILURE);
}
ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
remove_directories(fixture.TestWatchedDir);
@ -473,12 +444,7 @@ TEST(DirectoryWatcherTest, InvalidatedWatcher) {
TestConsumer.consume(Events, IsInitial);
},
/*waitForInitialSync=*/true);
if (!DW) {
logAllUnhandledErrors(
DW.takeError(), llvm::errs(),
"DirectoryWatcherTest Failure on DirectoryWatcher::create(): ");
exit(EXIT_FAILURE);
}
ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
} // DW is destructed here.
checkEventualResultWithTimeout(TestConsumer);