Skip to content

Commit e6f7e34

Browse files
committed
[lldb][test] Fix/XFAIL FrameFormat tests on Windows
All of these were failing on Windows CI. Some are failing because breakpoints on template functions can't be set by name. Others are failing because of slight textual differences. Most are failing because we can't track components of a mangled name from PDB, so XFAIL those.
1 parent cc0bdb3 commit e6f7e34

8 files changed

+17
-5
lines changed

lldb/test/Shell/Settings/TestCxxFrameFormat.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# XFAIL: system-windows
2+
13
# Test the plugin.cplusplus.display.function-name-format setting.
24

35
# RUN: split-file %s %t

lldb/test/Shell/Settings/TestCxxFrameFormatPartialFailure.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ int main(int argc, const char *argv[]) {
2020
#--- commands.input
2121
settings set plugin.cplusplus.display.function-name-format "${function.basename}${script.target:invalid_func}"
2222
settings set -f frame-format "custom-frame '${function.name-with-args}'\n"
23-
break set -n gunc
23+
break set -l 2
2424

2525
run
2626
bt

lldb/test/Shell/Settings/TestFrameFormatFunctionBasename.test

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# XFAIL: system-windows
2+
13
# Test the ${function.basename} frame-format variable.
24

35
# RUN: split-file %s %t
@@ -36,7 +38,7 @@ int main() {
3638

3739
#--- commands.input
3840
settings set -f frame-format "custom-frame '${function.basename}'\n"
39-
break set -n bar
41+
break set -l 5
4042

4143
run
4244
bt

lldb/test/Shell/Settings/TestFrameFormatFunctionFormattedArguments.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ bt
3737

3838
# CHECK: custom-frame '(this={{.*}})'
3939
# CHECK: custom-frame '()'
40-
# CHECK: custom-frame '((null)=5, x=10)'
41-
# CHECK: custom-frame '(str="hello", fptr=({{.*}}.out`foo(int, int) at main.cpp:{{[0-9]+}}))'
40+
# CHECK: custom-frame '({{.*}}=5, x=10)'
41+
# CHECK: custom-frame '(str="hello", fptr=({{.*}}.out`{{.*}}foo(int,{{.*}}int) at main.cpp:{{[0-9]+}}))'
4242
# CHECK: custom-frame '(argc=1, argv={{.*}})'

lldb/test/Shell/Settings/TestFrameFormatFunctionQualifiers.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# XFAIL: system-windows
2+
13
# Test the ${function.qualifiers} frame-format variable.
24

35
# RUN: split-file %s %t

lldb/test/Shell/Settings/TestFrameFormatFunctionReturn.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# XFAIL: system-windows
2+
13
# Test the ${function.return-left} and ${function.return-right}
24
# frame-format variables.
35

lldb/test/Shell/Settings/TestFrameFormatFunctionScope.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# XFAIL: system-windows
2+
13
# Test the ${function.scope} frame-format variable.
24

35
# RUN: split-file %s %t

lldb/test/Shell/Settings/TestFrameFormatFunctionTemplateArguments.test

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# XFAIL: system-windows
2+
13
# Test the ${function.template-arguments} frame-format variable.
24

35
# RUN: split-file %s %t
@@ -27,7 +29,7 @@ int main() { return bar(); }
2729

2830
#--- commands.input
2931
settings set -f frame-format "custom-frame '${function.template-arguments}'\n"
30-
break set -n func
32+
break set -l 4
3133

3234
run
3335
bt

0 commit comments

Comments
 (0)