Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry pick PR #1905: [XB1] Revert UWP implementation of SbTimeZoneGetName #1911

Merged
merged 1 commit into from
Nov 6, 2023
Merged

Cherry pick PR #1905: [XB1] Revert UWP implementation of SbTimeZoneGetName #1911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion starboard/shared/win32/test_filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,15 @@

from starboard.tools.testing import test_filter

_FILTERED_TESTS = {}
_FILTERED_TESTS = {
'nplb': [
# Windows uses a special time zone format that ICU accepts, so we don't
# enforce IANA.
# TODO(b/304335954): Re-enable the test for UWP after fixing DST
# implementation.
'SbTimeZoneGetNameTest.IsIANAFormat',
],
}


class TestFilters(object):
Expand Down
4 changes: 0 additions & 4 deletions starboard/win/win32/test_filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@

# Enable once verified on the platform.
'SbMediaCanPlayMimeAndKeySystem.MinimumSupport',

# Windows uses a special time zone format that ICU accepts, so we don't enforce IANA.
# TODO(b/304335954): Re-enable the test after fixing Windows implementation.
'SbTimeZoneGetNameTest.IsIANAFormat',
],
'player_filter_tests': [
# These tests fail on our VMs for win-win32 builds due to missing
Expand Down
5 changes: 4 additions & 1 deletion starboard/xb1/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ static_library("starboard_platform") {
"//starboard/shared/uwp/system_platform_error_internal.cc",
"//starboard/shared/uwp/system_platform_error_internal.h",
"//starboard/shared/uwp/system_raise_platform_error.cc",
"//starboard/shared/uwp/time_zone_get_name.cc",
"//starboard/shared/uwp/wasapi_audio.cc",
"//starboard/shared/uwp/wasapi_audio.h",
"//starboard/shared/uwp/wasapi_audio_sink.cc",
Expand Down Expand Up @@ -177,6 +176,10 @@ static_library("starboard_platform") {
"//starboard/shared/win32/media_get_max_buffer_capacity.cc",
"//starboard/shared/win32/media_transform.cc",
"//starboard/shared/win32/media_transform.h",

# TODO (b/304335954): Use uwp implementation for correct IANA name once
# daylight savings offset is fixed.
"//starboard/shared/win32/time_zone_get_name.cc",
"//starboard/shared/win32/video_decoder.cc",
"//starboard/shared/win32/video_decoder.h",
"//starboard/shared/win32/win32_audio_decoder.cc",
Expand Down