Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(364)

Unified Diff: native_client_sdk/src/libraries/gtest_ppapi/gtest_runner.cc

Issue 10854137: [NaCl SDK] gtest_ppapi library. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove hacks Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: native_client_sdk/src/libraries/gtest_ppapi/gtest_runner.cc
diff --git a/native_client_sdk/src/libraries/c_salt/test/gtest_runner.cc b/native_client_sdk/src/libraries/gtest_ppapi/gtest_runner.cc
similarity index 85%
rename from native_client_sdk/src/libraries/c_salt/test/gtest_runner.cc
rename to native_client_sdk/src/libraries/gtest_ppapi/gtest_runner.cc
index fbe4808415f052f42e4278ffc66184be1dd06b9c..b6e96d9897b26d58cfdff840610867f3d778c0b3 100644
--- a/native_client_sdk/src/libraries/c_salt/test/gtest_runner.cc
+++ b/native_client_sdk/src/libraries/gtest_ppapi/gtest_runner.cc
@@ -1,15 +1,13 @@
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "c_salt/test/gtest_runner.h"
+#include "gtest_ppapi/gtest_runner.h"
#include <cassert>
-#include "c_salt/test/gtest_event_listener.h"
-#include "c_salt/test/gtest_nacl_environment.h"
#include "gtest/gtest.h"
-
-namespace c_salt {
+#include "gtest_ppapi/gtest_event_listener.h"
+#include "gtest_ppapi/gtest_nacl_environment.h"
pthread_t GTestRunner::g_test_runner_thread_ = NACL_PTHREAD_ILLEGAL_THREAD_ID;
GTestRunner* GTestRunner::gtest_runner_ = NULL;
@@ -51,11 +49,11 @@ void GTestRunner::Init(pp::Instance* instance, int argc, char** argv) {
::testing::TestEventListeners& listeners =
::testing::UnitTest::GetInstance()->listeners();
delete listeners.Release(listeners.default_result_printer());
- listeners.Append(new c_salt::GTestEventListener(instance));
+ listeners.Append(new GTestEventListener(instance));
// We use our own gtest environment, mainly to make the nacl instance
// available to the individual unit tests.
- c_salt::GTestNaclEnvironment* test_env = new c_salt::GTestNaclEnvironment();
+ GTestNaclEnvironment* test_env = new GTestNaclEnvironment();
test_env->set_global_instance(instance);
::testing::AddGlobalTestEnvironment(test_env);
}
@@ -69,8 +67,6 @@ void GTestRunner::RunLoop() {
assert(status_ == kRunTests);
status_signal_.Unlock();
- RUN_ALL_TESTS();
+ int result = RUN_ALL_TESTS();
+ (void)result;
}
-
-} // namespace c_salt
-
« no previous file with comments | « native_client_sdk/src/libraries/gtest_ppapi/gtest_runner.h ('k') | native_client_sdk/src/libraries/gtest_ppapi/library.dsc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698