OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
jamesr
2014/01/08 18:42:21
do you need to change this? if so, why change it t
Paweł Hajdan Jr.
2014/01/14 21:37:53
git detects this as a copy. Changed to 2014.
| |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/test/launcher/unit_test_launcher.h" | 7 #include "base/test/launcher/unit_test_launcher.h" |
8 #include "base/test/test_suite.h" | 8 #include "base/test/test_suite.h" |
9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
10 #include "media/base/media.h" | 10 #include "media/base/media.h" |
11 #include "media/base/media_switches.h" | 11 #include "media/base/media_switches.h" |
(...skipping 27 matching lines...) Expand all Loading... | |
39 // Run this here instead of main() to ensure an AtExitManager is already | 39 // Run this here instead of main() to ensure an AtExitManager is already |
40 // present. | 40 // present. |
41 media::InitializeMediaLibraryForTesting(); | 41 media::InitializeMediaLibraryForTesting(); |
42 CommandLine* cmd_line = CommandLine::ForCurrentProcess(); | 42 CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
43 cmd_line->AppendSwitch(switches::kEnableMP3StreamParser); | 43 cmd_line->AppendSwitch(switches::kEnableMP3StreamParser); |
44 } | 44 } |
45 | 45 |
46 int main(int argc, char** argv) { | 46 int main(int argc, char** argv) { |
47 TestSuiteNoAtExit test_suite(argc, argv); | 47 TestSuiteNoAtExit test_suite(argc, argv); |
48 | 48 |
49 return base::LaunchUnitTests( | 49 // Always run the perf tests serially, to avoid distorting |
50 // perf measurements with randomness resulting from running | |
51 // in parallel. | |
52 return base::LaunchUnitTestsSerially( | |
50 argc, argv, base::Bind(&TestSuiteNoAtExit::Run, | 53 argc, argv, base::Bind(&TestSuiteNoAtExit::Run, |
51 base::Unretained(&test_suite))); | 54 base::Unretained(&test_suite))); |
52 } | 55 } |
OLD | NEW |