summaryrefslogtreecommitdiffstats
path: root/content/test
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-14 21:40:53 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-14 21:40:53 +0000
commitc3b2455b69cf03fcf3c266ab9abcbf0083b67041 (patch)
tree3ef8c78ff8f1a6c0ea539f00132cecd388b0e064 /content/test
parent89c7d525496f23cfff48b816efc05a4122398202 (diff)
downloadchromium_src-c3b2455b69cf03fcf3c266ab9abcbf0083b67041.zip
chromium_src-c3b2455b69cf03fcf3c266ab9abcbf0083b67041.tar.gz
chromium_src-c3b2455b69cf03fcf3c266ab9abcbf0083b67041.tar.bz2
GTTF: Run perf tests serially
This makes media_perftests run serially (see https://codereview.chromium.org/112633009). Also update other perf tests (initially changed by https://codereview.chromium.org/47023009/ and https://codereview.chromium.org/52443004) now that we have LaunchUnitTestsSerially (for consistency). BUG=236893 R=dalecurtis@chromium.org, jamesr@chromium.org, piman@chromium.org Review URL: https://codereview.chromium.org/128593002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244806 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test')
-rw-r--r--content/test/run_all_perftests.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/content/test/run_all_perftests.cc b/content/test/run_all_perftests.cc
index d3d1d3a..77aa196 100644
--- a/content/test/run_all_perftests.cc
+++ b/content/test/run_all_perftests.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/bind.h"
+#include "base/test/launcher/unit_test_launcher.h"
#include "content/public/test/unittest_test_suite.h"
#include "content/test/content_test_suite.h"
@@ -12,5 +14,7 @@ int main(int argc, char** argv) {
// Always run the perf tests serially, to avoid distorting
// perf measurements with randomness resulting from running
// in parallel.
- return test_suite.Run();
+ return base::LaunchUnitTestsSerially(
+ argc, argv, base::Bind(&content::UnitTestTestSuite::Run,
+ base::Unretained(&test_suite)));
}