HomeWildfire Games
Diffusion 0 A.D. Public Repository rP22378

Fix cppformat failures on MacOS tests.
rP22378
Actions

Description

Fix cppformat failures on MacOS tests.

cppformat tests failed on MacOS - the global locale was not set and defaulted to something unexcpeted.
It is now fixed to US notation.

Patch By: Krinkle
Reviewed By: wraitii

Differential Revision: https://code.wildfiregames.com/D1978

Details

Committed
wraitiiJun 16 2019, 5:25 PM
Reviewer
wraitii
Differential Revision
D1978: tests: Fix cppformat failures on osx (locale-related)
Parents
rP22377: fixed anomaly in doum palm
Branches
Unknown
Tags
Unknown
Build Status
Buildable 7971
Build 12974: Trigger Windows Autobuild
Build 12973: Post-Commit BuildJenkins

Event Timeline

wraitii committed rP22378: Fix cppformat failures on MacOS tests..Jun 16 2019, 5:25 PM
Harbormaster completed building B7971: rP22378: Fix cppformat failures on MacOS tests..Jun 16 2019, 5:59 PM
elexis mentioned this in D1990: Add Krinkle to 0 A.D.'s programming credits.Jun 21 2019, 9:46 PM
elexis added a subscriber: elexis.Jun 25 2019, 10:59 PM
elexis added inline comments.
/ps/trunk/source/ps/tests/test_CStr.h
142

(same)

/ps/trunk/source/ps/tests/test_cppformat.h
61

The idea of this call is to restore the locale that was set before entering the function?

wraitii added inline comments.Jun 25 2019, 11:02 PM
/ps/trunk/source/ps/tests/test_cppformat.h
61

Yes, to avoid changing the global state (not necessarily thread-safely though...)

elexis added inline comments.Jun 25 2019, 11:03 PM
/ps/trunk/source/ps/tests/test_cppformat.h
61

so char* old = setlocale(LC_ALL, "en_US.UTF-8"); returns the locale before or after applying the change passed in the arguments?

wraitii added inline comments.Jun 25 2019, 11:08 PM
/ps/trunk/source/ps/tests/test_cppformat.h
61

-_- I suggested that here and I did check here, but I obviously got that wrong and didn't check further.

elexis raised a concern with this commit.Jun 25 2019, 11:27 PM

(see above)

This commit now has outstanding concerns.Jun 25 2019, 11:27 PM
Krinkle mentioned this in D2013: Fix incorrect use of setlocale() in cppformat CStr tests.Jun 26 2019, 1:50 AM
wraitii mentioned this in rP22518: Fix incorrect use of setlocale() in cppformat CStr tests following rP22378.Jul 20 2019, 2:57 PM
elexis added a comment.Aug 30 2019, 12:02 AM

rP22518 reverted in rP22519.

elexis mentioned this in rP22909: Fix hotkey events synching with hotkey state..Sep 15 2019, 3:02 PM
Stan removed an auditor: elexis.Dec 23 2020, 11:54 PM
Stan added a subscriber: Stan.

AFAIK this is now fixed by using the C locale. Will be irrelevant when switching to C++20

This commit no longer requires audit.Dec 23 2020, 11:54 PM

Changes (2)

PathSize
ps/
trunk/
source/
ps/
tests/

rP22378

View Options

ps/trunk/source/ps/tests/test_CStr.h

Loading...
View Options

ps/trunk/source/ps/tests/test_cppformat.h

Loading...
Wildfire Games ยท Phabricator