diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-22 19:14:37 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-22 19:14:37 +0000 |
| commit | 720cedab7dd4555d1d0eba2982e17cac751fb571 (patch) | |
| tree | 4cbfa9f769fb2b3fd58a0e70081a080ee7c7f791 /content | |
| parent | 0e7b1a458748c84fe06fc74f21730369306256a5 (diff) | |
| download | chromium_src-720cedab7dd4555d1d0eba2982e17cac751fb571.zip chromium_src-720cedab7dd4555d1d0eba2982e17cac751fb571.tar.gz chromium_src-720cedab7dd4555d1d0eba2982e17cac751fb571.tar.bz2 | |
GTTF: Add a basic new unit test launcher.
It launches batches of unit tests in a subprocess for better stability.
BUG=236893
R=maruel@chromium.org, satorux@chromium.org
Review URL: https://codereview.chromium.org/23132002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219065 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/content_browser.gypi | 2 | ||||
| -rw-r--r-- | content/public/test/test_launcher.cc | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/content/content_browser.gypi b/content/content_browser.gypi index d1afb07..49e7987 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -12,7 +12,7 @@ '../skia/skia.gyp:skia', '../sql/sql.gyp:sql', '../third_party/re2/re2.gyp:re2', - '../third_party/zlib/zlib.gyp:zip', + '../third_party/zlib/google/zip.gyp:zip', '../third_party/zlib/zlib.gyp:zlib', '../ui/snapshot/snapshot.gyp:snapshot', '../ui/ui.gyp:ui', diff --git a/content/public/test/test_launcher.cc b/content/public/test/test_launcher.cc index 0c3e355..c29a239 100644 --- a/content/public/test/test_launcher.cc +++ b/content/public/test/test_launcher.cc @@ -86,7 +86,17 @@ int DoRunTestInternal(const testing::TestCase* test_case, } } - CommandLine new_cmd_line(command_line); + CommandLine new_cmd_line(command_line.GetProgram()); + CommandLine::SwitchMap switches = command_line.GetSwitches(); + + // Strip out gtest_output flag because otherwise we would overwrite results + // of the other tests. + switches.erase(base::kGTestOutputFlag); + + for (CommandLine::SwitchMap::const_iterator iter = switches.begin(); + iter != switches.end(); ++iter) { + new_cmd_line.AppendSwitchNative(iter->first, iter->second); + } // Always enable disabled tests. This method is not called with disabled // tests unless this flag was specified to the browser test executable. |