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

Unified Diff: cc/test/run_all_unittests.cc

Issue 10920056: Make cc_unittests and webkit_compositor_unittests executable always (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rename to webkit_compositor_bindings 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
« no previous file with comments | « cc/cc_tests.gyp ('k') | webkit/compositor/CCThreadImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/run_all_unittests.cc
diff --git a/cc/test/run_all_unittests.cc b/cc/test/run_all_unittests.cc
index de5b1c6279dbd2bfb7b6232a82d450c387f881a1..d6c4ba09688c6533095c21652e1184b81bbfbca3 100644
--- a/cc/test/run_all_unittests.cc
+++ b/cc/test/run_all_unittests.cc
@@ -4,14 +4,21 @@
#include <base/test/test_suite.h>
#include <gmock/gmock.h>
+
+#if defined(USE_LIBCC_FOR_COMPOSITOR)
#include <webkit/support/webkit_support.h>
+#endif
int main(int argc, char** argv) {
::testing::InitGoogleMock(&argc, argv);
TestSuite testSuite(argc, argv);
+#if defined(USE_LIBCC_FOR_COMPOSITOR)
webkit_support::SetUpTestEnvironmentForUnitTests();
+#endif
int result = testSuite.Run();
+#if defined(USE_LIBCC_FOR_COMPOSITOR)
webkit_support::TearDownTestEnvironment();
+#endif
return result;
}
« no previous file with comments | « cc/cc_tests.gyp ('k') | webkit/compositor/CCThreadImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698