From f92b90133d7e2e473df0ac57469d19dca56742e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 20 Sep 2022 23:52:47 +0300 Subject: [PATCH] Revert "run-lldb-tests: Skip the detailed backtrace/variable checks for i686+pdb" Since d4514b155337f013022c6e989d3e6b7183a8b80e in llvm-project (Sep 20th), the pdb reading regression has been fixed. This reverts commit 13a788dc626d393e92b5b18046221e3c8e0ac7a7. --- run-lldb-tests.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/run-lldb-tests.sh b/run-lldb-tests.sh index 07c2c77..9570d18 100755 --- a/run-lldb-tests.sh +++ b/run-lldb-tests.sh @@ -79,10 +79,8 @@ 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" ] && ([ "$ARCH" != "i686" ] || [ "$exe" != "hello-exception-pdb.exe" ]); then + if [ "$ARCH" != "armv7" ]; 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