Merge pull request #3445 from MathieuDuponchelle/pypy_support

python module: make it work with pypy

1 files changed, 14 insertions, 1 deletions

diff --git a/run_unittests.py b/run_unittests.py
index 834aadb..78bb9b7 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -3160,7 +3160,7 @@ class PythonTests(BasePlatformTests):
         if self.backend is not Backend.ninja:
             raise unittest.SkipTest('Skipping python tests with {} backend'.format(self.backend.name))
 
-        testdir = os.path.join(self.src_root, 'test cases', 'python', '1 extmodule')
+        testdir = os.path.join(self.src_root, 'test cases', 'unit', '32 python extmodule')
 
         # No python version specified, this will use meson's python
         self.init(testdir)
@@ -3186,6 +3186,19 @@ class PythonTests(BasePlatformTests):
 
         self.wipe()
 
+        for py in ('pypy', 'pypy3'):
+            try:
+                self.init(testdir, ['-Dpython=%s' % py])
+            except unittest.SkipTest:
+                # Same as above, pypy2 and pypy3 are not expected to be present
+                # on the test system, the test project only raises in these cases
+                continue
+
+            # We have a pypy, this is expected to work
+            self.build()
+            self.run_tests()
+            self.wipe()
+
         # The test is configured to error out with MESON_SKIP_TEST
         # in case it could not find python
         with self.assertRaises(unittest.SkipTest):