aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Fijalkowski <fijall@gmail.com>2021-02-23 11:55:19 +0000
committerMaciej Fijalkowski <fijall@gmail.com>2021-02-23 11:55:19 +0000
commit9fefa8ab9221e5a12db0d5c0ce143311e8d0f9b4 (patch)
tree796af9cff0a0fe51d64cb6c9d5dc6530a71aea18
parentupdate the files for vmprof-python (diff)
downloadpypy-9fefa8ab9221e5a12db0d5c0ce143311e8d0f9b4.tar.gz
pypy-9fefa8ab9221e5a12db0d5c0ce143311e8d0f9b4.tar.bz2
pypy-9fefa8ab9221e5a12db0d5c0ce143311e8d0f9b4.zip
Start a new branch to get support for vmprof on aarch64
-rw-r--r--rpython/rlib/rvmprof/test/__init__.py2
-rw-r--r--rpython/rlib/rvmprof/test/test_file.py5
2 files changed, 5 insertions, 2 deletions
diff --git a/rpython/rlib/rvmprof/test/__init__.py b/rpython/rlib/rvmprof/test/__init__.py
index 10d19aeb3d..846fe5c449 100644
--- a/rpython/rlib/rvmprof/test/__init__.py
+++ b/rpython/rlib/rvmprof/test/__init__.py
@@ -1,5 +1,5 @@
import pytest
import platform
-if not platform.machine().startswith('x86'):
+if not (platform.machine().startswith('x86') or platform.machine() == 'aarch64'):
pytest.skip()
diff --git a/rpython/rlib/rvmprof/test/test_file.py b/rpython/rlib/rvmprof/test/test_file.py
index e13ed978cc..0a14c6dc4b 100644
--- a/rpython/rlib/rvmprof/test/test_file.py
+++ b/rpython/rlib/rvmprof/test/test_file.py
@@ -15,7 +15,10 @@ def get_list_of_files(shared):
files.remove(shared.join('libbacktrace', 'config-x86_32.h'))
files.remove(shared.join('libbacktrace', 'config-x86_64.h'))
files.remove(shared.join('libbacktrace', 'gstdint.h'))
- files.remove(shared.join('libbacktrace', 'config.h'))
+ try:
+ files.remove(shared.join('libbacktrace', 'config.h'))
+ except ValueError:
+ pass # might not be there
return files
def test_same_file():