[neon/qt/pyside2/Neon/release] debian: Add a patch to make the tests find the matching build directory.

[Dmitry Shachnev]

Git commit ebb37f5c532cc66d18b8a87d9801f8515941f536 by Dmitry Shachnev, on behalf of Dmitry Shachnev.
Committed on 15/11/2021 at 12:41.
Pushed by jriddell into branch 'Neon/release'.

Add a patch to make the tests find the matching build directory.

M  +1    -0    debian/changelog
M  +1    -0    debian/patches/series
A  +27   -0    debian/patches/test-with-current-interpreter.patch

https://invent.kde.org/neon/qt/pyside2/commit/ebb37f5c532cc66d18b8a87d9801f8515941f536

diff --git a/debian/changelog b/debian/changelog
index 7bb175a6..b89f6e70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ pyside2 (5.15.2-2) UNRELEASED; urgency=medium
   * Backport upstream patches for Python 3.10 support (closes: #999369).
   * Backport upstream patch to adapt for LLVM 12.01.
   * Run build-time tests with all supported Python versions.
+    - Add a patch to make the tests find the matching build directory.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 15 Nov 2021 15:40:37 +0300
 
diff --git a/debian/patches/series b/debian/patches/series
index a84d82eb..d07fb736 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ py3.10-prep-Fix-parser.py-for-changed-typing-module.patch
 py3.10-prep-Finally-support-Python-3.10.patch
 py3.10-prep-Fix-a-very-old-refcounting-error-in-time_test.patch
 shiboken6-Adapt-to-LLVM-12.01.patch
+test-with-current-interpreter.patch
diff --git a/debian/patches/test-with-current-interpreter.patch b/debian/patches/test-with-current-interpreter.patch
new file mode 100644
index 00000000..642cb20f
--- /dev/null
+++ b/debian/patches/test-with-current-interpreter.patch
@@ -0,0 +1,27 @@
+From: Dmitry Shachnev <mitya57 at debian.org>
+Date: Sun, 14 Nov 2021 21:08:50 +0300
+Subject: Find the build directory matching the current interpreter
+
+This is needed to allow us to run tests with all supported Python versions.
+Without this patch, the latest build directory will be always picked, no
+matter what the current interpreter is.
+---
+ testing/buildlog.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/testing/buildlog.py b/testing/buildlog.py
+index 216282b..5d3aa1f 100644
+--- a/testing/buildlog.py
++++ b/testing/buildlog.py
+@@ -94,6 +94,11 @@ class BuildLog(object):
+                     """.format(fpath)))
+                     sys.exit(1)
+ 
++                # We need to find the build directory for the current interpreter
++                py_version = "{}.{}".format(sys.version_info[0], sys.version_info[1])
++                if py_version not in build_classifiers:
++                    continue
++
+                 if not os.path.exists(build_dir):
+                     rel_dir, low_part = os.path.split(build_dir)
+                     rel_dir, two_part = os.path.split(rel_dir)