Fix check_package_boundaries presubmit test for Windows.
BUG=webrtc:6954
NOTRY=True
Review-Url: https://codereview.webrtc.org/2695573003
Cr-Commit-Position: refs/heads/master@{#16581}
diff --git a/tools-webrtc/check_package_boundaries.py b/tools-webrtc/check_package_boundaries.py
index 75588fa..eb791ff 100644
--- a/tools-webrtc/check_package_boundaries.py
+++ b/tools-webrtc/check_package_boundaries.py
@@ -54,11 +54,11 @@
def _BuildSubpackagesPattern(packages, query):
"""Returns a regular expression that matches source files inside subpackages
of the given query."""
- query += '/'
+ query += os.path.sep
length = len(query)
pattern = r'(?P<line_number>\d+)\$\s*"(?P<source_file>(?P<subpackage>'
- pattern += '|'.join(package[length:] for package in packages
- if package.startswith(query))
+ pattern += '|'.join(package[length:].replace(os.path.sep, '/')
+ for package in packages if package.startswith(query))
pattern += r')/[\w\./]*)"'
return re.compile(pattern)
diff --git a/tools-webrtc/check_package_boundaries_test.py b/tools-webrtc/check_package_boundaries_test.py
index 437f6e6..c59c485 100755
--- a/tools-webrtc/check_package_boundaries_test.py
+++ b/tools-webrtc/check_package_boundaries_test.py
@@ -33,6 +33,7 @@
def log(self, build_file_path, line_number, target_name, source_file,
subpackage):
build_file_path = os.path.relpath(build_file_path, self.test_dir)
+ build_file_path = build_file_path.replace(os.path.sep, '/')
self.messages.append([build_file_path, line_number, target_name,
source_file, subpackage])