Skip to content

Commit

Permalink
[run-webkit-tests] Only include defined versions in baseline search path
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=272475
rdar://126222004

Reviewed by Tim Horton.

* Tools/Scripts/webkitpy/port/visionos.py:
(VisionOSPort.default_baseline_search_path): Skip apple_name if undefined.
* Tools/Scripts/webkitpy/port/watch.py:
(WatchPort.default_baseline_search_path): Ditto.

Canonical link: https://commits.webkit.org/277317@main
  • Loading branch information
JonWBedard committed Apr 10, 2024
1 parent cd08370 commit f833ff1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Tools/Scripts/webkitpy/port/visionos.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ def default_baseline_search_path(self, **kwargs):
for version in versions_to_fallback:
if apple_additions():
apple_name = VersionNameMap.map(self.host.platform).to_name(version, platform=VisionOSPort.port_name, table=INTERNAL_TABLE)
expectations.append(self._apple_baseline_path('{}-{}'.format(self.port_name, apple_name.lower().replace(' ', ''))))
if apple_name:
expectations.append(self._apple_baseline_path('{}-{}'.format(self.port_name, apple_name.lower().replace(' ', ''))))
expectations.append(self._webkit_baseline_path('{}-{}'.format(self.port_name, version.major)))

if apple_additions():
Expand All @@ -84,8 +85,7 @@ def default_baseline_search_path(self, **kwargs):
if apple_additions():
apple_name = VersionNameMap.map(self.host.platform).to_name(version, platform=VisionOSPort.port_name, table=INTERNAL_TABLE)
if apple_name:
expectations.append(
self._apple_baseline_path('{}-{}'.format(VisionOSPort.port_name, apple_name.lower().replace(' ', ''))))
expectations.append(self._apple_baseline_path('{}-{}'.format(VisionOSPort.port_name, apple_name.lower().replace(' ', ''))))
expectations.append(self._webkit_baseline_path('{}-{}'.format(VisionOSPort.port_name, version.major)))

if apple_additions():
Expand Down
3 changes: 2 additions & 1 deletion Tools/Scripts/webkitpy/port/watch.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ def default_baseline_search_path(self, **kwargs):
for version in versions_to_fallback:
if apple_additions():
apple_name = VersionNameMap.map(self.host.platform).to_name(version, platform=WatchPort.port_name, table=INTERNAL_TABLE)
expectations.append(self._apple_baseline_path('{}-{}'.format(self.port_name, apple_name.lower().replace(' ', ''))))
if apple_name:
expectations.append(self._apple_baseline_path('{}-{}'.format(self.port_name, apple_name.lower().replace(' ', ''))))
expectations.append(self._webkit_baseline_path('{}-{}'.format(self.port_name, version.major)))

if apple_additions():
Expand Down

0 comments on commit f833ff1

Please sign in to comment.