[llvm-commits] [llvm] r114727 - in /llvm/trunk: unittests/Support/System.cpp utils/unittest/UnitTestMain/TestMain.cpp

[Michael J. Spencer]

Author: mspencer
Date: Fri Sep 24 04:01:34 2010
New Revision: 114727

URL: http://llvm.org/viewvc/llvm-project?rev=114727&view=rev
Log:
unittests: Support Windows.

Modified:
    llvm/trunk/unittests/Support/System.cpp
    llvm/trunk/utils/unittest/UnitTestMain/TestMain.cpp

Modified: llvm/trunk/unittests/Support/System.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/System.cpp?rev=114727&r1=114726&r2=114727&view=diff
==============================================================================
--- llvm/trunk/unittests/Support/System.cpp (original)
+++ llvm/trunk/unittests/Support/System.cpp Fri Sep 24 04:01:34 2010
@@ -11,6 +11,6 @@
 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);
 }
 }

Modified: llvm/trunk/utils/unittest/UnitTestMain/TestMain.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/UnitTestMain/TestMain.cpp?rev=114727&r1=114726&r2=114727&view=diff
==============================================================================
--- llvm/trunk/utils/unittest/UnitTestMain/TestMain.cpp (original)
+++ llvm/trunk/utils/unittest/UnitTestMain/TestMain.cpp Fri Sep 24 04:01:34 2010
@@ -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();
 }