Skip to content

Commit

Permalink
[chrome_elf] blacklist flaky tests
Browse files Browse the repository at this point in the history
Possible flake fix.  Overriding chrome_elf test launch options.

BUG=711651
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.win:win10_chromium_x64_rel_ng

Review-Url: https://codereview.chromium.org/2861793003
Cr-Commit-Position: refs/heads/master@{#470086}
  • Loading branch information
pennymac authored and Commit bot committed May 8, 2017
1 parent a881b3e commit b1d0979
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions chrome_elf/blacklist/test/blacklist_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,7 @@ TEST_F(BlacklistTest, SuccessfullyBlocked) {
}
}

// Disabled due to flakiness. https://crbug.com/711651.
TEST_F(BlacklistTest, DISABLED_LoadBlacklistedLibrary) {
TEST_F(BlacklistTest, LoadBlacklistedLibrary) {
base::FilePath current_dir;
ASSERT_TRUE(PathService::Get(base::DIR_EXE, &current_dir));

Expand Down
4 changes: 2 additions & 2 deletions chrome_elf/run_all_unittests.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ int main(int argc, char** argv) {
install_static::ScopedInstallDetails scoped_install_details;

base::TestSuite test_suite(argc, argv);
int ret = base::LaunchUnitTests(
argc, argv,
int ret = base::LaunchUnitTestsWithOptions(
argc, argv, 1, 0, true, // Single process, no batching, default jobs.
base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
return ret;
}

0 comments on commit b1d0979

Please sign in to comment.