Skip to content

ARM64 test workarounds #1939

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

Merged
BCSharp merged 2 commits into from
Apr 7, 2025
Merged

ARM64 test workarounds #1939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
654b250
ARM64 test workarounds
BCSharp Apr 4, 2025
07c4ca7
Chanke machine test to be cross-platform
BCSharp Apr 4, 2025
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
2 changes: 2 additions & 0 deletions src/core/IronPython/Lib/iptest/test_env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import os
import sys
import platform

#------------------------------------------------------------------------------

Expand All @@ -15,6 +16,7 @@
is_linux = sys.platform == 'linux'
is_osx = sys.platform == 'darwin'
is_posix = is_linux or is_osx
is_arm64 = platform.machine().lower() in ['aarch64', 'arm64']

is_netcoreapp = False
is_netcoreapp21 = False
Expand Down
5 changes: 4 additions & 1 deletion tests/suite/test_cliclass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import sys
import unittest
from iptest import IronPythonTestCase, is_cli, is_debug, is_mono, is_net70, is_net80, is_netcoreapp, is_netcoreapp21, is_posix, big, run_test, skipUnlessIronPython
from iptest import IronPythonTestCase, is_cli, is_debug, is_mono, is_net70, is_net80, is_netcoreapp, is_netcoreapp21, is_posix, is_arm64, big, run_test, skipUnlessIronPython

if is_cli:
import clr
Expand Down Expand Up @@ -1755,6 +1755,9 @@ def test_int_constructor_overflow(self):
from iptest import clr_int_types, myint, myfloat

val = 1 << 64
if is_mono and is_arm64:
# on Mono/ARM64, floating point rounding errors on ARM64 can cause 1 << 64 to fit in 64 bits
val += 10000
for t in clr_int_types:
self.assertRaises(OverflowError, t, val)
self.assertRaises(OverflowError, t, str(val))
Expand Down
10 changes: 8 additions & 2 deletions tests/suite/test_datetime_stdlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
## Run selected tests from test_datetime from StdLib
##

from iptest import is_ironpython, generate_suite, run_test
from iptest import is_ironpython, is_mono, is_arm64, generate_suite, run_test

import test.datetimetester

Expand Down Expand Up @@ -45,7 +45,13 @@ def load_tests(loader, standard_tests, pattern):
test.datetimetester.TestTimeZone('test_constructor'),
]

return generate_suite(tests, failing_tests)
skip_tests = []
if is_mono and is_arm64:
skip_tests += [
test.datetimetester.TestTimeDelta('test_overflow'), # rounding differences
]

return generate_suite(tests, failing_tests, skip_tests)

else:
return tests
Expand Down