Skip to content

Commit 3d6d207

Browse files
authored
[test] Disable test_strftime_zZ_gb_locale on macOS. NFC (#21624)
This test doesn't currently run on macOS due to python failing to start when LC_ALL is set to an unavailable locale.
1 parent 53058ef commit 3d6d207

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.circleci/config.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -918,9 +918,7 @@ jobs:
918918
python: "$EMSDK_PYTHON"
919919
- run-tests:
920920
title: "crossplatform tests"
921-
# Skipping test_strftime_zZ_gb_locale since this test forces the
922-
# locale to one that is not necessarily available on macOS.
923-
test_targets: "--crossplatform-only skip:other.test_strftime_zZ_gb_locale"
921+
test_targets: "--crossplatform-only"
924922
- upload-test-results
925923

926924
test-mac-arm64:
@@ -942,9 +940,7 @@ jobs:
942940
# are currently missing arm64 macos binaries.
943941
- run-tests:
944942
title: "crossplatform tests"
945-
# Skipping test_strftime_zZ_gb_locale since this test forces the
946-
# locale to one that is not necessarily available on macOS.
947-
test_targets: "--crossplatform-only skip:other.test_strftime_zZ_gb_locale"
943+
test_targets: "--crossplatform-only"
948944
- upload-test-results
949945

950946
workflows:

test/test_other.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
raise Exception('do not run this file directly; do something like: test/runner other')
2929

3030
from tools.shared import config
31-
from tools.shared import EMCC, EMXX, EMAR, EMRANLIB, FILE_PACKAGER, WINDOWS, LLVM_NM
31+
from tools.shared import EMCC, EMXX, EMAR, EMRANLIB, FILE_PACKAGER, LLVM_NM
3232
from tools.shared import CLANG_CC, CLANG_CXX, LLVM_AR, LLVM_DWARFDUMP, LLVM_DWP, EMCMAKE, EMCONFIGURE, WASM_LD
3333
from common import RunnerCore, path_from_root, is_slow_test, ensure_dir, disabled, make_executable
3434
from common import env_modify, no_mac, no_windows, only_windows, requires_native_clang, with_env_modify
@@ -40,7 +40,7 @@
4040
from common import EMTEST_BUILD_VERBOSE, PYTHON, WEBIDL_BINDER
4141
from common import requires_network
4242
from tools import shared, building, utils, response_file, cache
43-
from tools.utils import read_file, write_file, delete_file, read_binary
43+
from tools.utils import read_file, write_file, delete_file, read_binary, MACOS, WINDOWS
4444
import common
4545
import jsrun
4646
import clang_native
@@ -5721,6 +5721,8 @@ def test_only_force_stdlibs_2(self):
57215721
@crossplatform
57225722
@also_with_env_modify({'gb_locale': {'LC_ALL': 'en_GB'}, 'long_tz': {'TZ': 'Asia/Kathmandu'}})
57235723
def test_strftime_zZ(self):
5724+
if os.environ.get('LC_ALL') == 'en_GB' and MACOS:
5725+
self.skipTest('setting LC_ALL is not compatible with macOS python')
57245726
self.do_runf('other/test_strftime_zZ.c', 'ok!')
57255727

57265728
def test_strptime_symmetry(self):

0 commit comments

Comments
 (0)