merged 1.4 r982:983 into trunk

This commit is contained in:
Nick Bolton
2011-05-09 00:28:45 +00:00
parent 627771cf13
commit 13c6c36107
18 changed files with 208 additions and 86 deletions

View File

@@ -18,6 +18,7 @@
#include <iostream>
#include <gtest/gtest.h>
#include "CArch.h"
#include "CLog.h"
#if SYSAPI_WIN32
#include "CArchMiscWindows.h"
@@ -69,6 +70,8 @@ main(int argc, char **argv)
CArch arch;
CLOG->setFilter(kDEBUG2);
testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();