From 2aa1e7cc67feb634cc25d6d32e2cb32f0988a886 Mon Sep 17 00:00:00 2001 From: makise-homura Date: Thu, 22 Aug 2024 22:41:22 +0300 Subject: [PATCH] Correctly deal with abi::__cxa_demangle() on LCC abi::__cxa_demangle("7MyArrayIbLi42EE", nullptr, nullptr, nullptr) returns "MyArray" on GCC/x86_64, but "MyArray" on LCC/e2k. This behavior causes googletest-list-tests-unittest test to fail. This commit fixes that by slightly modifying the regex to match this behavior of abi::__cxa_demangle(). --- googletest/test/googletest-list-tests-unittest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/googletest/test/googletest-list-tests-unittest.py b/googletest/test/googletest-list-tests-unittest.py index 977e57f0..2283eb91 100755 --- a/googletest/test/googletest-list-tests-unittest.py +++ b/googletest/test/googletest-list-tests-unittest.py @@ -74,7 +74,7 @@ TypedTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\. TypedTest/1\. # TypeParam = int\s*\*( __ptr64)? TestA TestB -TypedTest/2\. # TypeParam = .*MyArray +TypedTest/2\. # TypeParam = .*MyArray TestA TestB My/TypeParamTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\. @@ -83,7 +83,7 @@ My/TypeParamTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\. My/TypeParamTest/1\. # TypeParam = int\s*\*( __ptr64)? TestA TestB -My/TypeParamTest/2\. # TypeParam = .*MyArray +My/TypeParamTest/2\. # TypeParam = .*MyArray TestA TestB MyInstantiation/ValueParamTest\.