summaryrefslogtreecommitdiffstats
path: root/tools/xdisplaycheck
diff options
context:
space:
mode:
authorearthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-23 15:27:52 +0000
committerearthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-23 15:27:52 +0000
commitf00788c82a5fbf7348a61cf7871fad8977cae463 (patch)
tree2ebbf26208aa12848b657e87f5618f98a6cf70fb /tools/xdisplaycheck
parent55e3ffe1342f0cbd91520e620631efeaba63bdd8 (diff)
downloadchromium_src-f00788c82a5fbf7348a61cf7871fad8977cae463.zip
chromium_src-f00788c82a5fbf7348a61cf7871fad8977cae463.tar.gz
chromium_src-f00788c82a5fbf7348a61cf7871fad8977cae463.tar.bz2
Disable LeakSanitizer for xdisplaycheck.
Prevent memory leaks in xdisplaycheck from interfering with LSan bots. BUG=NONE R=glider@chromium.org Review URL: https://chromiumcodereview.appspot.com/19962006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/xdisplaycheck')
-rw-r--r--tools/xdisplaycheck/xdisplaycheck.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/xdisplaycheck/xdisplaycheck.cc b/tools/xdisplaycheck/xdisplaycheck.cc
index ea5fe1e..8c432d1 100644
--- a/tools/xdisplaycheck/xdisplaycheck.cc
+++ b/tools/xdisplaycheck/xdisplaycheck.cc
@@ -106,3 +106,10 @@ int main(int argc, char* argv[]) {
#endif
return 0;
}
+
+#if defined(LEAK_SANITIZER)
+// XOpenDisplay leaks memory if it takes more than one try to connect. This
+// causes LSan bots to fail. We don't care about memory leaks in xdisplaycheck
+// anyway, so just disable LSan completely.
+extern "C" int __lsan_is_turned_off() { return 1; }
+#endif