diff options
author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-03 01:21:42 +0000 |
---|---|---|
committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-03 01:21:42 +0000 |
commit | 30c4b07218ac5282337a7f9c6c9c2b03fd58da06 (patch) | |
tree | 96f6b5068c3bf0db49be453bda19c351b0048621 /chrome_elf | |
parent | 90f854a139ff498358d064aa3c823f704454e6de (diff) | |
download | chromium_src-30c4b07218ac5282337a7f9c6c9c2b03fd58da06.zip chromium_src-30c4b07218ac5282337a7f9c6c9c2b03fd58da06.tar.gz chromium_src-30c4b07218ac5282337a7f9c6c9c2b03fd58da06.tar.bz2 |
Revert 242834 "Add tests to make sure ChromeELF.dll imports are ..."
It fails on Win 7 Tests x64 (2) bot.
> Add tests to make sure ChromeELF.dll imports are correct:
>
> 1. Make sure chrome_elf.dll imports nothing besides kernel32 and some
> msvc libs (DEBUG builds)
> 2. make sure chrome_elf.dll is always the first entry in chrome.exe's
> import table.
>
> Review URL: https://codereview.chromium.org/109483003
TBR=caitkp@chromium.org
Review URL: https://codereview.chromium.org/123583004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242852 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_elf')
-rw-r--r-- | chrome_elf/chrome_elf.gyp | 1 | ||||
-rw-r--r-- | chrome_elf/elf_imports_unittest.cc | 94 |
2 files changed, 0 insertions, 95 deletions
diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp index 60b4186d..7227fe6 100644 --- a/chrome_elf/chrome_elf.gyp +++ b/chrome_elf/chrome_elf.gyp @@ -45,7 +45,6 @@ 'type': 'executable', 'sources': [ 'blacklist/test/blacklist_test.cc', - 'elf_imports_unittest.cc', 'ntdll_cache_unittest.cc', ], 'include_dirs': [ diff --git a/chrome_elf/elf_imports_unittest.cc b/chrome_elf/elf_imports_unittest.cc deleted file mode 100644 index bf3c031..0000000 --- a/chrome_elf/elf_imports_unittest.cc +++ /dev/null @@ -1,94 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include <stdint.h> -#include <windows.h> - -#include <algorithm> -#include <vector> - -#include "base/base_paths.h" -#include "base/basictypes.h" -#include "base/compiler_specific.h" -#include "base/files/file_path.h" -#include "base/files/memory_mapped_file.h" -#include "base/path_service.h" -#include "base/strings/string_util.h" -#include "base/win/pe_image.h" -#include "testing/gtest/include/gtest/gtest.h" - -namespace { - -class ELFImportsTest : public testing::Test { - protected: - static bool ImportsCallback(const base::win::PEImage &image, - LPCSTR module, - PIMAGE_THUNK_DATA name_table, - PIMAGE_THUNK_DATA iat, - PVOID cookie) { - std::vector<std::string>* import_list = - reinterpret_cast<std::vector<std::string>*>(cookie); - import_list->push_back(module); - return true; - } - - void GetImports(const base::FilePath& module_path, - std::vector<std::string>* imports) { - - ASSERT_TRUE(imports != NULL); - - base::MemoryMappedFile module_mmap; - - ASSERT_TRUE(module_mmap.Initialize(module_path)); - base::win::PEImageAsData pe_image_data( - reinterpret_cast<HMODULE>(const_cast<uint8*>(module_mmap.data()))); - pe_image_data.EnumImportChunks(ELFImportsTest::ImportsCallback, imports); - } -}; - -TEST_F(ELFImportsTest, ChromeElfSanityCheck) { - std::vector<std::string> elf_imports; - - base::FilePath dll; - ASSERT_TRUE(PathService::Get(base::DIR_EXE, &dll)); - dll = dll.Append(L"chrome_elf.dll"); - GetImports(dll, &elf_imports); - - // Check that ELF has imports. - ASSERT_LT(0u, elf_imports.size()); - - std::vector<std::string>::iterator it(elf_imports.begin()); - - static const char* const kValidFilePatterns[] = { - "KERNEL32.dll", - "MSVC*", - "ADVAPI32.dll"}; - - // Make sure all of ELF's imports are in the valid imports list. - for (; it != elf_imports.end(); it++) { - bool match = false; - for (int i = 0; i < arraysize(kValidFilePatterns); ++i) { - if (MatchPattern(*it, kValidFilePatterns[i])) - match = true; - } - ASSERT_TRUE(match) << "Illegal import in chrome_elf.dll."; - } -} - -TEST_F(ELFImportsTest, ChromeExeSanityCheck) { - std::vector<std::string> exe_imports; - - base::FilePath exe; - ASSERT_TRUE(PathService::Get(base::DIR_EXE, &exe)); - exe = exe.Append(L"chrome.exe"); - GetImports(exe, &exe_imports); - - // Check that chrome.exe has imports. - ASSERT_LT(0u, exe_imports.size()); - - // Chrome.exe's first import must be ELF. - EXPECT_EQ("chrome_elf.dll", exe_imports[0]); -} - -} // namespace |