Commit d690157e authored by pshenoy@chromium.org's avatar pshenoy@chromium.org

Disable...

Disable FirstRunMasterPrefsWithTrackedPreferences.TrackedPreferencesSurviveFirstRun on Linux on official builder.
See below issues for details.
http://crbug.com/342427
http://crbug.com/314221

BUG=342427,314221

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251526 0039d316-1c4b-4281-b951-d872f2087c98
parent 9650db67
......@@ -165,7 +165,7 @@ extern const char kImportDefault[] =
typedef FirstRunMasterPrefsBrowserTestT<kImportDefault>
FirstRunMasterPrefsImportDefault;
// http://crbug.com/314221
#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX)
#if defined(GOOGLE_CHROME_BUILD) && (defined(OS_MACOSX) || defined(OS_LINUX))
#define MAYBE_ImportDefault DISABLED_ImportDefault
#else
#define MAYBE_ImportDefault ImportDefault
......@@ -188,7 +188,7 @@ extern const char kImportBookmarksFile[] =
typedef FirstRunMasterPrefsBrowserTestT<kImportBookmarksFile>
FirstRunMasterPrefsImportBookmarksFile;
// http://crbug.com/314221
#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX)
#if defined(GOOGLE_CHROME_BUILD) && (defined(OS_MACOSX) || defined(OS_LINUX))
#define MAYBE_ImportBookmarksFile DISABLED_ImportBookmarksFile
#else
#define MAYBE_ImportBookmarksFile ImportBookmarksFile
......@@ -218,7 +218,7 @@ extern const char kImportNothing[] =
typedef FirstRunMasterPrefsBrowserTestT<kImportNothing>
FirstRunMasterPrefsImportNothing;
// http://crbug.com/314221
#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX)
#if defined(GOOGLE_CHROME_BUILD) && (defined(OS_MACOSX) || defined(OS_LINUX))
#define MAYBE_ImportNothingAndShowNewTabPage \
DISABLED_ImportNothingAndShowNewTabPage
#else
......@@ -257,7 +257,7 @@ class FirstRunMasterPrefsWithTrackedPreferences
};
// http://crbug.com/314221
#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX)
#if defined(GOOGLE_CHROME_BUILD) && (defined(OS_MACOSX) || defined(OS_LINUX))
#define MAYBE_TrackedPreferencesSurviveFirstRun \
DISABLED_TrackedPreferencesSurviveFirstRun
#else
......
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