diff options
| author | Julien Lerouge <jlerouge@apple.com> | 2009-02-12 08:02:35 +0000 |
|---|---|---|
| committer | Julien Lerouge <jlerouge@apple.com> | 2009-02-12 08:02:35 +0000 |
| commit | e0a056b1fffba3133f1343034c359382954c182a (patch) | |
| tree | 36b60290971bcccef46f123d57e5ba96028a49ac /utils/unittest | |
| parent | 9430fe7092fef1a7bb83e0846ff3aa8c7a50a2df (diff) | |
| download | external_llvm-e0a056b1fffba3133f1343034c359382954c182a.zip external_llvm-e0a056b1fffba3133f1343034c359382954c182a.tar.gz external_llvm-e0a056b1fffba3133f1343034c359382954c182a.tar.bz2 | |
Fix MingW build: define GTEST_OS_WINDOWS if OS is MingW, but disable
exceptions.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@64367 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/unittest')
| -rw-r--r-- | utils/unittest/googletest/Makefile | 4 | ||||
| -rw-r--r-- | utils/unittest/googletest/gtest.cc | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/utils/unittest/googletest/Makefile b/utils/unittest/googletest/Makefile index 801506e..6e26241 100644 --- a/utils/unittest/googletest/Makefile +++ b/utils/unittest/googletest/Makefile @@ -18,4 +18,8 @@ BUILD_ARCHIVE = 1 CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include/ CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS) +ifeq ($(OS),MingW) + CPP.Flags += -DGTEST_OS_WINDOWS=1 +endif + include $(LEVEL)/Makefile.common diff --git a/utils/unittest/googletest/gtest.cc b/utils/unittest/googletest/gtest.cc index 64dbb84..e46e90a 100644 --- a/utils/unittest/googletest/gtest.cc +++ b/utils/unittest/googletest/gtest.cc @@ -1993,7 +1993,7 @@ void Test::Run() { if (!HasSameFixtureClass()) return; internal::UnitTestImpl* const impl = internal::GetUnitTestImpl(); -#ifdef GTEST_OS_WINDOWS +#if defined(GTEST_OS_WINDOWS) && !defined(__MINGW32__) // We are on Windows. impl->os_stack_trace_getter()->UponLeavingGTest(); __try { @@ -2025,7 +2025,7 @@ void Test::Run() { AddExceptionThrownFailure(GetExceptionCode(), "TearDown()"); } -#else // We are on Linux or Mac - exceptions are disabled. +#else // We are on Linux, Mac or MingW - exceptions are disabled. impl->os_stack_trace_getter()->UponLeavingGTest(); SetUp(); @@ -2227,7 +2227,7 @@ void TestInfoImpl::Run() { const TimeInMillis start = GetTimeInMillis(); impl->os_stack_trace_getter()->UponLeavingGTest(); -#ifdef GTEST_OS_WINDOWS +#if defined(GTEST_OS_WINDOWS) && !defined(__MINGW32__) // We are on Windows. Test* test = NULL; @@ -2240,7 +2240,7 @@ void TestInfoImpl::Run() { "the test fixture's constructor"); return; } -#else // We are on Linux or Mac OS - exceptions are disabled. +#else // We are on Linux, Mac OS or MingW - exceptions are disabled. // TODO(wan): If test->Run() throws, test won't be deleted. This is // not a problem now as we don't use exceptions. If we were to @@ -3271,7 +3271,7 @@ void UnitTest::RecordPropertyForCurrentTest(const char* key, // We don't protect this under mutex_, as we only support calling it // from the main thread. int UnitTest::Run() { -#ifdef GTEST_OS_WINDOWS +#if defined(GTEST_OS_WINDOWS) && !defined(__MINGW32__) #if !defined(_WIN32_WCE) // SetErrorMode doesn't exist on CE. @@ -3294,7 +3294,7 @@ int UnitTest::Run() { } #else - // We are on Linux or Mac OS. There is no exception of any kind. + // We are on Linux, Mac OS or MingW. There is no exception of any kind. return impl_->RunAllTests(); #endif // GTEST_OS_WINDOWS |