diff options
| -rw-r--r-- | build/common.gypi | 8 | ||||
| -rw-r--r-- | chrome/installer/linux/debian/expected_deps | 7 | ||||
| -rw-r--r-- | chrome/installer/linux/rpm/expected_deps_i386 | 4 | ||||
| -rw-r--r-- | chrome/installer/linux/rpm/expected_deps_x86_64 | 4 | ||||
| -rw-r--r-- | ppapi/native_client/tests/breakpad_crash_test/nacl.scons | 7 | ||||
| -rw-r--r-- | tools/lsan/suppressions.txt | 3 |
6 files changed, 27 insertions, 6 deletions
diff --git a/build/common.gypi b/build/common.gypi index a990064..160e3db 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -84,6 +84,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/chrome/installer/linux/debian/expected_deps b/chrome/installer/linux/debian/expected_deps index bc68f7d..ffe7ef2 100644 --- a/chrome/installer/linux/debian/expected_deps +++ b/chrome/installer/linux/debian/expected_deps @@ -1,6 +1,5 @@ gconf-service libasound2 (>= 1.0.23) -libatk1.0-0 (>= 1.12.4) libc6 (>= 2.11) libcairo2 (>= 1.6.0) libcap2 (>= 2.10) @@ -13,7 +12,7 @@ libgcc1 (>= 1:4.1.1) libgconf-2-4 (>= 2.31.1) libgcrypt11 (>= 1.4.5) libgdk-pixbuf2.0-0 (>= 2.22.0) -libglib2.0-0 (>= 2.18.0) +libglib2.0-0 (>= 2.26.0) libgtk2.0-0 (>= 2.24.0) libnspr4 (>= 1.8.0.10) libnss3 (>= 3.14.3) @@ -22,10 +21,12 @@ libstdc++6 (>= 4.6) libudev0 (>= 147) libx11-6 (>= 2:1.4.99.1) libxcomposite1 (>= 1:0.3-1) +libxcursor1 (>> 1.1.2) libxdamage1 (>= 1:1.1) libxext6 -libxfixes3 +libxfixes3 (>= 1:5.0) libxi6 (>= 2:1.2.99.4) +libxrandr2 (>= 2:1.2.99.2) libxrender1 libxss1 libxtst6 diff --git a/chrome/installer/linux/rpm/expected_deps_i386 b/chrome/installer/linux/rpm/expected_deps_i386 index 86a1f51..52fd504 100644 --- a/chrome/installer/linux/rpm/expected_deps_i386 +++ b/chrome/installer/linux/rpm/expected_deps_i386 @@ -2,7 +2,6 @@ ld-linux.so.2 ld-linux.so.2(GLIBC_2.1) ld-linux.so.2(GLIBC_2.3) libasound.so.2 -libatk-1.0.so.0 libcairo.so.2 libcap.so.2 libc.so.6 @@ -36,6 +35,7 @@ libgconf-2.so.4 libgcrypt.so.11 libgdk_pixbuf-2.0.so.0 libgdk-x11-2.0.so.0 +libgio-2.0.so.0 libglib-2.0.so.0 libgobject-2.0.so.0 libgtk-x11-2.0.so.0 @@ -67,10 +67,12 @@ libstdc++.so.6(GLIBCXX_3.4.5) libstdc++.so.6(GLIBCXX_3.4.9) libX11.so.6 libXcomposite.so.1 +libXcursor.so.1 libXdamage.so.1 libXext.so.6 libXfixes.so.3 libXi.so.6 +libXrandr.so.2 libXrender.so.1 libXss.so.1 libXtst.so.6 diff --git a/chrome/installer/linux/rpm/expected_deps_x86_64 b/chrome/installer/linux/rpm/expected_deps_x86_64 index 5fd2f01..1435e39 100644 --- a/chrome/installer/linux/rpm/expected_deps_x86_64 +++ b/chrome/installer/linux/rpm/expected_deps_x86_64 @@ -2,7 +2,6 @@ ld-linux-x86-64.so.2()(64bit) ld-linux-x86-64.so.2(GLIBC_2.2.5)(64bit) ld-linux-x86-64.so.2(GLIBC_2.3)(64bit) libasound.so.2()(64bit) -libatk-1.0.so.0()(64bit) libcairo.so.2()(64bit) libcap.so.2()(64bit) libc.so.6()(64bit) @@ -30,6 +29,7 @@ libgconf-2.so.4()(64bit) libgcrypt.so.11()(64bit) libgdk_pixbuf-2.0.so.0()(64bit) libgdk-x11-2.0.so.0()(64bit) +libgio-2.0.so.0()(64bit) libglib-2.0.so.0()(64bit) libgobject-2.0.so.0()(64bit) libgtk-x11-2.0.so.0()(64bit) @@ -57,10 +57,12 @@ libstdc++.so.6(GLIBCXX_3.4)(64bit) libstdc++.so.6(GLIBCXX_3.4.9)(64bit) libX11.so.6()(64bit) libXcomposite.so.1()(64bit) +libXcursor.so.1()(64bit) libXdamage.so.1()(64bit) libXext.so.6()(64bit) libXfixes.so.3()(64bit) libXi.so.6()(64bit) +libXrandr.so.2()(64bit) libXrender.so.1()(64bit) libXss.so.1()(64bit) libXtst.so.6()(64bit) diff --git a/ppapi/native_client/tests/breakpad_crash_test/nacl.scons b/ppapi/native_client/tests/breakpad_crash_test/nacl.scons index 308e888..a6bfd1c 100644 --- a/ppapi/native_client/tests/breakpad_crash_test/nacl.scons +++ b/ppapi/native_client/tests/breakpad_crash_test/nacl.scons @@ -99,5 +99,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 d521729..a3902fc8 100644 --- a/tools/lsan/suppressions.txt +++ b/tools/lsan/suppressions.txt @@ -37,6 +37,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 suppressions for # now. |