From 4135ceea7575724d86bb4afea8ed06ce2a5445b4 Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Fri, 14 Mar 2025 03:19:21 +0100
Subject: [PATCH] meson: Run Python tests

---
 python/meson.build       | 55 ++++++++++++++++++++++++++++++++++++-
 python/tests/Makefile.am |  2 +-
 python/tests/meson.build | 59 ----------------------------------------
 3 files changed, 55 insertions(+), 61 deletions(-)
 delete mode 100644 python/tests/meson.build

diff --git a/python/meson.build b/python/meson.build
index 941714de..4ae0b0fa 100644
--- a/python/meson.build
+++ b/python/meson.build
@@ -68,6 +68,59 @@ if py.found() == true
         configuration: setup_py,
     )
 
-    subdir('tests')
+    python_tests = [
+        'attribs.py',
+        'build.py',
+        'compareNodes.py',
+        'ctxterror.py',
+        'cutnpaste.py',
+        'dtdvalid.py',
+        'error.py',
+        'inbuf.py',
+        'indexes.py',
+        'input_callback.py',
+        'nsdel.py',
+        'outbuf.py',
+        'push.py',
+        'pushSAX.py',
+        'pushSAXhtml.py',
+        'reader.py',
+        'reader2.py',
+        'reader3.py',
+        'reader4.py',
+        'reader5.py',
+        'reader6.py',
+        'reader7.py',
+        'reader8.py',
+        'readererr.py',
+        'readernext.py',
+        'regexp.py',
+        'relaxng.py',
+        'resolver.py',
+        'schema.py',
+        'serialize.py',
+        'sync.py',
+        'thread2.py',
+        'tst.py',
+        'tstLastError.py',
+        'tstURI.py',
+        'tstmem.py',
+        'tstxpath.py',
+        'validDTD.py',
+        'validRNG.py',
+        'validSchemas.py',
+        'validate.py',
+        'walker.py',
+        'xpath.py',
+        'xpathext.py',
+        'xpathleak.py',
+        'xpathns.py',
+        'xpathret.py',
+    ]
 
+    foreach file : python_tests
+        test(file, py, args: [ file ],
+             workdir: meson.current_source_dir() / 'tests',
+             env: { 'PYTHONPATH': meson.current_build_dir() })
+    endforeach
 endif
diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am
index 0f6caddf..10a5f9ce 100644
--- a/python/tests/Makefile.am
+++ b/python/tests/Makefile.am
@@ -53,7 +53,7 @@ XMLS=		\
     invalid.xml	\
     test.dtd
 
-EXTRA_DIST = $(PYTESTS) $(XMLS) setup_test.py meson.build
+EXTRA_DIST = $(PYTESTS) $(XMLS) setup_test.py
 
 CLEANFILES = core tmp.xml *.pyc
 
diff --git a/python/tests/meson.build b/python/tests/meson.build
deleted file mode 100644
index 6065b009..00000000
--- a/python/tests/meson.build
+++ /dev/null
@@ -1,59 +0,0 @@
-# TODO: Run the tests
-
-python_test_files = files(
-    'attribs.py',
-    'build.py',
-    'compareNodes.py',
-    'ctxterror.py',
-    'cutnpaste.py',
-    'dtdvalid.py',
-    'error.py',
-    'inbuf.py',
-    'indexes.py',
-    'input_callback.py',
-    'nsdel.py',
-    'outbuf.py',
-    'push.py',
-    'pushSAX.py',
-    'pushSAXhtml.py',
-    'reader.py',
-    'reader2.py',
-    'reader3.py',
-    'reader4.py',
-    'reader5.py',
-    'reader6.py',
-    'reader7.py',
-    'reader8.py',
-    'readererr.py',
-    'readernext.py',
-    'regexp.py',
-    'relaxng.py',
-    'resolver.py',
-    'schema.py',
-    'serialize.py',
-    'setup_test.py',
-    'sync.py',
-    'thread2.py',
-    'tst.py',
-    'tstLastError.py',
-    'tstURI.py',
-    'tstmem.py',
-    'tstxpath.py',
-    'validDTD.py',
-    'validRNG.py',
-    'validSchemas.py',
-    'validate.py',
-    'walker.py',
-    'xpath.py',
-    'xpathext.py',
-    'xpathleak.py',
-    'xpathns.py',
-    'xpathret.py',
-)
-
-xml_files = files(
-    'invalid.xml',
-    'test.dtd',
-    'tst.xml',
-    'valid.xml',
-)