Disable Firefox password protected profile tests on Win64 build

Disable Firefox password protected profile tests on Win64 build

When reading a password protected profile, the importer loads
the NSS libraries for the currently installed Firefox. Since
those are 32-bit libraries, they fail in the Win64 build.

BUG=179688
R=isherman@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=185809

[jochen (gone - plz use gerrit), 2013-03-03 07:49:42]

lgtm
On Mar 3, 2013 6:58 AM, <jschuh@chromium.org> wrote:

> Reviewers: jochen, Ilya Sherman,
>
> Description:
> Disable Firefox password protected profile tests on Win64 build
>
> When reading a password protected profile, the importer loads
> the NSS libraries for the currently installed Firefox. Since
> those are 32-bit libraries, they fail in the Win64 build.
>
> BUG=179688
> R=isherman@chromium.org
>
> Please review this at
https://codereview.chromium.**org/12387071/<https://codereview.chromium.org/1...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src/<http://svn.chromium.org/chrome/trunk/src/>
>
> Affected files:
>   M     chrome/browser/importer/**firefox_importer_unittest.cc
>
>
> Index: chrome/browser/importer/**firefox_importer_unittest.cc
> ==============================**==============================**=======
> --- chrome/browser/importer/**firefox_importer_unittest.cc
>  (revision 185796)
> +++ chrome/browser/importer/**firefox_importer_unittest.cc
>  (working copy)
> @@ -28,12 +28,20 @@
>  #include "content/public/common/**password_form.h"
>
>  // TODO(estade): some of these are disabled on mac.
> http://crbug.com/48007
> -#if defined(OS_MACOSX)
> -#define MAYBE(x) DISABLED_##x
> +// TODO(jschuh): Disabled on Win64 build. http://crbug.com/179688
> +#if defined(OS_MACOSX) || (defined(OS_WIN) && defined(ARCH_CPU_X86_64))
> +#define MAYBE_IMPORTER(x) DISABLED_##x
>  #else
> -#define MAYBE(x) x
> +#define MAYBE_IMPORTER(x) x
>  #endif
>
> +// TODO(jschuh): Disabled on Win64 build. http://crbug.com/179688
> +#if defined(OS_WIN) && defined(ARCH_CPU_X86_64)
> +#define MAYBE_NSS(x) DISABLED_##x
> +#else
> +#define MAYBE_NSS(x) x
> +#endif
> +
>  namespace {
>
>  const BookmarkInfo kFirefox2Bookmarks[] = {
> @@ -428,7 +436,7 @@
>    base::FilePath app_path_;
>  };
>
> -TEST_F(**FirefoxProfileImporterTest, MAYBE(Firefox2Importer)) {
> +TEST_F(**FirefoxProfileImporterTest, MAYBE_IMPORTER(**Firefox2Importer))
> {
>    base::FilePath data_path;
>    ASSERT_TRUE(PathService::Get(**chrome::DIR_TEST_DATA, &data_path));
>    data_path = data_path.AppendASCII("**firefox2_profile");
> @@ -470,13 +478,13 @@
>    loop->Run();
>  }
>
> -TEST_F(**FirefoxProfileImporterTest, MAYBE(Firefox30Importer)) {
> +TEST_F(**FirefoxProfileImporterTest, MAYBE_IMPORTER(**Firefox30Importer))
> {
>    scoped_refptr<**Firefox3Observer> observer(new Firefox3Observer());
>    Firefox3xImporterTest("**firefox3_profile", observer.get(),
> observer.get(),
>                          true);
>  }
>
> -TEST_F(**FirefoxProfileImporterTest, MAYBE(Firefox35Importer)) {
> +TEST_F(**FirefoxProfileImporterTest, MAYBE_IMPORTER(**Firefox35Importer))
> {
>    bool import_search_engines = false;
>    scoped_refptr<**Firefox3Observer> observer(
>        new Firefox3Observer(import_**search_engines));
> @@ -487,7 +495,7 @@
>  // The following 2 tests require the use of the NSSDecryptor, on OSX this
> needs
>  // to run in a separate process, so we use a proxy object so we can share
> the
>  // same test between platforms.
> -TEST(FirefoxImporterTest, Firefox2NSS3Decryptor) {
> +TEST(FirefoxImporterTest, MAYBE_NSS(**Firefox2NSS3Decryptor)) {
>    base::FilePath nss_path;
>    ASSERT_TRUE(PathService::Get(**chrome::DIR_TEST_DATA, &nss_path));
>  #ifdef OS_MACOSX
> @@ -512,7 +520,7 @@
>                                "OQ5ZFmhb8BAiFo1Z+fUvaIQ=="));
>  }
>
> -TEST(FirefoxImporterTest, Firefox3NSS3Decryptor) {
> +TEST(FirefoxImporterTest, MAYBE_NSS(**Firefox3NSS3Decryptor)) {
>    base::FilePath nss_path;
>    ASSERT_TRUE(PathService::Get(**chrome::DIR_TEST_DATA, &nss_path));
>  #ifdef OS_MACOSX
>
>
>

[commit-bot: I haz the power, 2013-03-03 14:14:04]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jschuh@chromium.org/12387071/1

[commit-bot: I haz the power, 2013-03-03 15:27:53]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win_rel.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-03-03 15:36:57]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jschuh@chromium.org/12387071/1

[jschuh, 2013-03-03 16:27:11]

Committed patchset #1 manually as r185809 (presubmit successful).