summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-17 06:06:49 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-17 06:06:49 +0000
commit8c79522ab1f67b3507d0ce3e57cc9a30bd0d58a1 (patch)
tree04bd18053a8224c5d5612a42eb2e7e65c60712d8
parent2578ea19416877dae3e7bad365f3b885434cace4 (diff)
downloadchromium_src-8c79522ab1f67b3507d0ce3e57cc9a30bd0d58a1.zip
chromium_src-8c79522ab1f67b3507d0ce3e57cc9a30bd0d58a1.tar.gz
chromium_src-8c79522ab1f67b3507d0ce3e57cc9a30bd0d58a1.tar.bz2
Revert of Reenable linux_aura on the main builders. (https://codereview.chromium.org/136813004/)
Reason for revert: Failed due to mysterious failures on the Google Chrome Linux bot. Example: FAILED: cd ../../chrome; flock -- /tmp/linux_package_lock bash ../out/Release/installer/debian/build.sh -o../out/Release -b ../out/Release -a ia32 -c stable Staging common install files in '/tmp/deb.build.AEvway'... eu-strip: while computing checksum for debug information: Invalid argument Cleaning... BUG=335451 Original issue's description: > Reenable linux_aura on the main builders. > > We fixed the browser test slowdown that lead to linux_aura being > disabled in r235280. (Different test suites are faster or slower, but > overall, tests run faster.) > > We are turning this on primarily to get perf data; if things look > acceptable, we hope to cut a dev channel this week. > > BUG=319075,125106,303342,318961 > NOTRY=True > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=245415 TBR= NOTREECHECKS=true NOTRY=true BUG=319075,125106,303342,318961 Review URL: https://codereview.chromium.org/140823008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat
-rw-r--r--build/common.gypi8
-rw-r--r--chrome/installer/linux/debian/expected_deps7
-rw-r--r--chrome/installer/linux/rpm/expected_deps_i3864
-rw-r--r--chrome/installer/linux/rpm/expected_deps_x86_644
-rw-r--r--ppapi/native_client/tests/breakpad_crash_test/nacl.scons7
-rw-r--r--tools/lsan/suppressions.txt3
6 files changed, 6 insertions, 27 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 6ca4445..98cd460 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -84,14 +84,6 @@
'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 ffe7ef2..bc68f7d 100644
--- a/chrome/installer/linux/debian/expected_deps
+++ b/chrome/installer/linux/debian/expected_deps
@@ -1,5 +1,6 @@
gconf-service
libasound2 (>= 1.0.23)
+libatk1.0-0 (>= 1.12.4)
libc6 (>= 2.11)
libcairo2 (>= 1.6.0)
libcap2 (>= 2.10)
@@ -12,7 +13,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.26.0)
+libglib2.0-0 (>= 2.18.0)
libgtk2.0-0 (>= 2.24.0)
libnspr4 (>= 1.8.0.10)
libnss3 (>= 3.14.3)
@@ -21,12 +22,10 @@ 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 (>= 1:5.0)
+libxfixes3
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 09dee3e..bc46021 100644
--- a/chrome/installer/linux/rpm/expected_deps_i386
+++ b/chrome/installer/linux/rpm/expected_deps_i386
@@ -1,6 +1,7 @@
ld-linux.so.2
ld-linux.so.2(GLIBC_2.3)
libasound.so.2
+libatk-1.0.so.0
libcairo.so.2
libcap.so.2
libc.so.6
@@ -34,7 +35,6 @@ 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
@@ -65,12 +65,10 @@ 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 d88f5f2..e25b53c 100644
--- a/chrome/installer/linux/rpm/expected_deps_x86_64
+++ b/chrome/installer/linux/rpm/expected_deps_x86_64
@@ -1,6 +1,7 @@
ld-linux-x86-64.so.2()(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)
@@ -28,7 +29,6 @@ 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)
@@ -56,12 +56,10 @@ 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 a6bfd1c..308e888 100644
--- a/ppapi/native_client/tests/breakpad_crash_test/nacl.scons
+++ b/ppapi/native_client/tests/breakpad_crash_test/nacl.scons
@@ -99,10 +99,5 @@ 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') or
- env.Bit('host_linux'))
+ env.Bit('running_on_valgrind'))
diff --git a/tools/lsan/suppressions.txt b/tools/lsan/suppressions.txt
index a3902fc8..d521729 100644
--- a/tools/lsan/suppressions.txt
+++ b/tools/lsan/suppressions.txt
@@ -37,9 +37,6 @@ 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.
generated by cgit v1.1 at 2025-03-07 11:35:01 +0000