diff options
| author | Steve Linden <steve@lindenlab.com> | 2009-09-10 15:36:49 -0700 |
|---|---|---|
| committer | Steve Linden <steve@lindenlab.com> | 2009-09-10 15:36:49 -0700 |
| commit | 48328db339b5eff70a631f067fb3010b30cb4d3a (patch) | |
| tree | b6c9c18c0e3eebdf5ac9ef408283d97c441452e3 /indra/test/test.cpp | |
| parent | b253069f7e2a99e529caff0319fbcffc77cd5b8d (diff) | |
#ifdef'd out gmock and gtest for LL_WINDOWS. Does not appear to be needed and breaks the build.
Diffstat (limited to 'indra/test/test.cpp')
| -rw-r--r-- | indra/test/test.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/test/test.cpp b/indra/test/test.cpp index c9e985c914..e7ba8e33b8 100644 --- a/indra/test/test.cpp +++ b/indra/test/test.cpp @@ -54,8 +54,10 @@ # include "ctype_workaround.h" #endif +#ifndef LL_WINDOWS #include <gmock/gmock.h> #include <gtest/gtest.h> +#endif namespace tut { @@ -243,7 +245,9 @@ int main(int argc, char **argv) { // The following line must be executed to initialize Google Mock // (and Google Test) before running the tests. +#ifndef LL_WINDOWS ::testing::InitGoogleMock(&argc, argv); +#endif LLError::initForApplication("."); LLError::setFatalFunction(wouldHaveCrashed); LLError::setDefaultLevel(LLError::LEVEL_ERROR); |