summaryrefslogtreecommitdiff
path: root/testrunner.cc
diff options
context:
space:
mode:
authorKen Mixter <kmixter@google.com>2011-03-02 18:01:37 -0800
committerKen Mixter <kmixter@google.com>2011-03-02 18:01:37 -0800
commitf15efc6bc63aab6590b2b303785d0ab810ee5470 (patch)
tree0dc3e9772b430aba3aa70a3fae41b1120f4cfc09 /testrunner.cc
parent61e719072d7afa18ecd4b29278ed19ea36b12737 (diff)
downloadlibchromeos-f15efc6bc63aab6590b2b303785d0ab810ee5470.tar.gz
libchromeos: re-push add process control library, syslog logging capability, and run unit tests
This reverts commit 61e719072d7afa18ecd4b29278ed19ea36b12737. BUG= TEST=emerge with and without ndebug, run unit tests Review URL: http://codereview.chromium.org/6597120 Change-Id: Icbd13fb028bc1c45dce8ea50e70218207e509c82
Diffstat (limited to 'testrunner.cc')
-rw-r--r--testrunner.cc14
1 files changed, 3 insertions, 11 deletions
diff --git a/testrunner.cc b/testrunner.cc
index a8c4626..e4daaea 100644
--- a/testrunner.cc
+++ b/testrunner.cc
@@ -4,20 +4,12 @@
// based on pam_google_testrunner.cc
+#include <chromeos/test_helpers.h>
#include <gtest/gtest.h>
#include <glib-object.h>
-#include <base/logging.h>
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
::g_type_init();
-
-#if 0
- // Initializing with a name does not seem to be changing the log file name.
- // And options for logging to stderr are being ignored. If we don't initialize
- // logging goes to stderr by default.
- google::InitGoogleLogging("power_unittest");
-#endif
-
- ::testing::InitGoogleTest(&argc, argv);
+ SetUpTests(&argc, argv, true);
return RUN_ALL_TESTS();
}