Skip to content

Commit 866bf07

Browse files
mhsmithhenryiii
authored andcommitted
Fix Android tests (#23)
* Android tests working * Clarifications
1 parent 9e728a8 commit 866bf07

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

tests/env.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import pytest
88

9+
ANDROID = sys.platform.startswith("android")
910
LINUX = sys.platform.startswith("linux")
1011
MACOS = sys.platform.startswith("darwin")
1112
WIN = sys.platform.startswith("win32") or sys.platform.startswith("cygwin")

tests/pyproject.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,4 @@ pyodide.test-groups = ["numpy", "scipy"]
3333
ios.test-groups = ["numpy"]
3434
ios.xbuild-tools = ["cmake", "ninja"]
3535
ios.environment.PIP_EXTRA_INDEX_URL = "https://pypi.anaconda.org/beeware/simple"
36-
android.test-groups = ["numpy"]
37-
android.xbuild-tools = ["cmake", "ninja"]
38-
android.environment.PIP_EXTRA_INDEX_URL = "https://chaquo.com/pypi-13.1"
36+
android.environment.ANDROID_API_LEVEL = "24" # Needed to include libc++ in the wheel.

tests/test_exceptions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def test_cross_module_exceptions(msg):
7676

7777
# TODO: FIXME
7878
@pytest.mark.xfail(
79-
"env.MACOS and env.PYPY",
79+
"(env.MACOS and env.PYPY) or env.ANDROID",
8080
raises=RuntimeError,
8181
reason="See Issue #2847, PR #2999, PR #4324",
8282
strict=not env.PYPY, # PR 5569

0 commit comments

Comments
 (0)