Commit a4e4b94c authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot

Switch no_version_info.dll to a 32-bit DLL.

The 64-bit test DLL added in https://crrev.com/702886 does not work on
32-bit bots. Switch to a 32-bit DLL and re-enable
FileVersionInfoTest.NoVersionInfo on 32-bit bots.

Bug: 1011439
Change-Id: Ib7553b5455bdb0195bd8e36d9167d8c249242ae8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1842524
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: default avatarGreg Thompson <grt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703863}
parent 28430bf6
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include "base/path_service.h" #include "base/path_service.h"
#include "base/scoped_native_library.h" #include "base/scoped_native_library.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
using base::FilePath; using base::FilePath;
...@@ -158,9 +157,6 @@ TYPED_TEST(FileVersionInfoTest, CustomProperties) { ...@@ -158,9 +157,6 @@ TYPED_TEST(FileVersionInfoTest, CustomProperties) {
version_info_win->GetFileVersion()); version_info_win->GetFileVersion());
} }
#if defined(ARCH_CPU_64_BITS)
// TODO(bug_1011439): Change no_version_info.dll to 32 bit, so this test will
// work for 32-bit Windows as well.
TYPED_TEST(FileVersionInfoTest, NoVersionInfo) { TYPED_TEST(FileVersionInfoTest, NoVersionInfo) {
FilePath dll_path = GetTestDataPath(); FilePath dll_path = GetTestDataPath();
dll_path = dll_path.AppendASCII("no_version_info.dll"); dll_path = dll_path.AppendASCII("no_version_info.dll");
...@@ -168,4 +164,3 @@ TYPED_TEST(FileVersionInfoTest, NoVersionInfo) { ...@@ -168,4 +164,3 @@ TYPED_TEST(FileVersionInfoTest, NoVersionInfo) {
TypeParam factory(dll_path); TypeParam factory(dll_path);
ASSERT_FALSE(factory.Create()); ASSERT_FALSE(factory.Create());
} }
#endif
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