From 13a788dc626d393e92b5b18046221e3c8e0ac7a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Sat, 17 Sep 2022 17:36:15 +0300 Subject: [PATCH] run-lldb-tests: Skip the detailed backtrace/variable checks for i686+pdb This seems to have regressed in git main, while it worked correctly still in the 15.0.0 release; see https://github.com/llvm/llvm-project/issues/57799 for details. --- run-lldb-tests.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/run-lldb-tests.sh b/run-lldb-tests.sh index 46a1f54..07c2c77 100755 --- a/run-lldb-tests.sh +++ b/run-lldb-tests.sh @@ -79,8 +79,10 @@ for exe in hello-exception-dwarf.exe hello-exception-pdb.exe hello-exception-spl if [ "$ARCH" != "armv7" ] || [ "$exe" = "hello-exception-pdb.exe" ]; then grep -q "volatile int.*NULL.*0x42" $OUT fi - if [ "$ARCH" != "armv7" ]; then - # armv7 pdb gives "val=" + if [ "$ARCH" != "armv7" ] && ([ "$ARCH" != "i686" ] || [ "$exe" != "hello-exception-pdb.exe" ]); then + # armv7 pdb gives "val=". + # i686 pdb also gives "val=" since LLDB 16 + # (see https://github.com/llvm/llvm-project/issues/57799 for details). grep -q "frame #0: .*hello-exception.*.exe.recurse(val=0) at hello-exception.cpp:" $OUT grep -q "hello-exception.*.exe.recurse(val=10) at hello-exception.cpp:" $OUT fi