[Lldb-commits] [lldb] 68cc1ee - [LLDB] Fix NativePDB/local-variables.cpp for AArch64/Windows

[Muhammad Omair Javaid via lldb-commits]

Author: Muhammad Omair Javaid
Date: 2022-07-12T16:26:47+05:00
New Revision: 68cc1eeb1d7fbcaf307fbf199a7c61debf1dd1c1

URL: https://github.com/llvm/llvm-project/commit/68cc1eeb1d7fbcaf307fbf199a7c61debf1dd1c1
DIFF: https://github.com/llvm/llvm-project/commit/68cc1eeb1d7fbcaf307fbf199a7c61debf1dd1c1.diff

LOG: [LLDB] Fix NativePDB/local-variables.cpp for AArch64/Windows

This patch fixes NativePDB/local-variables.cpp test for AArch64 Windows.
There are two changes:
1) Replace function breakpoint with line breakpoint required due to pr56288
2) Adjust "target modules dump ast" test as the output was slightly different
on AArch64/Windows.

Added: 
    

Modified: 
    lldb/test/Shell/SymbolFile/NativePDB/Inputs/local-variables.lldbinit
    lldb/test/Shell/SymbolFile/NativePDB/local-variables.cpp

Removed: 
    


################################################################################
diff  --git a/lldb/test/Shell/SymbolFile/NativePDB/Inputs/local-variables.lldbinit b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/local-variables.lldbinit
index 0d7371e86f1cb..1071edd25c92b 100644
--- a/lldb/test/Shell/SymbolFile/NativePDB/Inputs/local-variables.lldbinit
+++ b/lldb/test/Shell/SymbolFile/NativePDB/Inputs/local-variables.lldbinit
@@ -1,4 +1,4 @@
-break set -n main
+break set -f local-variables.cpp -l 17
 run a b c d e f g
 p argc
 step

diff  --git a/lldb/test/Shell/SymbolFile/NativePDB/local-variables.cpp b/lldb/test/Shell/SymbolFile/NativePDB/local-variables.cpp
index 68b23d49a31e5..4779a28c8b380 100644
--- a/lldb/test/Shell/SymbolFile/NativePDB/local-variables.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/local-variables.cpp
@@ -22,7 +22,7 @@ int main(int argc, char **argv) {
 // CHECK-NEXT: Current executable set to '{{.*}}local-variables.cpp.tmp.exe'
 // CHECK-NEXT: (lldb) command source -s 0 '{{.*}}local-variables.lldbinit'
 // CHECK-NEXT: Executing commands in '{{.*}}local-variables.lldbinit'.
-// CHECK-NEXT: (lldb) break set -n main
+// CHECK-NEXT: (lldb) break set -f local-variables.cpp -l 17
 // CHECK-NEXT: Breakpoint 1: where = local-variables.cpp.tmp.exe`main + {{.*}} at local-variables.cpp:{{.*}}, address = {{.*}}
 // CHECK-NEXT: (lldb) run a b c d e f g
 // CHECK-NEXT: Process {{.*}} stopped
@@ -158,6 +158,6 @@ int main(int argc, char **argv) {
 // CHECK-NEXT: | `-ParmVarDecl {{.*}} argv 'char **'
 // CHECK-NEXT: |-FunctionDecl {{.*}} __scrt_common_main_seh 'int ()' static 
 // CHECK-NEXT: |-FunctionDecl {{.*}} invoke_main 'int ()' inline
-// CHECK-NEXT: `-FunctionDecl {{.*}} Function 'int (int, char)'
+// CHECK: `-FunctionDecl {{.*}} Function 'int (int, char)'
 // CHECK-NEXT:   |-ParmVarDecl {{.*}} Param1 'int'
 // CHECK-NEXT:   `-ParmVarDecl {{.*}} Param2 'char'