Commit 8c1f5851 authored by Noel Gordon's avatar Noel Gordon Committed by Commit Bot

Re-enable SortColumns/FileManagerBrowserTest all bots

Enabled in RELEASE, now re-enable this test in DEBUG/MSAN/ASAN.

No-Presubmit: true
No-Try: true
Bug: 835626
Change-Id: I079d77a41435f188b2286460f0ee072f1ce6c87c
Reviewed-on: https://chromium-review.googlesource.com/1049185
Commit-Queue: Noel Gordon <noel@chromium.org>
Reviewed-by: default avatarStuart Langley <slangley@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556649}
parent 794a9220
...@@ -361,14 +361,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -361,14 +361,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestParameter(NOT_IN_GUEST_MODE, "traverseFolderShortcuts"), TestParameter(NOT_IN_GUEST_MODE, "traverseFolderShortcuts"),
TestParameter(NOT_IN_GUEST_MODE, "addRemoveFolderShortcuts"))); TestParameter(NOT_IN_GUEST_MODE, "addRemoveFolderShortcuts")));
// Fails on official build. http://crbug.com/429294
#if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
#define MAYBE_SortColumns DISABLED_SortColumns
#else
#define MAYBE_SortColumns SortColumns
#endif
WRAPPED_INSTANTIATE_TEST_CASE_P( WRAPPED_INSTANTIATE_TEST_CASE_P(
MAYBE_SortColumns, SortColumns,
FileManagerBrowserTest, FileManagerBrowserTest,
::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "sortColumns"), ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "sortColumns"),
TestParameter(IN_GUEST_MODE, "sortColumns"))); TestParameter(IN_GUEST_MODE, "sortColumns")));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment