From e91f44089c3203f647d6feadb958ff5f388427bd Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Thu, 11 Mar 2021 10:45:15 +0100 Subject: [PATCH] Allow gdb version 10 in pretty printer tests. With gdb 10, the pretty printer tests are UNSUPPORTED:: The gdb version string (gdb -v) is incorrectly formatted. This is observable in: nptl/test-cond-printers, nptl/test-condattr-printers, nptl/test-mutex-printers, nptl/test-mutexattr-printers, nptl/test-rwlock-printers, nptl/test-rwlockattr-printers After updating the regexp and building with debug-info, all those tests are passing. --- scripts/test_printers_common.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/test_printers_common.py b/scripts/test_printers_common.py index 0d515891f6..34a3df6e6b 100644 --- a/scripts/test_printers_common.py +++ b/scripts/test_printers_common.py @@ -72,7 +72,8 @@ try: # The gdb version string is "GNU gdb ", where # PKGVERSION can be any text. We assume that there'll always be a space # between PKGVERSION and the version number for the sake of the regexp. - version_match = re.search(r'GNU gdb .* ([1-9]+)\.([0-9]+)', gdb_version_out) + version_match = re.search(r'GNU gdb .* ([1-9][0-9]*)\.([0-9]+)', + gdb_version_out) if not version_match: print('The gdb version string (gdb -v) is incorrectly formatted.') -- 2.43.5