diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-01 18:29:42 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-01 18:29:42 +0000 |
| commit | 98fa8948b771838261bfbd07a2de305b0ae027e7 (patch) | |
| tree | b48d910ca923ae018b662565a7541459b28198a4 /cc/test/run_all_unittests.cc | |
| parent | 3920fc361cdcc9c18b5c1873210df26e37977918 (diff) | |
| download | chromium_src-98fa8948b771838261bfbd07a2de305b0ae027e7.zip chromium_src-98fa8948b771838261bfbd07a2de305b0ae027e7.tar.gz chromium_src-98fa8948b771838261bfbd07a2de305b0ae027e7.tar.bz2 | |
Make cc_unittests and webkit_compositor_unittests executable always
To get these tests set up to run on the bots they need to be executables always.
If use_libcc_for_compositor is 0 these targets won't run any tests, but they will
still successfully run.
TBR=joth@chromium.org (for stupid android_webview copyright script)
BUG=
Review URL: https://chromiumcodereview.appspot.com/10920056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154620 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/run_all_unittests.cc')
| -rw-r--r-- | cc/test/run_all_unittests.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cc/test/run_all_unittests.cc b/cc/test/run_all_unittests.cc index de5b1c6..d6c4ba0 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; } |