Skip to content

Commit

Permalink
Make GN unit tests single process.
Browse files Browse the repository at this point in the history
Clean up gin run all unittests file. I noticed some extra includes while searching for some code to copy.

BUG=
R=jochen@chromium.org

Review URL: https://codereview.chromium.org/318543002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274850 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
brettw@chromium.org committed Jun 4, 2014
1 parent 2153dfc commit 98756e2
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 5 deletions.
3 changes: 0 additions & 3 deletions gin/test/run_all_unittests.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "base/basictypes.h"
#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"

Expand Down
2 changes: 1 addition & 1 deletion tools/gn/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ test("gn_unittests") {
"parser_unittest.cc",
"path_output_unittest.cc",
"pattern_unittest.cc",
"run_all_unittests.cc",
"scope_per_file_provider_unittest.cc",
"scope_unittest.cc",
"source_dir_unittest.cc",
Expand All @@ -215,7 +216,6 @@ test("gn_unittests") {
]
deps = [
":gn_lib",
"//base/test:run_all_unittests",
"//base/test:test_support",
"//testing/gtest",
]
Expand Down
2 changes: 1 addition & 1 deletion tools/gn/gn.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@
'parser_unittest.cc',
'path_output_unittest.cc',
'pattern_unittest.cc',
'run_all_unittests.cc',
'scope_per_file_provider_unittest.cc',
'scope_unittest.cc',
'source_dir_unittest.cc',
Expand All @@ -215,7 +216,6 @@
],
'dependencies': [
'gn_lib',
'../../base/base.gyp:run_all_unittests',
'../../base/base.gyp:test_support_base',
'../../testing/gtest.gyp:gtest',
],
Expand Down
13 changes: 13 additions & 0 deletions tools/gn/run_all_unittests.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// Copyright 2014 The Chromium Authors. All rights reserved.
// 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/test_suite.h"

// Don't use the multiprocess test harness. This test suite is fast enough and
// it makes the output more difficult to read.
int main(int argc, char** argv) {
base::TestSuite test_suite(argc, argv);
return test_suite.Run();
}

0 comments on commit 98756e2

Please sign in to comment.