Delete lsan and valgrind suppressions for deleted xmpp tests
The xmpp code has been moved to chromium, see https://codereview.webrtc.org/2617443003. Also delete valgrind-related presubmit checks; they were broken when chromium dropped support for valgrind. Bug: webrtc:3608, webrtc:5539 Tbr: phoglund@webrtc.org Change-Id: I8c1883cfd3ba29b106b75605851cdfedf7c161bd Reviewed-on: https://webrtc-review.googlesource.com/90407 Commit-Queue: Niels Moller <nisse@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24123}
This commit is contained in:
@ -6,8 +6,6 @@
|
||||
# in the file PATENTS. All contributing project authors may
|
||||
# be found in the AUTHORS file in the root of the source tree.
|
||||
|
||||
import os
|
||||
|
||||
|
||||
def _LicenseHeader(input_api):
|
||||
"""Returns the license header regexp."""
|
||||
@ -30,34 +28,11 @@ def _LicenseHeader(input_api):
|
||||
}
|
||||
return license_header
|
||||
|
||||
def _CheckValgrindFiles(input_api, output_api):
|
||||
"""Check that valgrind-webrtc.gni contains all existing files."""
|
||||
valgrind_dir = os.path.join('tools_webrtc', 'valgrind')
|
||||
with open(os.path.join('valgrind', 'valgrind-webrtc.gni')) as f:
|
||||
valgrind_webrtc = f.read()
|
||||
|
||||
results = []
|
||||
for f in input_api.AffectedFiles():
|
||||
f = f.LocalPath()
|
||||
if (f.startswith(valgrind_dir)
|
||||
and f not in valgrind_webrtc
|
||||
and not f.endswith('valgrind-webrtc.gni')):
|
||||
results.append(' * %s\n' % f)
|
||||
|
||||
if results:
|
||||
results = [output_api.PresubmitError(
|
||||
'The following files are not listed in '
|
||||
'tools_webrtc/valgrind/valgrind-webrt.gni. Please add them, so they can '
|
||||
'be isolated and uploaded to swarming:\n' +
|
||||
''.join(file_path for file_path in results))]
|
||||
return results
|
||||
|
||||
def _CommonChecks(input_api, output_api):
|
||||
"""Checks common to both upload and commit."""
|
||||
results = []
|
||||
results.extend(input_api.canned_checks.CheckLicense(
|
||||
input_api, output_api, _LicenseHeader(input_api)))
|
||||
results.extend(_CheckValgrindFiles(input_api, output_api))
|
||||
return results
|
||||
|
||||
def CheckChangeOnUpload(input_api, output_api):
|
||||
|
@ -58,16 +58,6 @@ char kLSanDefaultSuppressions[] =
|
||||
"leak:rtc::HttpData::changeHeader\n"
|
||||
// https://code.google.com/p/webrtc/issues/detail?id=4149 for details.
|
||||
"leak:StartDNSLookup\n"
|
||||
// https://code.google.com/p/webrtc/issues/detail?id=2527
|
||||
"leak:HangoutPubSubClientTest::HangoutPubSubClientTest\n"
|
||||
"leak:MucRoomConfigTaskTest::SetUp\n"
|
||||
"leak:MucRoomDiscoveryTaskTest::SetUp\n"
|
||||
"leak:MucRoomLookupTaskTest::SetUp\n"
|
||||
"leak:MucRoomUniqueHangoutIdTaskTest::SetUp\n"
|
||||
"leak:PingTaskTest::SetUp\n"
|
||||
"leak:PingXmppClient::SendStanza\n"
|
||||
"leak:PubSubClientTest::PubSubClientTest\n"
|
||||
"leak:PubSubTasksTest::PubSubTasksTest\n"
|
||||
|
||||
// rtc_media_unittests
|
||||
"leak:cricket::FakeNetworkInterface::SetOption\n"
|
||||
|
@ -1,100 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
||||
#
|
||||
# Use of this source code is governed by a BSD-style license
|
||||
# that can be found in the LICENSE file in the root of the source
|
||||
# tree. An additional intellectual property rights grant can be found
|
||||
# in the file PATENTS. All contributing project authors may
|
||||
# be found in the AUTHORS file in the root of the source tree.
|
||||
|
||||
"""
|
||||
Copied from Chrome's src/tools/valgrind/memcheck/PRESUBMIT.py
|
||||
|
||||
See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
|
||||
for more details on the presubmit API built into gcl.
|
||||
"""
|
||||
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
|
||||
def CheckChange(input_api, output_api):
|
||||
"""Checks the memcheck suppressions files for bad data."""
|
||||
|
||||
# Add the path to the Chrome valgrind dir to the import path:
|
||||
tools_vg_path = os.path.join(input_api.PresubmitLocalPath(), '..', '..', '..',
|
||||
'tools', 'valgrind')
|
||||
sys.path.append(tools_vg_path)
|
||||
import suppressions
|
||||
|
||||
sup_regex = re.compile('suppressions.*\.txt$')
|
||||
suppressions = {}
|
||||
errors = []
|
||||
check_for_memcheck = False
|
||||
# skip_next_line has 3 possible values:
|
||||
# - False: don't skip the next line.
|
||||
# - 'skip_suppression_name': the next line is a suppression name, skip.
|
||||
# - 'skip_param': the next line is a system call parameter error, skip.
|
||||
skip_next_line = False
|
||||
for f in filter(lambda x: sup_regex.search(x.LocalPath()),
|
||||
input_api.AffectedFiles()):
|
||||
for line, line_num in zip(f.NewContents(),
|
||||
xrange(1, len(f.NewContents()) + 1)):
|
||||
line = line.lstrip()
|
||||
if line.startswith('#') or not line:
|
||||
continue
|
||||
|
||||
if skip_next_line:
|
||||
if skip_next_line == 'skip_suppression_name':
|
||||
if 'insert_a_suppression_name_here' in line:
|
||||
errors.append('"insert_a_suppression_name_here" is not a valid '
|
||||
'suppression name')
|
||||
if suppressions.has_key(line):
|
||||
if f.LocalPath() == suppressions[line][1]:
|
||||
errors.append('suppression with name "%s" at %s line %s '
|
||||
'has already been defined at line %s' %
|
||||
(line, f.LocalPath(), line_num,
|
||||
suppressions[line][1]))
|
||||
else:
|
||||
errors.append('suppression with name "%s" at %s line %s '
|
||||
'has already been defined at %s line %s' %
|
||||
(line, f.LocalPath(), line_num,
|
||||
suppressions[line][0], suppressions[line][1]))
|
||||
else:
|
||||
suppressions[line] = (f, line_num)
|
||||
check_for_memcheck = True;
|
||||
skip_next_line = False
|
||||
continue
|
||||
if check_for_memcheck:
|
||||
if not line.startswith('Memcheck:'):
|
||||
errors.append('"%s" should be "Memcheck:..." in %s line %s' %
|
||||
(line, f.LocalPath(), line_num))
|
||||
check_for_memcheck = False;
|
||||
if line == '{':
|
||||
skip_next_line = 'skip_suppression_name'
|
||||
continue
|
||||
if line == "Memcheck:Param":
|
||||
skip_next_line = 'skip_param'
|
||||
continue
|
||||
|
||||
if (line.startswith('fun:') or line.startswith('obj:') or
|
||||
line.startswith('Memcheck:') or line == '}' or
|
||||
line == '...'):
|
||||
continue
|
||||
errors.append('"%s" is probably wrong: %s line %s' % (line, f.LocalPath(),
|
||||
line_num))
|
||||
if errors:
|
||||
return [output_api.PresubmitError('\n'.join(errors))]
|
||||
return []
|
||||
|
||||
|
||||
def CheckChangeOnUpload(input_api, output_api):
|
||||
return CheckChange(input_api, output_api)
|
||||
|
||||
|
||||
def CheckChangeOnCommit(input_api, output_api):
|
||||
return CheckChange(input_api, output_api)
|
||||
|
||||
|
||||
def GetPreferredTrySlaves():
|
||||
return ['linux_memcheck']
|
@ -326,55 +326,6 @@
|
||||
fun:_ZN23SSLStreamAdapterTestTLS12TestTransferEi
|
||||
...
|
||||
}
|
||||
# For tests that create XMPPClient which can only be deleted by task runner.
|
||||
{
|
||||
HangoutPubSubClientTest
|
||||
Memcheck:Leak
|
||||
fun:_Znw*
|
||||
fun:_ZN*HangoutPubSubClientTest*Ev
|
||||
}
|
||||
{
|
||||
MucRoomConfigTaskTest
|
||||
Memcheck:Leak
|
||||
fun:_Znw*
|
||||
fun:_ZN21MucRoomConfigTaskTest5SetUpEv
|
||||
}
|
||||
{
|
||||
MucRoomDiscoveryTaskTest
|
||||
Memcheck:Leak
|
||||
fun:_Znw*
|
||||
fun:_ZN24MucRoomDiscoveryTaskTest5SetUpEv
|
||||
}
|
||||
{
|
||||
MucRoomLookupTaskTest
|
||||
Memcheck:Leak
|
||||
fun:_Znw*
|
||||
fun:_ZN21MucRoomLookupTaskTest5SetUpEv
|
||||
}
|
||||
{
|
||||
MucRoomUniqueHangoutIdTaskTest
|
||||
Memcheck:Leak
|
||||
fun:_Znw*
|
||||
fun:_ZN30MucRoomUniqueHangoutIdTaskTest5SetUpEv
|
||||
}
|
||||
{
|
||||
PingTaskTest
|
||||
Memcheck:Leak
|
||||
fun:_Znw*
|
||||
fun:_ZN12PingTaskTest5SetUpEv
|
||||
}
|
||||
{
|
||||
PubSubClientTest
|
||||
Memcheck:Leak
|
||||
fun:_Znw*
|
||||
fun:_ZN*PubSubClientTest*Ev
|
||||
}
|
||||
{
|
||||
PubSubTasksTest
|
||||
Memcheck:Leak
|
||||
fun:_Znw*
|
||||
fun:_ZN*PubSubTasksTest*Ev
|
||||
}
|
||||
# failures which can't be reproduced locally
|
||||
{
|
||||
bug_2153_1
|
||||
|
Reference in New Issue
Block a user