From 024861af51aee807d800e01e122897166a65ea93 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 9 Jul 2023 16:14:01 -0400
Subject: [PATCH] testsuite: Normalise versions more aggressively
In backpack hashes can contain `+` characters.
---
testsuite/driver/testlib.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 955461dcdb2..c349c11fe2f 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -1006,7 +1006,7 @@ def normalise_win32_io_errors(name, opts):
def normalise_version_( *pkgs ):
def normalise_version__( str ):
# (name)(-version)(-hash)(-components)
- return re.sub('(' + '|'.join(map(re.escape,pkgs)) + ')-[0-9.]+(-[0-9a-zA-Z]+)?(-[0-9a-zA-Z]+)?',
+ return re.sub('(' + '|'.join(map(re.escape,pkgs)) + ')-[0-9.]+(-[0-9a-zA-Z\+]+)?(-[0-9a-zA-Z]+)?',
'\\1-<VERSION>-<HASH>', str)
return normalise_version__
--
GitLab