diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-05 21:14:52 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-05 21:14:52 +0000 |
| commit | d2d9351b24a93bbc9ed4d75247a37a2e0ce9bf67 (patch) | |
| tree | 1815224f425e977d10f352a98de578763e80f861 | |
| parent | d23334c8777ddb3d9369c9c968fb8edcd95d6259 (diff) | |
| download | chromium_src-d2d9351b24a93bbc9ed4d75247a37a2e0ce9bf67.zip chromium_src-d2d9351b24a93bbc9ed4d75247a37a2e0ce9bf67.tar.gz chromium_src-d2d9351b24a93bbc9ed4d75247a37a2e0ce9bf67.tar.bz2 | |
linux_aura: Turn aura on on the builders.
This widens some suppressions from windows to linux, and suppresses some memory errors in third party libraries that we now use.
BUG=125106,303342
R=cpu@chromium.org, mseaborn@chromium.org
Review URL: https://codereview.chromium.org/25120002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227210 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 8 | ||||
| -rw-r--r-- | ppapi/native_client/tests/breakpad_crash_test/nacl.scons | 12 | ||||
| -rw-r--r-- | tools/lsan/suppressions.txt | 3 |
3 files changed, 22 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 4487b19..94a417b 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -75,6 +75,14 @@ 'use_aura%': 1, }], + # ToT Linux should be aura. + # + # TODO(erg): Merge this into the previous block once compiling with + # aura safely implies including ash capabilities. + ['OS=="linux"', { + 'use_aura%': 1, + }], + # Whether we're a traditional desktop unix. ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and chromeos==0', { 'desktop_linux%': 1, diff --git a/ppapi/native_client/tests/breakpad_crash_test/nacl.scons b/ppapi/native_client/tests/breakpad_crash_test/nacl.scons index f3ce99a..6490072 100644 --- a/ppapi/native_client/tests/breakpad_crash_test/nacl.scons +++ b/ppapi/native_client/tests/breakpad_crash_test/nacl.scons @@ -83,8 +83,13 @@ env.AddNodeToTestSuite( node, ['chrome_browser_tests'], 'run_breakpad_crash_in_syscall_test', # This test is currently flaky on Win 32 bit on x86, disabling there. # See bug: https://code.google.com/p/chromium/issues/detail?id=254583 + # + # These tests are also disabled on linux_aura, pending debugging of why the + # GPU process crashes. piman@ thinks it may be a simple flags issue. + # See bug: https://code.google.com/p/chromium/issues/detail?id=303342 is_broken=env.PPAPIBrowserTesterIsBroken() or env.Bit('running_on_valgrind') or + env.Bit('host_linux') or (env.Bit('host_windows') and env.Bit('build_x86_32'))) # Crashes in untrusted code should not produce crash dumps. @@ -98,5 +103,10 @@ node = env.PPAPIBrowserTester( args=platform_args + ['--expected_crash_dumps=0']) env.AddNodeToTestSuite( node, ['chrome_browser_tests'], 'run_breakpad_untrusted_crash_test', + # This currently reliably fails in linux_aura configurations, probably for + # the same reasons that the previous test fails. + # + # See bug: https://code.google.com/p/chromium/issues/detail?id=303342 is_broken=env.PPAPIBrowserTesterIsBroken() or - env.Bit('running_on_valgrind')) + env.Bit('running_on_valgrind') or + env.Bit('host_linux')) diff --git a/tools/lsan/suppressions.txt b/tools/lsan/suppressions.txt index d38d981..cc6c360 100644 --- a/tools/lsan/suppressions.txt +++ b/tools/lsan/suppressions.txt @@ -24,6 +24,9 @@ leak:crypto::ScopedTestNSSDB::ScopedTestNSSDB # Another leak due to not shutting down NSS properly. http://crbug.com/124445 leak:error_get_my_stack +# XRandR has several one time leaks. +leak:libxrandr + # The NSS suppressions above will not fire when the fast stack unwinder is used, # because it can't unwind through NSS libraries. Apply blanket supressions for now. leak:libnssutil3 |