[Lldb-commits] [lldb] 62e3b2e - [lldb][test] - Update test cases after yaml2obj change.

Georgii Rymar via lldb-commits lldb-commits at lists.llvm.org
Mon Nov 9 02:54:36 PST 2020


Author: Georgii Rymar
Date: 2020-11-09T13:53:40+03:00
New Revision: 62e3b2ec1d8e54d2b377623c485d5399bc94521f

URL: https://github.com/llvm/llvm-project/commit/62e3b2ec1d8e54d2b377623c485d5399bc94521f
DIFF: https://github.com/llvm/llvm-project/commit/62e3b2ec1d8e54d2b377623c485d5399bc94521f.diff

LOG: [lldb][test] - Update test cases after yaml2obj change.

The format of program header descriptions was changed by D90458.

Added: 
    

Modified: 
    lldb/test/Shell/Commands/command-disassemble-process.yaml
    lldb/test/Shell/Minidump/Inputs/basic-elf.yaml
    lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-PT_INTERP.yaml
    lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-PT_TLS.yaml
    lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-section.yaml
    lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap.yaml
    lldb/test/Shell/ObjectFile/ELF/PT_LOAD.yaml
    lldb/test/Shell/ObjectFile/ELF/PT_TLS-overlap-PT_LOAD.yaml
    lldb/test/Shell/ObjectFile/ELF/base-address.yaml
    lldb/test/Shell/ObjectFile/ELF/section-overlap.yaml
    lldb/test/Shell/SymbolFile/Breakpad/Inputs/basic-elf.yaml

Removed: 
    


################################################################################
diff  --git a/lldb/test/Shell/Commands/command-disassemble-process.yaml b/lldb/test/Shell/Commands/command-disassemble-process.yaml
index 7003b3dabfbc..e87c4761981a 100644
--- a/lldb/test/Shell/Commands/command-disassemble-process.yaml
+++ b/lldb/test/Shell/Commands/command-disassemble-process.yaml
@@ -96,14 +96,14 @@ ProgramHeaders:
     Flags: [ PF_X, PF_R ]
     VAddr: 0x4000
     Align: 0x1000
-    Sections:
-      - Section: .text
+    FirstSec: .text
+    LastSec:  .text
   - Type: PT_LOAD
     Flags: [ PF_W, PF_R ]
     VAddr: 0x5000
     Align: 0x1000
-    Sections:
-      - Section: .note.gnu.build-id
+    FirstSec: .note.gnu.build-id
+    LastSec: .note.gnu.build-id
 ...
 
 --- !minidump

diff  --git a/lldb/test/Shell/Minidump/Inputs/basic-elf.yaml b/lldb/test/Shell/Minidump/Inputs/basic-elf.yaml
index e6dc1b570f89..29cf8c93bfeb 100644
--- a/lldb/test/Shell/Minidump/Inputs/basic-elf.yaml
+++ b/lldb/test/Shell/Minidump/Inputs/basic-elf.yaml
@@ -28,13 +28,12 @@ ProgramHeaders:
     Flags: [ PF_X, PF_R ]
     VAddr: 0x4000
     Align: 0x1000
-    Sections:
-      - Section: .text
+    FirstSec: .text
+    LastSec:  .text
   - Type: PT_LOAD
     Flags: [ PF_W, PF_R ]
     VAddr: 0x5000
     Align: 0x1000
-    Sections:
-      - Section: .data
-      - Section: .note.gnu.build-id
+    FirstSec: .data
+    LastSec:  .note.gnu.build-id
 ...

diff  --git a/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-PT_INTERP.yaml b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-PT_INTERP.yaml
index 2190a0eca491..035bb65b2058 100644
--- a/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-PT_INTERP.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-PT_INTERP.yaml
@@ -39,12 +39,11 @@ ProgramHeaders:
     Flags: [ PF_R ]
     VAddr: 0x1000
     Align: 0x4
-    Sections:
-      - Section: .interp
+    FirstSec: .interp
+    LastSec:  .interp
   - Type: PT_LOAD
     Flags: [ PF_X, PF_W, PF_R ]
     VAddr: 0x1000
     Align: 0x4
-    Sections:
-      - Section: .interp
-      - Section: .text
+    FirstSec: .interp
+    LastSec:  .text

diff  --git a/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-PT_TLS.yaml b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-PT_TLS.yaml
index b1c5facf9ead..d653dd3f03bd 100644
--- a/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-PT_TLS.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-PT_TLS.yaml
@@ -53,11 +53,11 @@ ProgramHeaders:
     Flags: [ PF_R, PF_W ]
     VAddr: 0x1000
     Align: 0x4
-    Sections:
-      - Section: .tbss
+    FirstSec: .tbss
+    LastSec:  .tbss
   - Type: PT_LOAD
     Flags: [ PF_W, PF_R ]
     VAddr: 0x1000
     Align: 0x4
-    Sections:
-      - Section: .data
+    FirstSec: .data
+    LastSec:  .data

diff  --git a/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-section.yaml b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-section.yaml
index 3b7bde802ce0..a1186725ec13 100644
--- a/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-section.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap-section.yaml
@@ -62,5 +62,5 @@ ProgramHeaders:
     Flags: [ PF_X, PF_W, PF_R ]
     VAddr: 0x1008 # Modified by hand to start at 0x1006
     Align: 0x4
-    Sections:
-      - Section: .text
+    FirstSec: .text
+    LastSec:  .text

diff  --git a/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap.yaml b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap.yaml
index 87e908b378e4..da4751569d4a 100644
--- a/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD-overlap.yaml
@@ -31,12 +31,11 @@ ProgramHeaders:
     Flags: [ PF_X, PF_W, PF_R ]
     VAddr: 0x1000
     Align: 0x4
-    Sections:
-      - Section: .text
-      - Section: .data
+    FirstSec: .text
+    LastSec:  .data
   - Type: PT_LOAD
     Flags: [ PF_R, PF_W ]
     VAddr: 0x1008
     Align: 0x4
-    Sections:
-      - Section: .data
+    FirstSec: .data
+    LastSec:  .data

diff  --git a/lldb/test/Shell/ObjectFile/ELF/PT_LOAD.yaml b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD.yaml
index ee535fcc0b6c..5beab4d82f01 100644
--- a/lldb/test/Shell/ObjectFile/ELF/PT_LOAD.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/PT_LOAD.yaml
@@ -74,6 +74,5 @@ ProgramHeaders:
     Flags: [ PF_X, PF_W, PF_R ]
     VAddr: 0x1000
     Align: 0x4
-    Sections:
-      - Section: .text
-      - Section: .data
+    FirstSec: .text
+    LastSec:  .data

diff  --git a/lldb/test/Shell/ObjectFile/ELF/PT_TLS-overlap-PT_LOAD.yaml b/lldb/test/Shell/ObjectFile/ELF/PT_TLS-overlap-PT_LOAD.yaml
index c4f8f2431460..ea711ec2197f 100644
--- a/lldb/test/Shell/ObjectFile/ELF/PT_TLS-overlap-PT_LOAD.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/PT_TLS-overlap-PT_LOAD.yaml
@@ -53,11 +53,11 @@ ProgramHeaders:
     Flags: [ PF_W, PF_R ]
     VAddr: 0x1000
     Align: 0x4
-    Sections:
-      - Section: .data
+    FirstSec: .data
+    LastSec:  .data
   - Type: PT_TLS
     Flags: [ PF_R, PF_W ]
     VAddr: 0x1000
     Align: 0x4
-    Sections:
-      - Section: .tbss
+    FirstSec: .tbss
+    LastSec:  .tbss

diff  --git a/lldb/test/Shell/ObjectFile/ELF/base-address.yaml b/lldb/test/Shell/ObjectFile/ELF/base-address.yaml
index a16347f4d303..97bc788d96ba 100644
--- a/lldb/test/Shell/ObjectFile/ELF/base-address.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/base-address.yaml
@@ -28,7 +28,6 @@ ProgramHeaders:
     Flags: [ PF_X, PF_R ]
     VAddr: 0x400000
     Align: 0x200000
-    Sections:
-      - Section: .pad
-      - Section: .text
+    FirstSec: .pad
+    LastSec:  .text
 ...

diff  --git a/lldb/test/Shell/ObjectFile/ELF/section-overlap.yaml b/lldb/test/Shell/ObjectFile/ELF/section-overlap.yaml
index dcf3055a526e..ffea3adbdeec 100644
--- a/lldb/test/Shell/ObjectFile/ELF/section-overlap.yaml
+++ b/lldb/test/Shell/ObjectFile/ELF/section-overlap.yaml
@@ -46,6 +46,5 @@ ProgramHeaders:
     Flags: [ PF_X, PF_W, PF_R ]
     VAddr: 0x1000
     Align: 0x4
-    Sections:
-      - Section: .sect1
-      - Section: .overlap1
+    FirstSec: .sect1
+    LastSec:  .overlap1

diff  --git a/lldb/test/Shell/SymbolFile/Breakpad/Inputs/basic-elf.yaml b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/basic-elf.yaml
index a9649fff30c9..e3515e9172fb 100644
--- a/lldb/test/Shell/SymbolFile/Breakpad/Inputs/basic-elf.yaml
+++ b/lldb/test/Shell/SymbolFile/Breakpad/Inputs/basic-elf.yaml
@@ -25,7 +25,6 @@ ProgramHeaders:
     Flags: [ PF_X, PF_R ]
     VAddr: 0x400000
     Align: 0x1000
-    Sections:
-      - Section: .text1
-      - Section: .text2
+    FirstSec: .text1
+    LastSec:  .text2
 ...


        


More information about the lldb-commits mailing list