diff options
| -rw-r--r-- | unittests/Support/System.cpp | 2 | ||||
| -rw-r--r-- | utils/unittest/UnitTestMain/TestMain.cpp | 27 |
2 files changed, 28 insertions, 1 deletions
diff --git a/unittests/Support/System.cpp b/unittests/Support/System.cpp index b3dd17d380..94f1978b59 100644 --- a/unittests/Support/System.cpp +++ b/unittests/Support/System.cpp @@ -11,6 +11,6 @@ class SystemTest : public ::testing::Test { TEST_F(SystemTest, TimeValue) { sys::TimeValue now = sys::TimeValue::now(); time_t now_t = time(NULL); - EXPECT_TRUE(abs(now_t - now.toEpochTime()) < 2); + EXPECT_TRUE(abs(static_cast<time_t>(now_t - now.toEpochTime())) < 2); } } diff --git a/utils/unittest/UnitTestMain/TestMain.cpp b/utils/unittest/UnitTestMain/TestMain.cpp index d97dca872a..ed42c227c8 100644 --- a/utils/unittest/UnitTestMain/TestMain.cpp +++ b/utils/unittest/UnitTestMain/TestMain.cpp @@ -7,9 +7,36 @@ // //===----------------------------------------------------------------------===// +#include "llvm/Config/config.h" +#include "llvm/System/Signals.h" #include "gtest/gtest.h" + +#if defined(LLVM_ON_WIN32) +# include <Windows.h> +# if defined(_MSC_VER) +# include <crtdbg.h> +# endif +#endif + int main(int argc, char **argv) { + llvm::sys::PrintStackTraceOnErrorSignal(); testing::InitGoogleTest(&argc, argv); + +# if defined(LLVM_ON_WIN32) + // Disable all of the possible ways Windows conspires to make automated + // testing impossible. + ::SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX); +# if defined(_MSC_VER) + ::_set_error_mode(_OUT_TO_STDERR); + ::_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+ ::_CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR); + ::_CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+ ::_CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR); + ::_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+ ::_CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR); +# endif +# endif + return RUN_ALL_TESTS(); } |