Skip to content

Commit af014c9

Browse files
dzhidzhoevweliveindetail
authored andcommitted
[lldb][test] Fix remote Shell tests failures on Windows host (llvm#115716)
Since the remote Shell test execution feature was added, these tests should now be disabled on Windows target instead of Windows host. It should fix failures on https://lab.llvm.org/staging/#/builders/197/builds/76.
1 parent 85fb0df commit af014c9

23 files changed

+25
-22
lines changed

lldb/test/Shell/Commands/command-disassemble-mixed.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// invalid mixed disassembly line
22

3-
// XFAIL: system-windows
3+
// XFAIL: target-windows
44

55
// RUN: %clang_host -g %s -o %t
66
// RUN: %lldb %t -o "dis -m -n main" -o "exit" | FileCheck %s

lldb/test/Shell/Commands/command-expr-diagnostics.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# XFAIL: system-windows
1+
# XFAIL: target-windows
22
# RUN: echo quit | %lldb -o "expression a+b" \
33
# RUN: | FileCheck %s --strict-whitespace --check-prefix=CHECK1
44
# (lldb) expression a+b

lldb/test/Shell/Commands/command-target-create-resolve-exe.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# REQUIRES: system-windows
1+
# REQUIRES: target-windows
22

33
## This checks that when starting lldb (or using `target create`) with a
44
## program name which is on $PATH, or not specify the .exe suffix of a program

lldb/test/Shell/Expr/TestAnonNamespaceParamFunc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// linkage. In this case, a function whose argument
44
// is not legally usable outside this TU.
55

6-
// XFAIL: system-windows
6+
// XFAIL: target-windows
77

88
// RUN: %build %s -o %t
99
// RUN: %lldb %t -o run -o "expression func(a)" -o exit | FileCheck %s

lldb/test/Shell/Expr/TestIRMemoryMapWindows.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# REQUIRES: system-windows
1+
# REQUIRES: target-windows
22

33
# RUN: %clang_cl_host /Zi /GS- %p/Inputs/call-function.cpp /c /o %t.obj
44
# RUN: %msvc_link /debug:full %t.obj /out:%t

lldb/test/Shell/Process/Windows/exception_access_violation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// clang-format off
22

3-
// REQUIRES: system-windows
3+
// REQUIRES: target-windows
44
// RUN: %build --compiler=clang-cl -o %t.exe -- %s
55
// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -o "run" -- write | FileCheck --check-prefix=WRITE %s
66
// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -o "run" -- read | FileCheck --check-prefix=READ %s

lldb/test/Shell/Process/Windows/process_load.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// clang-format off
22

3-
// REQUIRES: system-windows
3+
// REQUIRES: target-windows
44
// RUN: %build --compiler=clang-cl -o %t.exe -- %s
55
// 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
66

lldb/test/Shell/SymbolFile/DWARF/packed.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// XFAIL: system-windows
1+
// XFAIL: target-windows
22
// RUN: %clangxx_host -gdwarf -o %t %s
33
// RUN: %lldb %t \
44
// RUN: -o "expr alignof(packed)" \

lldb/test/Shell/SymbolFile/NativePDB/local-variables.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// clang-format off
22

3-
// REQUIRES: system-windows
3+
// REQUIRES: target-windows
44
// RUN: %build -o %t.exe -- %s
55
// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \
66
// RUN: %p/Inputs/local-variables.lldbinit 2>&1 | FileCheck %s

lldb/test/Shell/SymbolFile/NativePDB/stack_unwinding01.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// clang-format off
2-
// REQUIRES: lld, system-windows
2+
// REQUIRES: lld, target-windows
33

44
// RUN: %build --compiler=clang-cl --nodefaultlib -o %t.exe -- %s
55
// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \

lldb/test/Shell/SymbolFile/PDB/calling-conventions-arm.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
REQUIRES: system-windows, lld, (target-arm || target-aarch64)
1+
REQUIRES: target-windows, lld, (target-arm || target-aarch64)
22
RUN: %build --compiler=clang-cl --arch=32 --nodefaultlib --output=%t.exe %S/Inputs/CallingConventionsTest.cpp
33
RUN: %build --compiler=clang-cl --arch=64 --nodefaultlib --output=%t.exe %S/Inputs/CallingConventionsTest.cpp
44
RUN: lldb-test symbols -dump-ast %t.exe | FileCheck %s

lldb/test/Shell/SymbolFile/PDB/class-layout.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
REQUIRES: system-windows, msvc
1+
REQUIRES: target-windows, msvc
22
RUN: %build --compiler=clang-cl --mode=compile --arch=32 --nodefaultlib --output=%T/ClassLayoutTest.cpp.obj %S/Inputs/ClassLayoutTest.cpp
33
RUN: %build --compiler=msvc --mode=link --arch=32 --nodefaultlib --output=%T/ClassLayoutTest.cpp.exe %T/ClassLayoutTest.cpp.obj
44
RUN: lldb-test symbols %T/ClassLayoutTest.cpp.exe | FileCheck %s

lldb/test/Shell/SymbolFile/PDB/compilands.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
REQUIRES: system-windows, msvc
1+
REQUIRES: target-windows, msvc
22
RUN: %build --compiler=clang-cl --mode=compile --arch=32 --nodefaultlib --output=%T/CompilandsTest.cpp.obj %S/Inputs/CompilandsTest.cpp
33
RUN: %build --compiler=msvc --mode=link --arch=32 --nodefaultlib --output=%T/CompilandsTest.cpp.exe %T/CompilandsTest.cpp.obj
44
RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols %T/CompilandsTest.cpp.exe | FileCheck %s

lldb/test/Shell/SymbolFile/PDB/expressions.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
REQUIRES: system-windows, msvc
1+
REQUIRES: target-windows, msvc
22
RUN: %build --compiler=msvc --nodefaultlib --output=%t.exe %S/Inputs/ExpressionsTest.cpp
33
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
44

lldb/test/Shell/SymbolFile/PDB/func-symbols.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
REQUIRES: system-windows, lld
1+
REQUIRES: target-windows, lld
22
RUN: %build --compiler=clang-cl --arch=32 --nodefaultlib --output=%T/FuncSymbolsTest.exe %S/Inputs/FuncSymbolsTestMain.cpp %S/Inputs/FuncSymbols.cpp
33
RUN: lldb-test symbols %T/FuncSymbolsTest.exe | FileCheck --check-prefix=CHECK-ONE %s
44
RUN: lldb-test symbols %T/FuncSymbolsTest.exe | FileCheck --check-prefix=CHECK-TWO %s

lldb/test/Shell/SymbolFile/PDB/function-level-linking.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
REQUIRES: system-windows, lld
1+
REQUIRES: target-windows, lld
22
RUN: %clang_cl_host /c /Zi /Gy %S/Inputs/FunctionLevelLinkingTest.cpp /o %t.obj
33
RUN: lld-link /debug:full /nodefaultlib /entry:main /order:@%S/Inputs/FunctionLevelLinkingTest.ord %t.obj /out:%t.exe
44
RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols -verify %t.exe

lldb/test/Shell/SymbolFile/PDB/pointers.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
REQUIRES: system-windows, msvc
1+
REQUIRES: target-windows, msvc
22
RUN: %build --compiler=clang-cl --mode=compile --arch=32 --nodefaultlib --output=%T/PointerTypeTest.cpp.obj %S/Inputs/PointerTypeTest.cpp
33
RUN: %build --compiler=msvc --mode=link --arch=32 --nodefaultlib --output=%T/PointerTypeTest.cpp.exe %T/PointerTypeTest.cpp.obj
44
RUN: lldb-test symbols %T/PointerTypeTest.cpp.exe | FileCheck %s

lldb/test/Shell/SymbolFile/PDB/type-quals.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
REQUIRES: system-windows, msvc
1+
REQUIRES: target-windows, msvc
22
RUN: %build --compiler=clang-cl --mode=compile --arch=32 --nodefaultlib --output=%T/TypeQualsTest.cpp.obj %S/Inputs/TypeQualsTest.cpp
33
RUN: %build --compiler=msvc --mode=link --arch=32 --nodefaultlib --output=%T/TypeQualsTest.cpp.exe %T/TypeQualsTest.cpp.obj
44
RUN: lldb-test symbols %T/TypeQualsTest.cpp.exe | FileCheck %s

lldb/test/Shell/SymbolFile/PDB/udt-layout.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
REQUIRES: system-windows, lld
1+
REQUIRES: target-windows, lld
22
RUN: %build --compiler=clang-cl --output=%t.exe %S/Inputs/UdtLayoutTest.cpp
33
RUN: %lldb -b -s %S/Inputs/UdtLayoutTest.script -- %t.exe | FileCheck %s
44

lldb/test/Shell/SymbolFile/PDB/variables-locations.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
REQUIRES: system-windows, lld
1+
REQUIRES: target-windows, lld
22
RUN: %build --compiler=clang-cl --output=%t.exe %S/Inputs/VariablesLocationsTest.cpp
33
RUN: env LLDB_USE_NATIVE_PDB_READER=0 %lldb -b -s %S/Inputs/VariablesLocationsTest.script -- %t.exe | FileCheck %s
44
RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -b -s %S/Inputs/VariablesLocationsTest.script -- %t.exe | FileCheck %s

lldb/test/Shell/SymbolFile/PDB/vbases.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
REQUIRES: system-windows, lld
1+
REQUIRES: target-windows, lld
22
RUN: %build --compiler=clang-cl --output=%t.exe %S/Inputs/VBases.cpp
33
RUN: %lldb -b -s %S/Inputs/VBases.script -- %t.exe | FileCheck %s
44

lldb/test/Shell/Target/dependent-modules-nodupe-windows.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# REQUIRES: system-windows
1+
# REQUIRES: target-windows
22

33
# Checks that dependent modules preloaded by LLDB are not duplicated when the
44
# process actually loads the DLL.

lldb/test/Shell/lit.cfg.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@
8787
if re.match(r"^arm(hf.*-linux)|(.*-linux-gnuabihf)", config.target_triple):
8888
config.available_features.add("armhf-linux")
8989

90+
if re.match(r".*-(windows|mingw32)", config.target_triple):
91+
config.available_features.add("target-windows")
92+
9093
if re.match(r".*-(windows-msvc)$", config.target_triple):
9194
config.available_features.add("windows-msvc")
9295

0 commit comments

Comments
 (0)