llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-lldb Author: Aiden Grossman (boomanaiden154) <details> <summary>Changes</summary> %T has been deprecated for about seven years, mostly because it is not unique to each test which can lead to races. This patch updates the few remaining tests in lldb that use %T to not use it (either directly using files or creating their own temp dir). The eventual goal is to remove support for %T from llvm-lit given few tests use it and it still has racey behavior. This patch errors on the side of creating new temp dirs even when not strictly necessary to avoid needing to update filenames inside filecheck matchers. --- Patch is 32.53 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/151343.diff 31 Files Affected: - (modified) lldb/test/Shell/Commands/command-disassemble-process.yaml (+6-5) - (modified) lldb/test/Shell/Commands/command-image-lookup.yaml (+5-4) - (modified) lldb/test/Shell/Minidump/Windows/arm-fp-unwind.test (+5-4) - (modified) lldb/test/Shell/Minidump/Windows/broken-unwind.test (+5-4) - (modified) lldb/test/Shell/Minidump/Windows/find-module.test (+7-6) - (modified) lldb/test/Shell/Minidump/memory-region-from-module.yaml (+3-3) - (modified) lldb/test/Shell/ObjectFile/Breakpad/uuid-matching-mac.test (+3-2) - (modified) lldb/test/Shell/ObjectFile/ELF/minidebuginfo-set-and-hit-breakpoint.test (+2-2) - (modified) lldb/test/Shell/SymbolFile/Breakpad/inline-record.test (+3-2) - (modified) lldb/test/Shell/SymbolFile/Breakpad/line-table-discontinuous-file-ids.test (+3-2) - (modified) lldb/test/Shell/SymbolFile/Breakpad/line-table-edgecases.test (+3-2) - (modified) lldb/test/Shell/SymbolFile/Breakpad/line-table-missing-file.test (+3-2) - (modified) lldb/test/Shell/SymbolFile/Breakpad/line-table-mixed-path-styles.test (+3-2) - (modified) lldb/test/Shell/SymbolFile/Breakpad/line-table.test (+3-2) - (modified) lldb/test/Shell/SymbolFile/Breakpad/symtab-macho.test (+3-2) - (modified) lldb/test/Shell/SymbolFile/Breakpad/symtab-sorted-by-size.test (+3-2) - (modified) lldb/test/Shell/SymbolFile/Breakpad/symtab.test (+3-2) - (modified) lldb/test/Shell/SymbolFile/Breakpad/unwind-via-stack-win-no-memory-info.yaml (+3-2) - (modified) lldb/test/Shell/SymbolFile/DWARF/dwo-missing-error.test (-1) - (modified) lldb/test/Shell/SymbolFile/DWARF/dwo-relative-path.s (+4-3) - (modified) lldb/test/Shell/SymbolFile/DWARF/x86/debug_loclists-dwo.s (+2-1) - (modified) lldb/test/Shell/SymbolFile/DWARF/x86/debug_rnglists-dwo.s (+2-1) - (modified) lldb/test/Shell/SymbolFile/DWARF/x86/dwo-type-in-main-file.s (-1) - (modified) lldb/test/Shell/SymbolFile/PDB/class-layout.test (+13-12) - (modified) lldb/test/Shell/SymbolFile/PDB/compilands.test (+5-4) - (modified) lldb/test/Shell/SymbolFile/PDB/enums-layout.test (+8-7) - (modified) lldb/test/Shell/SymbolFile/PDB/func-symbols.test (+4-3) - (modified) lldb/test/Shell/SymbolFile/PDB/pointers.test (+8-7) - (modified) lldb/test/Shell/SymbolFile/PDB/type-quals.test (+4-3) - (modified) lldb/test/Shell/SymbolFile/PDB/typedefs.test (+3-2) - (modified) lldb/test/Shell/SymbolFile/PDB/variables.test (+9-8) ``````````diff diff --git a/lldb/test/Shell/Commands/command-disassemble-process.yaml b/lldb/test/Shell/Commands/command-disassemble-process.yaml index ce1b37bc8aea7..931e0b93e3b67 100644 --- a/lldb/test/Shell/Commands/command-disassemble-process.yaml +++ b/lldb/test/Shell/Commands/command-disassemble-process.yaml @@ -1,19 +1,20 @@ # REQUIRES: x86 -# RUN: yaml2obj --docnum=1 -DMAIN_SIZE=8 %s -o %T/command-disassemble-process.exe -# RUN: yaml2obj --docnum=1 -DMAIN_SIZE=8000 %s -o %T/command-disassemble-process.big.exe +# RUN: mkdir -p %t.dir +# RUN: yaml2obj --docnum=1 -DMAIN_SIZE=8 %s -o %t.dir/command-disassemble-process.exe +# RUN: yaml2obj --docnum=1 -DMAIN_SIZE=8000 %s -o %t.dir/command-disassemble-process.big.exe # RUN: yaml2obj --docnum=2 %s -o %t -# RUN: %lldb -c %t %T/command-disassemble-process.exe \ +# RUN: %lldb -c %t %t.dir/command-disassemble-process.exe \ # RUN: -o "settings set interpreter.stop-command-source-on-error false" \ # RUN: -s %S/Inputs/command-disassemble-process.lldbinit -o exit \ # RUN: | FileCheck %s -# RUN: %lldb -c %t %T/command-disassemble-process.big.exe \ +# RUN: %lldb -c %t %t.dir/command-disassemble-process.big.exe \ # RUN: -o "settings set stop-disassembly-max-size 8000" \ # RUN: -o disassemble -o exit 2>&1 | FileCheck %s --check-prefix=BIG -# RUN: %lldb -c %t %T/command-disassemble-process.exe \ +# RUN: %lldb -c %t %t.dir/command-disassemble-process.exe \ # RUN: -o "settings set interpreter.stop-command-source-on-error false" \ # RUN: -o "disassemble --address 0xdead" -o exit 2>&1 \ # RUN: | FileCheck %s --check-prefix=INVALID diff --git a/lldb/test/Shell/Commands/command-image-lookup.yaml b/lldb/test/Shell/Commands/command-image-lookup.yaml index cf7be930517ee..fc12b99eab589 100644 --- a/lldb/test/Shell/Commands/command-image-lookup.yaml +++ b/lldb/test/Shell/Commands/command-image-lookup.yaml @@ -1,7 +1,8 @@ -# RUN: yaml2obj %s -o %T/a.out -# RUN: %lldb %T/a.out -o "image lookup --verbose --address 0x0000000100003fa1" -o exit | FileCheck %s --check-prefix=NOINLINE -# RUN: %lldb %T/a.out -o "image lookup --verbose --address 0x0000000100003fa2" -o exit | FileCheck %s --check-prefix=INLINE_1 -# RUN: %lldb %T/a.out -o "image lookup --verbose --address 0x0000000100003fa8" -o exit | FileCheck %s --check-prefix=INLINE_2 +# RUN: mkdir -p %t.dir +# RUN: yaml2obj %s -o %t.dir/a.out +# RUN: %lldb %t.dir/a.out -o "image lookup --verbose --address 0x0000000100003fa1" -o exit | FileCheck %s --check-prefix=NOINLINE +# RUN: %lldb %t.dir/a.out -o "image lookup --verbose --address 0x0000000100003fa2" -o exit | FileCheck %s --check-prefix=INLINE_1 +# RUN: %lldb %t.dir/a.out -o "image lookup --verbose --address 0x0000000100003fa8" -o exit | FileCheck %s --check-prefix=INLINE_2 # NOINLINE: Summary: a.out`main + 33 at main.cpp:10 # NOINLINE-NEXT: Module: file = diff --git a/lldb/test/Shell/Minidump/Windows/arm-fp-unwind.test b/lldb/test/Shell/Minidump/Windows/arm-fp-unwind.test index 7c056b612a4e1..ec7002790fb48 100644 --- a/lldb/test/Shell/Minidump/Windows/arm-fp-unwind.test +++ b/lldb/test/Shell/Minidump/Windows/arm-fp-unwind.test @@ -2,10 +2,11 @@ Test that unwind plans use the frame pointer register correctly. REQUIRES: arm -RUN: yaml2obj %S/Inputs/arm-fp-unwind.exe.yaml -o %T/arm-fp-unwind.exe -RUN: yaml2obj %S/Inputs/arm-fp-unwind.dmp.yaml -o %T/arm-fp-unwind.dmp -RUN: %lldb -O "settings set target.exec-search-paths %T" \ -RUN: -c %T/arm-fp-unwind.dmp -o "image show-unwind -a 0x00c71010" -b \ +RUN: mkdir -p %t.dir +RUN: yaml2obj %S/Inputs/arm-fp-unwind.exe.yaml -o %t.dir/arm-fp-unwind.exe +RUN: yaml2obj %S/Inputs/arm-fp-unwind.dmp.yaml -o %t.dir/arm-fp-unwind.dmp +RUN: %lldb -O "settings set target.exec-search-paths %t.dir" \ +RUN: -c %t.dir/arm-fp-unwind.dmp -o "image show-unwind -a 0x00c71010" -b \ RUN: | FileCheck %s CHECK: Assembly language inspection UnwindPlan: diff --git a/lldb/test/Shell/Minidump/Windows/broken-unwind.test b/lldb/test/Shell/Minidump/Windows/broken-unwind.test index 464624b3fc248..d8e18662679db 100644 --- a/lldb/test/Shell/Minidump/Windows/broken-unwind.test +++ b/lldb/test/Shell/Minidump/Windows/broken-unwind.test @@ -1,7 +1,8 @@ Test that we can cope with broken unwind information that suggests reading out of bounds. -RUN: yaml2obj %S/Inputs/broken-unwind.exe.yaml -o %T/broken-unwind.exe -RUN: yaml2obj %S/Inputs/broken-unwind.dmp.yaml -o %T/broken-unwind.dmp -RUN: %lldb -O "settings set target.exec-search-paths %T" \ -RUN: -c %T/broken-unwind.dmp -o "image show-unwind -a 0xb1000" -o exit +RUN: mkdir -p %t.dir +RUN: yaml2obj %S/Inputs/broken-unwind.exe.yaml -o %t.dir/broken-unwind.exe +RUN: yaml2obj %S/Inputs/broken-unwind.dmp.yaml -o %t.dir/broken-unwind.dmp +RUN: %lldb -O "settings set target.exec-search-paths %t.dir" \ +RUN: -c %t.dir/broken-unwind.dmp -o "image show-unwind -a 0xb1000" -o exit diff --git a/lldb/test/Shell/Minidump/Windows/find-module.test b/lldb/test/Shell/Minidump/Windows/find-module.test index 39d9dab4d346d..724d5247d6599 100644 --- a/lldb/test/Shell/Minidump/Windows/find-module.test +++ b/lldb/test/Shell/Minidump/Windows/find-module.test @@ -3,18 +3,19 @@ use it when opening minidumps. XFAIL: system-windows && remote-linux -RUN: yaml2obj %S/Inputs/find-module.exe.yaml -o %T/find-module.exe -RUN: yaml2obj %S/Inputs/find-module.dmp.yaml -o %T/find-module.dmp -RUN: %lldb -O "settings set target.exec-search-paths %T" \ -RUN: -c %T/find-module.dmp -o "image dump objfile" -o "target list" -o exit \ +RUN: mkdir -p %t.dir +RUN: yaml2obj %S/Inputs/find-module.exe.yaml -o %t.dir/find-module.exe +RUN: yaml2obj %S/Inputs/find-module.dmp.yaml -o %t.dir/find-module.dmp +RUN: %lldb -O "settings set target.exec-search-paths %t.dir" \ +RUN: -c %t.dir/find-module.dmp -o "image dump objfile" -o "target list" -o exit \ RUN: | FileCheck --check-prefix=DEFAULT %s RUN: %lldb -O "settings set plugin.object-file.pe-coff.abi msvc" \ -RUN: -O "settings set target.exec-search-paths %T" -c %T/find-module.dmp \ +RUN: -O "settings set target.exec-search-paths %t.dir" -c %t.dir/find-module.dmp \ RUN: -o "target list" -o exit | FileCheck --check-prefix=MSVC %s RUN: %lldb -O "settings set plugin.object-file.pe-coff.abi gnu" \ -RUN: -O "settings set target.exec-search-paths %T" -c %T/find-module.dmp \ +RUN: -O "settings set target.exec-search-paths %t.dir" -c %t.dir/find-module.dmp \ RUN: -o "target list" -o exit | FileCheck --check-prefix=GNU %s DEFAULT-LABEL: image dump objfile diff --git a/lldb/test/Shell/Minidump/memory-region-from-module.yaml b/lldb/test/Shell/Minidump/memory-region-from-module.yaml index 3ebc03c23423c..bc8c8995ad93f 100644 --- a/lldb/test/Shell/Minidump/memory-region-from-module.yaml +++ b/lldb/test/Shell/Minidump/memory-region-from-module.yaml @@ -3,14 +3,14 @@ # RUN: yaml2obj --docnum=1 %s -o %t1.dmp # RUN: yaml2obj --docnum=2 %s -o %t2.dmp -# RUN: yaml2obj %S/Inputs/basic-elf.yaml -o %T/memory-region-from-module.exe +# RUN: yaml2obj %S/Inputs/basic-elf.yaml -o %t.memory-region-from-module.exe -# RUN: %lldb -b -c %t1.dmp %T/memory-region-from-module.exe \ +# RUN: %lldb -b -c %t1.dmp %t.memory-region-from-module.exe \ # RUN: -o "memory region 0" -o "memory region 0x4000" \ # RUN: -o "memory region 0x5000" -o "memory region 0x6000" \ # RUN: | FileCheck --check-prefix=ALL --check-prefix=CHECK1 %s -# RUN: %lldb -b -c %t2.dmp %T/memory-region-from-module.exe \ +# RUN: %lldb -b -c %t2.dmp %t.memory-region-from-module.exe \ # RUN: -o "memory region 0" -o "memory region 0x4000" \ # RUN: -o "memory region 0x5000" -o "memory region 0x6000" \ # RUN: | FileCheck --check-prefix=ALL --check-prefix=CHECK2 %s diff --git a/lldb/test/Shell/ObjectFile/Breakpad/uuid-matching-mac.test b/lldb/test/Shell/ObjectFile/Breakpad/uuid-matching-mac.test index f2dd2e563127a..26899ea1c4c4e 100644 --- a/lldb/test/Shell/ObjectFile/Breakpad/uuid-matching-mac.test +++ b/lldb/test/Shell/ObjectFile/Breakpad/uuid-matching-mac.test @@ -1,6 +1,7 @@ -# RUN: yaml2obj %S/Inputs/uuid-matching-mac.yaml -o %T/uuid-matching-mac.out +# RUN: mkdir -p %t.dir +# RUN: yaml2obj %S/Inputs/uuid-matching-mac.yaml -o %t.dir/uuid-matching-mac.out # RUN: cd %S -# RUN: %lldb %T/uuid-matching-mac.out -s %s -o exit | FileCheck %s +# RUN: %lldb %t.dir/uuid-matching-mac.out -s %s -o exit | FileCheck %s target symbols add Inputs/uuid-matching-mac.syms # CHECK-LABEL: target symbols add diff --git a/lldb/test/Shell/ObjectFile/ELF/minidebuginfo-set-and-hit-breakpoint.test b/lldb/test/Shell/ObjectFile/ELF/minidebuginfo-set-and-hit-breakpoint.test index a9650614674ea..0ffc51a59db30 100644 --- a/lldb/test/Shell/ObjectFile/ELF/minidebuginfo-set-and-hit-breakpoint.test +++ b/lldb/test/Shell/ObjectFile/ELF/minidebuginfo-set-and-hit-breakpoint.test @@ -2,8 +2,8 @@ # We want to keep the symbol "multiplyByThree" in the .dynamic section and not # have it put the default .symtab section. -# RUN: echo "{multiplyByThree;};" > %T/dynmic-symbols.txt -# RUN: %clang_host -Wl,--dynamic-list=%T/dynmic-symbols.txt -g -o %t.binary %p/Inputs/minidebuginfo-main.c +# RUN: echo "{multiplyByThree;};" > %t.dynmic-symbols.txt +# RUN: %clang_host -Wl,--dynamic-list=%t.dynmic-symbols.txt -g -o %t.binary %p/Inputs/minidebuginfo-main.c # The following section is adapted from GDB's official documentation: # http://sourceware.org/gdb/current/onlinedocs/gdb/MiniDebugInfo.html#MiniDebugInfo diff --git a/lldb/test/Shell/SymbolFile/Breakpad/inline-record.test b/lldb/test/Shell/SymbolFile/Breakpad/inline-record.test index 280fc96130a51..614a13bef5f3d 100644 --- a/lldb/test/Shell/SymbolFile/Breakpad/inline-record.test +++ b/lldb/test/Shell/SymbolFile/Breakpad/inline-record.test @@ -1,5 +1,6 @@ -# RUN: yaml2obj %S/Inputs/basic-elf.yaml -o %T/inline-record.out -# RUN: %lldb %T/inline-record.out -o "target symbols add -s inline-record.out %S/Inputs/inline-record.syms" \ +# RUN: mkdir -p %t.dir +# RUN: yaml2obj %S/Inputs/basic-elf.yaml -o %t.dir/inline-record.out +# RUN: %lldb %t.dir/inline-record.out -o "target symbols add -s inline-record.out %S/Inputs/inline-record.syms" \ # RUN: -s %s | FileCheck --match-full-lines %s # CHECK-LABEL: (lldb) image lookup -a 0x400010 -v diff --git a/lldb/test/Shell/SymbolFile/Breakpad/line-table-discontinuous-file-ids.test b/lldb/test/Shell/SymbolFile/Breakpad/line-table-discontinuous-file-ids.test index 0780cab7b2397..3b4e046e6674d 100644 --- a/lldb/test/Shell/SymbolFile/Breakpad/line-table-discontinuous-file-ids.test +++ b/lldb/test/Shell/SymbolFile/Breakpad/line-table-discontinuous-file-ids.test @@ -1,7 +1,8 @@ # Test that we handle files which has gaps in the FILE record IDs. -# RUN: yaml2obj %S/Inputs/basic-elf.yaml -o %T/line-table-discontinuous-file-ids.out -# RUN: %lldb %T/line-table-discontinuous-file-ids.out \ +# RUN: mkdir -p %t.dir +# RUN: yaml2obj %S/Inputs/basic-elf.yaml -o %t.dir/line-table-discontinuous-file-ids.out +# RUN: %lldb %t.dir/line-table-discontinuous-file-ids.out \ # RUN: -o "target symbols add -s line-table-discontinuous-file-ids.out %S/Inputs/line-table-discontinuous-file-ids.syms" \ # RUN: -s %s -o exit | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/Breakpad/line-table-edgecases.test b/lldb/test/Shell/SymbolFile/Breakpad/line-table-edgecases.test index 805f28034b87a..f1c631f5d3485 100644 --- a/lldb/test/Shell/SymbolFile/Breakpad/line-table-edgecases.test +++ b/lldb/test/Shell/SymbolFile/Breakpad/line-table-edgecases.test @@ -2,8 +2,9 @@ # input contains a LINE record which does not belong to any function as well as # a FUNC record without any LINE records. -# RUN: yaml2obj %S/Inputs/basic-elf.yaml -o %T/line-table-edgecases.out -# RUN: %lldb %T/line-table-edgecases.out \ +# RUN: mkdir -p %t.dir +# RUN: yaml2obj %S/Inputs/basic-elf.yaml -o %t.dir/line-table-edgecases.out +# RUN: %lldb %t.dir/line-table-edgecases.out \ # RUN: -o "target symbols add -s line-table-edgecases.out %S/Inputs/line-table-edgecases.syms" \ # RUN: -s %s -o exit | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/Breakpad/line-table-missing-file.test b/lldb/test/Shell/SymbolFile/Breakpad/line-table-missing-file.test index 1018d02c98943..e9e1ef45cf269 100644 --- a/lldb/test/Shell/SymbolFile/Breakpad/line-table-missing-file.test +++ b/lldb/test/Shell/SymbolFile/Breakpad/line-table-missing-file.test @@ -3,8 +3,9 @@ # Right now, "something reasonable" means creating a line entry with an empty # file. -# RUN: yaml2obj %S/Inputs/basic-elf.yaml -o %T/line-table-missing-file.out -# RUN: %lldb %T/line-table-missing-file.out \ +# RUN: mkdir -p %t.dir +# RUN: yaml2obj %S/Inputs/basic-elf.yaml -o %t.dir/line-table-missing-file.out +# RUN: %lldb %t.dir/line-table-missing-file.out \ # RUN: -o "target symbols add -s line-table-missing-file.out %S/Inputs/line-table-missing-file.syms" \ # RUN: -s %s -o exit | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/Breakpad/line-table-mixed-path-styles.test b/lldb/test/Shell/SymbolFile/Breakpad/line-table-mixed-path-styles.test index cb3349ff193b0..c299c46e77cf7 100644 --- a/lldb/test/Shell/SymbolFile/Breakpad/line-table-mixed-path-styles.test +++ b/lldb/test/Shell/SymbolFile/Breakpad/line-table-mixed-path-styles.test @@ -1,5 +1,6 @@ -# RUN: yaml2obj %S/Inputs/basic-elf.yaml -o %T/line-table-mixed-path-styles.out -# RUN: %lldb %T/line-table-mixed-path-styles.out \ +# RUN: mkdir -p %t.dir +# RUN: yaml2obj %S/Inputs/basic-elf.yaml -o %t.dir/line-table-mixed-path-styles.out +# RUN: %lldb %t.dir/line-table-mixed-path-styles.out \ # RUN: -o "target symbols add -s line-table-mixed-path-styles.out %S/Inputs/line-table-mixed-path-styles.syms" \ # RUN: -s %s -o exit | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/Breakpad/line-table.test b/lldb/test/Shell/SymbolFile/Breakpad/line-table.test index 2099571e17113..c0c6e901ed6b1 100644 --- a/lldb/test/Shell/SymbolFile/Breakpad/line-table.test +++ b/lldb/test/Shell/SymbolFile/Breakpad/line-table.test @@ -1,5 +1,6 @@ -# RUN: yaml2obj %S/Inputs/basic-elf.yaml -o %T/line-table.out -# RUN: %lldb %T/line-table.out -o "target symbols add -s line-table.out %S/Inputs/line-table.syms" \ +# RUN: mkdir -p %t.dir +# RUN: yaml2obj %S/Inputs/basic-elf.yaml -o %t.dir/line-table.out +# RUN: %lldb %t.dir/line-table.out -o "target symbols add -s line-table.out %S/Inputs/line-table.syms" \ # RUN: -s %s -o exit | FileCheck %s # We create a compile unit for each function. The compile unit name is the first diff --git a/lldb/test/Shell/SymbolFile/Breakpad/symtab-macho.test b/lldb/test/Shell/SymbolFile/Breakpad/symtab-macho.test index ebfc31cc40d2a..90f3c53c1e903 100644 --- a/lldb/test/Shell/SymbolFile/Breakpad/symtab-macho.test +++ b/lldb/test/Shell/SymbolFile/Breakpad/symtab-macho.test @@ -1,5 +1,6 @@ -# RUN: yaml2obj %S/Inputs/basic-macho.yaml -o %T/symtab-macho.out -# RUN: %lldb %T/symtab-macho.out -o "target symbols add %S/Inputs/symtab-macho.syms" \ +# RUN: mkdir -p %t.dir +# RUN: yaml2obj %S/Inputs/basic-macho.yaml -o %t.dir/symtab-macho.out +# RUN: %lldb %t.dir/symtab-macho.out -o "target symbols add %S/Inputs/symtab-macho.syms" \ # RUN: -s %s | FileCheck %s image dump symtab symtab-macho.out diff --git a/lldb/test/Shell/SymbolFile/Breakpad/symtab-sorted-by-size.test b/lldb/test/Shell/SymbolFile/Breakpad/symtab-sorted-by-size.test index 00e04eb39a98e..5aedbb4336820 100644 --- a/lldb/test/Shell/SymbolFile/Breakpad/symtab-sorted-by-size.test +++ b/lldb/test/Shell/SymbolFile/Breakpad/symtab-sorted-by-size.test @@ -1,5 +1,6 @@ -# RUN: yaml2obj %S/Inputs/basic-elf.yaml -o %T/symtab-sorted-by-size.out -# RUN: %lldb %T/symtab-sorted-by-size.out -o "target symbols add -s symtab-sorted-by-size.out %S/Inputs/symtab.syms" \ +# RUN: mkdir -p %t.dir +# RUN: yaml2obj %S/Inputs/basic-elf.yaml -o %t.dir/symtab-sorted-by-size.out +# RUN: %lldb %t.dir/symtab-sorted-by-size.out -o "target symbols add -s symtab-sorted-by-size.out %S/Inputs/symtab.syms" \ # RUN: -s %s | FileCheck %s # CHECK: num_symbols = 4 (sorted by size): diff --git a/lldb/test/Shell/SymbolFile/Breakpad/symtab.test b/lldb/test/Shell/SymbolFile/Breakpad/symtab.test index a32eb5808426f..0187ba3c3781f 100644 --- a/lldb/test/Shell/SymbolFile/Breakpad/symtab.test +++ b/lldb/test/Shell/SymbolFile/Breakpad/symtab.test @@ -1,5 +1,6 @@ -# RUN: yaml2obj %S/Inputs/basic-elf.yaml -o %T/symtab.out -# RUN: %lldb %T/symtab.out -o "target symbols add -s symtab.out %S/Inputs/symtab.syms" \ +# RUN: mkdir -p %t.dir +# RUN: yaml2obj %S/Inputs/basic-elf.yaml -o %t.dir/symtab.out +# RUN: %lldb %t.dir/symtab.out -o "target symbols add -s symtab.out %S/Inputs/symtab.syms" \ # RUN: -s %s | FileCheck %s # CHECK-LABEL: (lldb) image dump symtab symtab.out diff --git a/lldb/test/Shell/SymbolFile/Breakpad/unwind-via-stack-win-no-memory-info.yaml b/lldb/test/Shell/SymbolFile/Breakpad/unwind-via-stack-win-no-memory-info.yaml index 8981c84e43c6f..fbf7c14949e59 100644 --- a/lldb/test/Shell/SymbolFile/Breakpad/unwind-via-stack-win-no-memory-info.yaml +++ b/lldb/test/Shell/SymbolFile/Breakpad/unwind-via-stack-win-no-memory-info.yaml @@ -1,8 +1,9 @@ # REQUIRES: x86 # RUN: yaml2obj --docnum=1 %s -o %t.dmp -# RUN: yaml2obj --docnum=2 %s -o %T/unwind-via-stack-win-no-memory-info.exe -# RUN: %lldb -c %t.dmp %T/unwind-via-stack-win-no-memory-info.exe \ +# RUN: mkdir -p %t.dir +# RUN: yaml2obj --docnum=2 %s -o %t.dir/unwind-via-stack-win-no-memory-info.exe +# RUN: %lldb -c %t.dmp %t.dir/unwind-via-stack-win-no-memory-info.exe \ # RUN: -o "target symbols add %S/Inputs/unwind-via-raSearch.syms" \ # RUN: -o "thread backtrace" -b | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/DWARF/dwo-missing-error.test b/lldb/test/Shell/SymbolFile/DWARF/dwo-missing-error.test index 4f7e70e36f719..2805bbb5df7de 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/dwo-missing-error.test +++ b/lldb/test/Shell/SymbolFile/DWARF/dwo-missing-error.test @@ -9,7 +9,6 @@ # Creating and compiling to %t.compdir makes it easy to remove the dwo files. # DW_AT_comp_dir should be "./a/b/", and DW_AT_dwo_name should be # "a.out-dwo-missing-error.dwo". -# since %T is deprecated. # RUN: rm -rf %t.compdir/ # RUN: mkdir -p %t.compdir/a/b/ # RUN: cd %t.compdir/a/b/ diff --git a/lldb/test/Shell/SymbolFile/DWARF/dwo-relative-path.s b/lldb/test/Shell/SymbolFile/DWARF/dwo-relative-path.s index f3d44576532bf..2c9c5841ae196 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/dwo-relative-path.s +++ b/lldb/test/Shell/SymbolFile/DWARF/dwo-relative-path.s @@ -3,12 +3,13 @@ # REQUIRES: x86 -# RUN: llvm-mc --filetype=obj --triple x86_64-pc-linux %s -o %t.o -# RUN: llvm-objcopy --split-dwo=%T/dwo-relative-path.dwo %t.o +# RUN: mkdir -p %t.dir +# RUN: llvm-mc --filetype=obj --triple x86_64-pc-linux %s -o %t.dir/obj.o +# RUN: llvm-objcopy --split-dwo=%t.dir/dwo-relative-path.dwo %t.dir/obj.o # RUN: cd ../.. -# RUN: %lldb %t.o -o "target var x" -b 2>&1 | FileCheck %s +# RUN: %lldb %t.dir/obj.o -o "target var x" -b 2>&1 | FileCheck %s # CHECK: x = 10 diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/debug_loclists-dwo.s b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_loclists-dwo.s index 393c045456304..b67c0015e6da5 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/debug_loclists-dwo.s +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_loclists-dwo.s @@ -1,4 +1,5 @@ -# RUN: cd %T +# RUN: mkdir -p %t.dir +# RUN: cd %t.dir # RUN: llvm-mc -triple=x86_64-pc-linux -filetype=obj %s >debug_loclists-dwo.o # RUN: %lldb debug_loclists-dwo.o -o "image lookup -v -s lookup_loclists" -o exit | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/debug_rnglists-dwo.s b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_rnglists-dwo.s index edc83450495c3..7089be18ffd38 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/debug_rnglists-dwo.s +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_rnglists-dwo.s @@ -1,4 +1,5 @@ -# RUN: cd %T +# RUN: mkdir -p %t.dir +# RUN: cd %t.dir # RUN: llvm-mc -triple=x86_64-pc-linux -filetype=obj %s >debug_rnglists-dwo.o # RUN: %lldb debug_rnglists-dwo.o -o "image lookup -v -s lookup_rnglists" \ # RUN: -o exit | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/dwo-type-in-main-file.s b/lldb/test/Shell/SymbolFile/DWARF/x86/dwo-type-in-main-file.s index 6c639128a5ecf..ea30ace195cfb 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/dwo-type-in-main-file.s +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dwo-type-in-main-file.s @@ -4,7 ... [truncated] `````````` </details> https://github.com/llvm/llvm-project/pull/151343 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits