Skip to content

Commit 999cca3

Browse files
authored
Only test crossplatform tests on mac (#18999)
This makes the mac builder run only the tests that are marked with the @Crossplatform decorator, having been explicitly added for Windows or mac. It will be a large reduction in test coverage for mac, but of course run much faster.
1 parent f51beb1 commit 999cca3

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

.circleci/config.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -695,17 +695,8 @@ jobs:
695695
- pip-install:
696696
python: "$EMSDK_PYTHON"
697697
- run-tests:
698-
# skip other.test_stack_switching_size as we do not currently install
699-
# d8 on mac
700-
title: "other+extras"
701-
test_targets: "
702-
other
703-
sockets.test_nodejs_sockets_echo*
704-
core0.test_lua
705-
core0.test_longjmp_standalone
706-
core2.test_sse1
707-
skip:other.test_native_link_error_message
708-
skip:other.test_stack_switching_size"
698+
title: "crossplatform tests"
699+
test_targets: "--crossplatform-only"
709700
- upload-test-results
710701

711702
workflows:

test/test_core.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,6 +1108,7 @@ def test_wcslen(self):
11081108
def test_regex(self):
11091109
self.do_core_test('test_regex.c')
11101110

1111+
@crossplatform
11111112
@also_with_standalone_wasm(wasm2c=True, impure=True)
11121113
def test_longjmp_standalone(self):
11131114
self.do_core_test('test_longjmp.c')
@@ -6867,6 +6868,7 @@ def test_gcc_unmangler(self):
68676868
self.do_runf(test_file('third_party/libiberty/cp-demangle.c'), '*d_demangle(char const*, int, unsigned int*)*', args=['_ZL10d_demanglePKciPj'])
68686869

68696870
@needs_make('make')
6871+
@crossplatform
68706872
def test_lua(self):
68716873
self.emcc_args.remove('-Werror')
68726874
env_init = {

test/test_sockets.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import clang_native
1919
import common
2020
from common import BrowserCore, no_windows, create_file, test_file, read_file
21-
from common import parameterized, requires_native_clang, PYTHON
21+
from common import parameterized, requires_native_clang, crossplatform, PYTHON
2222
from tools import config, utils
2323
from tools.shared import EMCC, path_from_root, run_process, CLANG_CC
2424

@@ -277,6 +277,7 @@ def test_enet(self):
277277
with CompiledServerHarness(test_file('sockets/test_enet_server.c'), enet, 49210) as harness:
278278
self.btest_exit(test_file('sockets/test_enet_client.c'), args=enet + ['-DSOCKK=%d' % harness.listen_port])
279279

280+
@crossplatform
280281
@parameterized({
281282
'native': [WebsockifyServerHarness, 59160, ['-DTEST_DGRAM=0']],
282283
'tcp': [CompiledServerHarness, 59162, ['-DTEST_DGRAM=0']],

0 commit comments

Comments
 (0)