diff options
| -rw-r--r-- | chrome/common/sandbox_mac_unittest_helper.h | 10 | ||||
| -rw-r--r-- | chrome/test/data/valgrind/unit_tests.gtest_mac.txt | 2 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions_mac.txt | 40 |
3 files changed, 6 insertions, 46 deletions
diff --git a/chrome/common/sandbox_mac_unittest_helper.h b/chrome/common/sandbox_mac_unittest_helper.h index 3edb7c4..3006576 100644 --- a/chrome/common/sandbox_mac_unittest_helper.h +++ b/chrome/common/sandbox_mac_unittest_helper.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_SANDBOX_MAC_UNITTEST_RUNNER_H_ -#define CHROME_COMMON_SANDBOX_MAC_UNITTEST_RUNNER_H_ +#ifndef CHROME_COMMON_SANDBOX_MAC_UNITTEST_HELPER_H_ +#define CHROME_COMMON_SANDBOX_MAC_UNITTEST_HELPER_H_ #pragma once #include "base/multiprocess_test.h" @@ -15,12 +15,12 @@ namespace sandboxtest { // // How to write a sandboxed test: // 1. Create a class that inherits from MacSandboxTestCase and overrides -// it's functions to run code before or after the sandbox is initialised in a +// its functions to run code before or after the sandbox is initialised in a // subprocess. // 2. Register the class you just created with the REGISTER_SANDBOX_TEST_CASE() // macro. // 3. Write a test [using TEST_F()] that inherits from MacSandboxTest and call -// one of it's helper functions to launch the test. +// one of its helper functions to launch the test. // // Example: // class TestCaseThatRunsInSandboxedSubprocess : @@ -114,4 +114,4 @@ template <class T> struct RegisterSandboxTest { } // namespace sandboxtest -#endif // CHROME_COMMON_SANDBOX_MAC_UNITTEST_RUNNER_H_ +#endif // CHROME_COMMON_SANDBOX_MAC_UNITTEST_HELPER_H_ diff --git a/chrome/test/data/valgrind/unit_tests.gtest_mac.txt b/chrome/test/data/valgrind/unit_tests.gtest_mac.txt index a013c37..caace66 100644 --- a/chrome/test/data/valgrind/unit_tests.gtest_mac.txt +++ b/chrome/test/data/valgrind/unit_tests.gtest_mac.txt @@ -34,5 +34,3 @@ RenderViewTest.OnPrintPages RenderViewTest.Print* # See http://crbug.com/30397. TabStripControllerTest.AddRemoveTabs -# See http://crbug.com/30398. -TaskManagerWindowControllerTest.* diff --git a/tools/valgrind/memcheck/suppressions_mac.txt b/tools/valgrind/memcheck/suppressions_mac.txt index 65b2c2b..5480270 100644 --- a/tools/valgrind/memcheck/suppressions_mac.txt +++ b/tools/valgrind/memcheck/suppressions_mac.txt @@ -212,51 +212,13 @@ Mac_Sandbox_Intentional_Leak1 Memcheck:Leak fun:_Znw* - fun:_ZN11sandboxtest8internal19RegisterSandboxTestIN12_GLOBAL__N_*MacSandboxed*TestCaseEEC2EPKc - fun:_ZN11sandboxtest8internal19RegisterSandboxTestIN12_GLOBAL__N_*MacSandboxed*TestCaseEEC1EPKc + fun:_ZN11sandboxtest8internal19RegisterSandboxTestIN12_GLOBAL__N_* fun:_Z41__static_initialization_and_destruction_0ii fun:_GLOBAL__I__ZNSt3tr112_GLOBAL__N_16ignoreE fun:_ZN16ImageLoaderMachO18doModInitFunctionsERKN11ImageLoader11LinkContextE fun:_ZN11ImageLoader23recursiveInitializationERKNS_11LinkContextEj fun:_ZN11ImageLoader15runInitializersERKNS_11LinkContextE fun:_ZN4dyld24initializeMainExecutableEv - fun:_ZN4dyld5_mainEPK11mach_headermiPPKcS5_S5_ - fun:_ZN13dyldbootstrap5startEPK11mach_headeriPPKcl - fun:_dyld_start - obj:* -} -{ - Mac_Sandbox_Intentional_Leak2 - Memcheck:Leak - fun:_Znw* - fun:_ZN11sandboxtest8internal19RegisterSandboxTestIN12_GLOBAL__N_119FontLoadingTestCaseEEC2EPKc - fun:_ZN11sandboxtest8internal19RegisterSandboxTestIN12_GLOBAL__N_119FontLoadingTestCaseEEC1EPKc - fun:_Z41__static_initialization_and_destruction_0ii - fun:_GLOBAL__I__ZNSt3tr112_GLOBAL__N_16ignoreE - fun:_ZN16ImageLoaderMachO18doModInitFunctionsERKN11ImageLoader11LinkContextE - fun:_ZN11ImageLoader23recursiveInitializationERKNS_11LinkContextEj - fun:_ZN11ImageLoader15runInitializersERKNS_11LinkContextE - fun:_ZN4dyld24initializeMainExecutableEv - fun:_ZN4dyld5_mainEPK11mach_headermiPPKcS5_S5_ - fun:_ZN13dyldbootstrap5startEPK11mach_headeriPPKcl - fun:_dyld_start - obj:* -} -{ - # With our tweaks to get Chromium to link on Mac 10.5, we sometimes get - # this suppression instead. - Mac_Sandbox_Intentional_Leak3 - Memcheck:Leak - fun:_Znw* - fun:_Z41__static_initialization_and_destruction_0ii - fun:_ZN16ImageLoaderMachO18doModInitFunctionsERKN11ImageLoader11LinkContextE - fun:_ZN11ImageLoader23recursiveInitializationERKNS_11LinkContextEj - fun:_ZN11ImageLoader15runInitializersERKNS_11LinkContextE - fun:_ZN4dyld24initializeMainExecutableEv - fun:_ZN4dyld5_mainEPK11mach_headermiPPKcS5_S5_ - fun:_ZN13dyldbootstrap5startEPK11mach_headeriPPKcl - fun:_dyld_start - obj:* } { # jrg thinks this is probably a bug in Cocoa but is harmless. We |