Skip to content

Commit

Permalink
Remove COBALT_WIN references (youtube#3730)
Browse files Browse the repository at this point in the history
This macro is no longer defined anywhere.

b/150410605
  • Loading branch information
kaidokert authored Jul 1, 2024
1 parent e31b739 commit b6b6176
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 20 deletions.
9 changes: 0 additions & 9 deletions base/basictypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@ typedef uint64_t uint64;
typedef int16_t char16;
typedef int32_t char32;

#if defined(COBALT_WIN)
#pragma warning(push)
#pragma warning(disable : 4310) // Cast truncates constant value.
#endif

const uint8 kuint8max = ((uint8)0xFF);
const uint16 kuint16max = ((uint16)0xFFFF);
const uint32 kuint32max = ((uint32)0xFFFFFFFF);
Expand All @@ -42,10 +37,6 @@ const int32 kint32max = ((int32)0x7FFFFFFF);
// const int64 kint64min = (( int64) GG_LONGLONG(0x8000000000000000));
// const int64 kint64max = (( int64) GG_LONGLONG(0x7FFFFFFFFFFFFFFF));

#if defined(COBALT_WIN)
#pragma warning(pop)
#endif

// The arraysize(arr) macro returns the # of elements in an array arr.
// The expression is a compile-time constant, and therefore can be
// used in defining new arrays, for example. If you use arraysize on
Expand Down
4 changes: 0 additions & 4 deletions cobalt/layout_tests/web_platform_tests.cc
Original file line number Diff line number Diff line change
Expand Up @@ -432,8 +432,6 @@ TEST_P(WebPlatformTest, Run) {
EXPECT_PRED_FORMAT2(CheckHarnessResult, GetParam().expectation, result);
}

// Disable on Windows until network stack is implemented.
#if !defined(COBALT_WIN)
// XML Http Request test cases.
INSTANTIATE_TEST_CASE_P(
xhr, WebPlatformTest,
Expand Down Expand Up @@ -519,7 +517,5 @@ INSTANTIATE_TEST_CASE_P(
encoding, WebPlatformTest,
::testing::ValuesIn(EnumerateWebPlatformTests("encoding")), GetTestName());

#endif // !defined(COBALT_WIN)

} // namespace layout_tests
} // namespace cobalt
7 changes: 0 additions & 7 deletions starboard/xb1/test_filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
# limitations under the License.
"""Starboard Xbox One Platform Test Filters."""

import logging
import os

from starboard.shared.win32 import test_filters as shared_test_filters
from starboard.tools.testing import test_filter

Expand Down Expand Up @@ -68,10 +65,6 @@ def GetTestFilters(self):
Returns:
A list of initialized TestFilter objects.
"""
if os.environ.get('COBALT_WIN_BUILDBOT_DISABLE_TESTS', '0') == '1':
logging.error('COBALT_WIN_BUILDBOT_DISABLE_TESTS=1, Tests are disabled.')
return [test_filter.DISABLE_TESTING]

filters = super().GetTestFilters()
for target, tests in _FILTERED_TESTS.items():
filters.extend(test_filter.TestFilter(target, test) for test in tests)
Expand Down

0 comments on commit b6b6176

Please sign in to comment.