https://github.com/dzhidzhoev updated https://github.com/llvm/llvm-project/pull/115716
>From 306cf0dd5a6ccb80a1ec530b1753f6fa8d538715 Mon Sep 17 00:00:00 2001 From: Vladislav Dzhidzhoev <vdzhidzh...@accesssoftek.com> Date: Thu, 29 Aug 2024 16:27:25 +0000 Subject: [PATCH 1/3] [lldb][test] Fix remote Shell tests failures on Windows host. These tests should be now disabled on Windows target instead of Windows host, since remote run of Shell tests was added. This should fix failures on https://lab.llvm.org/staging/#/builders/197/builds/76. --- lldb/test/Shell/Commands/command-disassemble-mixed.c | 2 +- .../test/Shell/Commands/command-target-create-resolve-exe.test | 2 +- lldb/test/Shell/Expr/TestIRMemoryMapWindows.test | 2 +- lldb/test/Shell/Process/Windows/exception_access_violation.cpp | 2 +- lldb/test/Shell/Process/Windows/process_load.cpp | 2 +- lldb/test/Shell/SymbolFile/DWARF/packed.cpp | 2 +- lldb/test/Shell/SymbolFile/NativePDB/local-variables.cpp | 2 +- lldb/test/Shell/SymbolFile/NativePDB/stack_unwinding01.cpp | 2 +- lldb/test/Shell/SymbolFile/PDB/calling-conventions-arm.test | 2 +- lldb/test/Shell/SymbolFile/PDB/class-layout.test | 2 +- lldb/test/Shell/SymbolFile/PDB/compilands.test | 2 +- lldb/test/Shell/SymbolFile/PDB/expressions.test | 2 +- lldb/test/Shell/SymbolFile/PDB/func-symbols.test | 2 +- lldb/test/Shell/SymbolFile/PDB/function-level-linking.test | 2 +- lldb/test/Shell/SymbolFile/PDB/pointers.test | 2 +- lldb/test/Shell/SymbolFile/PDB/type-quals.test | 2 +- lldb/test/Shell/SymbolFile/PDB/udt-layout.test | 2 +- lldb/test/Shell/SymbolFile/PDB/variables-locations.test | 2 +- lldb/test/Shell/SymbolFile/PDB/vbases.test | 2 +- lldb/test/Shell/Target/dependent-modules-nodupe-windows.test | 2 +- lldb/test/Shell/lit.cfg.py | 3 +++ 21 files changed, 23 insertions(+), 20 deletions(-) diff --git a/lldb/test/Shell/Commands/command-disassemble-mixed.c b/lldb/test/Shell/Commands/command-disassemble-mixed.c index 1e530095c5c56b..4af85c0a4c020b 100644 --- a/lldb/test/Shell/Commands/command-disassemble-mixed.c +++ b/lldb/test/Shell/Commands/command-disassemble-mixed.c @@ -1,6 +1,6 @@ // invalid mixed disassembly line -// XFAIL: system-windows +// XFAIL: target-windows // RUN: %clang_host -g %s -o %t // RUN: %lldb %t -o "dis -m -n main" -o "exit" | FileCheck %s diff --git a/lldb/test/Shell/Commands/command-target-create-resolve-exe.test b/lldb/test/Shell/Commands/command-target-create-resolve-exe.test index 0ebbaf25e652de..3a0c7bd91a73e4 100644 --- a/lldb/test/Shell/Commands/command-target-create-resolve-exe.test +++ b/lldb/test/Shell/Commands/command-target-create-resolve-exe.test @@ -1,4 +1,4 @@ -# REQUIRES: system-windows +# REQUIRES: target-windows ## This checks that when starting lldb (or using `target create`) with a ## program name which is on $PATH, or not specify the .exe suffix of a program diff --git a/lldb/test/Shell/Expr/TestIRMemoryMapWindows.test b/lldb/test/Shell/Expr/TestIRMemoryMapWindows.test index ae29492c9ccc9f..66f0bce3047303 100644 --- a/lldb/test/Shell/Expr/TestIRMemoryMapWindows.test +++ b/lldb/test/Shell/Expr/TestIRMemoryMapWindows.test @@ -1,4 +1,4 @@ -# REQUIRES: system-windows +# REQUIRES: target-windows # RUN: %clang_cl_host /Zi /GS- %p/Inputs/call-function.cpp /c /o %t.obj # RUN: %msvc_link /debug:full %t.obj /out:%t diff --git a/lldb/test/Shell/Process/Windows/exception_access_violation.cpp b/lldb/test/Shell/Process/Windows/exception_access_violation.cpp index 4835b498ee4dfd..93898a1991bc6d 100644 --- a/lldb/test/Shell/Process/Windows/exception_access_violation.cpp +++ b/lldb/test/Shell/Process/Windows/exception_access_violation.cpp @@ -1,6 +1,6 @@ // clang-format off -// REQUIRES: system-windows +// REQUIRES: target-windows // RUN: %build --compiler=clang-cl -o %t.exe -- %s // RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -o "run" -- write | FileCheck --check-prefix=WRITE %s // RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -o "run" -- read | FileCheck --check-prefix=READ %s diff --git a/lldb/test/Shell/Process/Windows/process_load.cpp b/lldb/test/Shell/Process/Windows/process_load.cpp index 43bf45865f9bae..de3b4afc77f87f 100644 --- a/lldb/test/Shell/Process/Windows/process_load.cpp +++ b/lldb/test/Shell/Process/Windows/process_load.cpp @@ -1,6 +1,6 @@ // clang-format off -// REQUIRES: system-windows +// REQUIRES: target-windows // RUN: %build --compiler=clang-cl -o %t.exe -- %s // RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -o "b main" -o "process launch" -o "process load kernel32.dll" | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/DWARF/packed.cpp b/lldb/test/Shell/SymbolFile/DWARF/packed.cpp index 56a4308ff7c5ef..6a794a012a6e53 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/packed.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/packed.cpp @@ -1,4 +1,4 @@ -// XFAIL: system-windows +// XFAIL: target-windows // RUN: %clangxx_host -gdwarf -o %t %s // RUN: %lldb %t \ // RUN: -o "expr alignof(packed)" \ diff --git a/lldb/test/Shell/SymbolFile/NativePDB/local-variables.cpp b/lldb/test/Shell/SymbolFile/NativePDB/local-variables.cpp index f6576090b4f327..44a8dc14c61584 100644 --- a/lldb/test/Shell/SymbolFile/NativePDB/local-variables.cpp +++ b/lldb/test/Shell/SymbolFile/NativePDB/local-variables.cpp @@ -1,6 +1,6 @@ // clang-format off -// REQUIRES: system-windows +// REQUIRES: target-windows // RUN: %build -o %t.exe -- %s // RUN: %lldb -f %t.exe -s \ // RUN: %p/Inputs/local-variables.lldbinit 2>&1 | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/NativePDB/stack_unwinding01.cpp b/lldb/test/Shell/SymbolFile/NativePDB/stack_unwinding01.cpp index 9e799fb635a2fb..596a826f4a11bb 100644 --- a/lldb/test/Shell/SymbolFile/NativePDB/stack_unwinding01.cpp +++ b/lldb/test/Shell/SymbolFile/NativePDB/stack_unwinding01.cpp @@ -1,5 +1,5 @@ // clang-format off -// REQUIRES: lld, system-windows +// REQUIRES: lld, target-windows // RUN: %build --compiler=clang-cl --nodefaultlib -o %t.exe -- %s // RUN: %lldb -f %t.exe -s \ diff --git a/lldb/test/Shell/SymbolFile/PDB/calling-conventions-arm.test b/lldb/test/Shell/SymbolFile/PDB/calling-conventions-arm.test index 07dc89d4602931..7dabf9157d47e8 100644 --- a/lldb/test/Shell/SymbolFile/PDB/calling-conventions-arm.test +++ b/lldb/test/Shell/SymbolFile/PDB/calling-conventions-arm.test @@ -1,4 +1,4 @@ -REQUIRES: system-windows, lld, (target-arm || target-aarch64) +REQUIRES: target-windows, lld, (target-arm || target-aarch64) RUN: %build --compiler=clang-cl --arch=32 --nodefaultlib --output=%t.exe %S/Inputs/CallingConventionsTest.cpp RUN: %build --compiler=clang-cl --arch=64 --nodefaultlib --output=%t.exe %S/Inputs/CallingConventionsTest.cpp RUN: lldb-test symbols -dump-ast %t.exe | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/PDB/class-layout.test b/lldb/test/Shell/SymbolFile/PDB/class-layout.test index c99a180f4f6329..efd52b8876ce03 100644 --- a/lldb/test/Shell/SymbolFile/PDB/class-layout.test +++ b/lldb/test/Shell/SymbolFile/PDB/class-layout.test @@ -1,4 +1,4 @@ -REQUIRES: system-windows, msvc +REQUIRES: target-windows, msvc RUN: %build --compiler=clang-cl --mode=compile --arch=32 --nodefaultlib --output=%T/ClassLayoutTest.cpp.obj %S/Inputs/ClassLayoutTest.cpp RUN: %build --compiler=msvc --mode=link --arch=32 --nodefaultlib --output=%T/ClassLayoutTest.cpp.exe %T/ClassLayoutTest.cpp.obj RUN: lldb-test symbols %T/ClassLayoutTest.cpp.exe | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/PDB/compilands.test b/lldb/test/Shell/SymbolFile/PDB/compilands.test index f0fdce0f68cd94..6ea9082513753b 100644 --- a/lldb/test/Shell/SymbolFile/PDB/compilands.test +++ b/lldb/test/Shell/SymbolFile/PDB/compilands.test @@ -1,4 +1,4 @@ -REQUIRES: system-windows, msvc +REQUIRES: target-windows, msvc RUN: %build --compiler=clang-cl --mode=compile --arch=32 --nodefaultlib --output=%T/CompilandsTest.cpp.obj %S/Inputs/CompilandsTest.cpp RUN: %build --compiler=msvc --mode=link --arch=32 --nodefaultlib --output=%T/CompilandsTest.cpp.exe %T/CompilandsTest.cpp.obj RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols %T/CompilandsTest.cpp.exe | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/PDB/expressions.test b/lldb/test/Shell/SymbolFile/PDB/expressions.test index 89d7c94e7aa061..1932be74ca878b 100644 --- a/lldb/test/Shell/SymbolFile/PDB/expressions.test +++ b/lldb/test/Shell/SymbolFile/PDB/expressions.test @@ -1,4 +1,4 @@ -REQUIRES: system-windows, msvc +REQUIRES: target-windows, msvc RUN: %build --compiler=msvc --nodefaultlib --output=%t.exe %S/Inputs/ExpressionsTest.cpp RUN: not %lldb -b -s %S/Inputs/ExpressionsTest0.script -s %S/Inputs/ExpressionsTest1.script -s %S/Inputs/ExpressionsTest2.script -- %t.exe 2>&1 | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/PDB/func-symbols.test b/lldb/test/Shell/SymbolFile/PDB/func-symbols.test index 5990952938e67f..95e0dd5eb078ef 100644 --- a/lldb/test/Shell/SymbolFile/PDB/func-symbols.test +++ b/lldb/test/Shell/SymbolFile/PDB/func-symbols.test @@ -1,4 +1,4 @@ -REQUIRES: system-windows, lld +REQUIRES: target-windows, lld RUN: %build --compiler=clang-cl --arch=32 --nodefaultlib --output=%T/FuncSymbolsTest.exe %S/Inputs/FuncSymbolsTestMain.cpp %S/Inputs/FuncSymbols.cpp RUN: lldb-test symbols %T/FuncSymbolsTest.exe | FileCheck --check-prefix=CHECK-ONE %s RUN: lldb-test symbols %T/FuncSymbolsTest.exe | FileCheck --check-prefix=CHECK-TWO %s diff --git a/lldb/test/Shell/SymbolFile/PDB/function-level-linking.test b/lldb/test/Shell/SymbolFile/PDB/function-level-linking.test index ff8eec44e3dbd2..813b744230b9cb 100644 --- a/lldb/test/Shell/SymbolFile/PDB/function-level-linking.test +++ b/lldb/test/Shell/SymbolFile/PDB/function-level-linking.test @@ -1,4 +1,4 @@ -REQUIRES: system-windows, lld +REQUIRES: target-windows, lld RUN: %clang_cl_host /c /Zi /Gy %S/Inputs/FunctionLevelLinkingTest.cpp /o %t.obj RUN: lld-link /debug:full /nodefaultlib /entry:main /order:@%S/Inputs/FunctionLevelLinkingTest.ord %t.obj /out:%t.exe RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols -verify %t.exe diff --git a/lldb/test/Shell/SymbolFile/PDB/pointers.test b/lldb/test/Shell/SymbolFile/PDB/pointers.test index a3e6f557fed6f8..355b5fa16839ae 100644 --- a/lldb/test/Shell/SymbolFile/PDB/pointers.test +++ b/lldb/test/Shell/SymbolFile/PDB/pointers.test @@ -1,4 +1,4 @@ -REQUIRES: system-windows, msvc +REQUIRES: target-windows, msvc RUN: %build --compiler=clang-cl --mode=compile --arch=32 --nodefaultlib --output=%T/PointerTypeTest.cpp.obj %S/Inputs/PointerTypeTest.cpp RUN: %build --compiler=msvc --mode=link --arch=32 --nodefaultlib --output=%T/PointerTypeTest.cpp.exe %T/PointerTypeTest.cpp.obj RUN: lldb-test symbols %T/PointerTypeTest.cpp.exe | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/PDB/type-quals.test b/lldb/test/Shell/SymbolFile/PDB/type-quals.test index cf65c79223b234..982bb70f3c6c5f 100644 --- a/lldb/test/Shell/SymbolFile/PDB/type-quals.test +++ b/lldb/test/Shell/SymbolFile/PDB/type-quals.test @@ -1,4 +1,4 @@ -REQUIRES: system-windows, msvc +REQUIRES: target-windows, msvc RUN: %build --compiler=clang-cl --mode=compile --arch=32 --nodefaultlib --output=%T/TypeQualsTest.cpp.obj %S/Inputs/TypeQualsTest.cpp RUN: %build --compiler=msvc --mode=link --arch=32 --nodefaultlib --output=%T/TypeQualsTest.cpp.exe %T/TypeQualsTest.cpp.obj RUN: lldb-test symbols %T/TypeQualsTest.cpp.exe | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/PDB/udt-layout.test b/lldb/test/Shell/SymbolFile/PDB/udt-layout.test index 84414cbf8440d4..bc68539e25ec1b 100644 --- a/lldb/test/Shell/SymbolFile/PDB/udt-layout.test +++ b/lldb/test/Shell/SymbolFile/PDB/udt-layout.test @@ -1,4 +1,4 @@ -REQUIRES: system-windows, lld +REQUIRES: target-windows, lld RUN: %build --compiler=clang-cl --output=%t.exe %S/Inputs/UdtLayoutTest.cpp RUN: %lldb -b -s %S/Inputs/UdtLayoutTest.script -- %t.exe | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/PDB/variables-locations.test b/lldb/test/Shell/SymbolFile/PDB/variables-locations.test index 526e53bba3b856..9f9a8497badd7e 100644 --- a/lldb/test/Shell/SymbolFile/PDB/variables-locations.test +++ b/lldb/test/Shell/SymbolFile/PDB/variables-locations.test @@ -1,4 +1,4 @@ -REQUIRES: system-windows, lld +REQUIRES: target-windows, lld RUN: %build --compiler=clang-cl --output=%t.exe %S/Inputs/VariablesLocationsTest.cpp RUN: %lldb -b -s %S/Inputs/VariablesLocationsTest.script -- %t.exe | FileCheck %s RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -b -s %S/Inputs/VariablesLocationsTest.script -- %t.exe | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/PDB/vbases.test b/lldb/test/Shell/SymbolFile/PDB/vbases.test index 57239e07c87d62..b58e3edc3cc80d 100644 --- a/lldb/test/Shell/SymbolFile/PDB/vbases.test +++ b/lldb/test/Shell/SymbolFile/PDB/vbases.test @@ -1,4 +1,4 @@ -REQUIRES: system-windows, lld +REQUIRES: target-windows, lld RUN: %build --compiler=clang-cl --output=%t.exe %S/Inputs/VBases.cpp RUN: %lldb -b -s %S/Inputs/VBases.script -- %t.exe | FileCheck %s diff --git a/lldb/test/Shell/Target/dependent-modules-nodupe-windows.test b/lldb/test/Shell/Target/dependent-modules-nodupe-windows.test index 52e46cd0c9b21b..78d7f7469b9f88 100644 --- a/lldb/test/Shell/Target/dependent-modules-nodupe-windows.test +++ b/lldb/test/Shell/Target/dependent-modules-nodupe-windows.test @@ -1,4 +1,4 @@ -# REQUIRES: system-windows +# REQUIRES: target-windows # Checks that dependent modules preloaded by LLDB are not duplicated when the # process actually loads the DLL. diff --git a/lldb/test/Shell/lit.cfg.py b/lldb/test/Shell/lit.cfg.py index 6ca180b6f5c95a..193639667db5bf 100644 --- a/lldb/test/Shell/lit.cfg.py +++ b/lldb/test/Shell/lit.cfg.py @@ -69,6 +69,9 @@ if re.match(r"^arm(hf.*-linux)|(.*-linux-gnuabihf)", config.target_triple): config.available_features.add("armhf-linux") +if re.match(r".*-(windows|mingw32)", config.target_triple): + config.available_features.add("target-windows") + if re.match(r".*-(windows-msvc)$", config.target_triple): config.available_features.add("windows-msvc") >From 2d4f967aec7c99092c633283a6002a2ba955e313 Mon Sep 17 00:00:00 2001 From: Vladislav Dzhidzhoev <vdzhidzh...@accesssoftek.com> Date: Mon, 11 Nov 2024 15:17:35 +0100 Subject: [PATCH 2/3] Added TestAnonNamespaceParamFunc.cpp --- lldb/test/Shell/Expr/TestAnonNamespaceParamFunc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lldb/test/Shell/Expr/TestAnonNamespaceParamFunc.cpp b/lldb/test/Shell/Expr/TestAnonNamespaceParamFunc.cpp index 3d7b193dc6aaca..725b2d637637f2 100644 --- a/lldb/test/Shell/Expr/TestAnonNamespaceParamFunc.cpp +++ b/lldb/test/Shell/Expr/TestAnonNamespaceParamFunc.cpp @@ -3,7 +3,7 @@ // linkage. In this case, a function whose argument // is not legally usable outside this TU. -// XFAIL: system-windows +// XFAIL: target-windows // RUN: %build %s -o %t // RUN: %lldb %t -o run -o "expression func(a)" -o exit | FileCheck %s >From 280149457f4174c92c7607b8d3939e6ca86f470d Mon Sep 17 00:00:00 2001 From: Vladislav Dzhidzhoev <vdzhidzh...@accesssoftek.com> Date: Mon, 11 Nov 2024 15:18:33 +0100 Subject: [PATCH 3/3] Added command-expr-diagnostics.test --- lldb/test/Shell/Commands/command-expr-diagnostics.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lldb/test/Shell/Commands/command-expr-diagnostics.test b/lldb/test/Shell/Commands/command-expr-diagnostics.test index 72df47bbbdc1ed..3c827fb4516ecd 100644 --- a/lldb/test/Shell/Commands/command-expr-diagnostics.test +++ b/lldb/test/Shell/Commands/command-expr-diagnostics.test @@ -1,4 +1,4 @@ -# XFAIL: system-windows +# XFAIL: target-windows # RUN: echo quit | %lldb -o "expression a+b" \ # RUN: | FileCheck %s --strict-whitespace --check-prefix=CHECK1 # (lldb) expression a+b _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
