summaryrefslogtreecommitdiffstats
path: root/content/test/content_test_launcher.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-24 17:52:33 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-24 17:52:33 +0000
commit3bbf7565dc8ad9feb1c1d03dc983b995b953e559 (patch)
tree21d97277d4cb47ef139fef316807d103460ad209 /content/test/content_test_launcher.cc
parentec1b877e80d28b2853a099771af105cc55555ae4 (diff)
downloadchromium_src-3bbf7565dc8ad9feb1c1d03dc983b995b953e559.zip
chromium_src-3bbf7565dc8ad9feb1c1d03dc983b995b953e559.tar.gz
chromium_src-3bbf7565dc8ad9feb1c1d03dc983b995b953e559.tar.bz2
Don't run content_browsertests on aura yet
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148135 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/content_test_launcher.cc')
-rw-r--r--content/test/content_test_launcher.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc
index efa0c72..e9dc6a3 100644
--- a/content/test/content_test_launcher.cc
+++ b/content/test/content_test_launcher.cc
@@ -132,6 +132,10 @@ class ContentTestLauncherDelegate : public test_launcher::TestLauncherDelegate {
} // namespace content
int main(int argc, char** argv) {
+#if defined(USE_AURA)
+ LOG(INFO) << "content_browsertests not supported on aura yet.";
+ return 0;
+#endif
content::ContentTestLauncherDelegate launcher_delegate;
return test_launcher::LaunchTests(&launcher_delegate, argc, argv);
}