From ddfce8f95b4e2cf9b899d1a4f2105d12ede0a155 Mon Sep 17 00:00:00 2001 From: "Michael J. Spencer" Date: Fri, 24 Sep 2010 09:01:34 +0000 Subject: [PATCH] unittests: Support Windows. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@114727 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/Support/System.cpp | 2 +- utils/unittest/UnitTestMain/TestMain.cpp | 27 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/unittests/Support/System.cpp b/unittests/Support/System.cpp index b3dd17d380d..94f1978b598 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(now_t - now.toEpochTime())) < 2); } } diff --git a/utils/unittest/UnitTestMain/TestMain.cpp b/utils/unittest/UnitTestMain/TestMain.cpp index d97dca872ad..ed42c227c8c 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 +# if defined(_MSC_VER) +# include +# 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(); }