[Lldb-commits] [lldb] e6f7e34 - [lldb][test] Fix/XFAIL FrameFormat tests on Windows
Michael Buch via lldb-commits
lldb-commits at lists.llvm.org
Sat Apr 26 01:00:25 PDT 2025
Author: Michael Buch
Date: 2025-04-26T08:56:16+01:00
New Revision: e6f7e3418eb8519d6cf12da8576ad75aac6b307b
URL: https://github.com/llvm/llvm-project/commit/e6f7e3418eb8519d6cf12da8576ad75aac6b307b
DIFF: https://github.com/llvm/llvm-project/commit/e6f7e3418eb8519d6cf12da8576ad75aac6b307b.diff
LOG: [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.
Added:
Modified:
lldb/test/Shell/Settings/TestCxxFrameFormat.test
lldb/test/Shell/Settings/TestCxxFrameFormatPartialFailure.test
lldb/test/Shell/Settings/TestFrameFormatFunctionBasename.test
lldb/test/Shell/Settings/TestFrameFormatFunctionFormattedArguments.test
lldb/test/Shell/Settings/TestFrameFormatFunctionQualifiers.test
lldb/test/Shell/Settings/TestFrameFormatFunctionReturn.test
lldb/test/Shell/Settings/TestFrameFormatFunctionScope.test
lldb/test/Shell/Settings/TestFrameFormatFunctionTemplateArguments.test
Removed:
################################################################################
diff --git a/lldb/test/Shell/Settings/TestCxxFrameFormat.test b/lldb/test/Shell/Settings/TestCxxFrameFormat.test
index c26d339f57130..babb14bed4440 100644
--- a/lldb/test/Shell/Settings/TestCxxFrameFormat.test
+++ b/lldb/test/Shell/Settings/TestCxxFrameFormat.test
@@ -1,3 +1,5 @@
+# XFAIL: system-windows
+
# Test the plugin.cplusplus.display.function-name-format setting.
# RUN: split-file %s %t
diff --git a/lldb/test/Shell/Settings/TestCxxFrameFormatPartialFailure.test b/lldb/test/Shell/Settings/TestCxxFrameFormatPartialFailure.test
index 73564ae41837b..0ae48d4eb541e 100644
--- a/lldb/test/Shell/Settings/TestCxxFrameFormatPartialFailure.test
+++ b/lldb/test/Shell/Settings/TestCxxFrameFormatPartialFailure.test
@@ -20,7 +20,7 @@ int main(int argc, const char *argv[]) {
#--- commands.input
settings set plugin.cplusplus.display.function-name-format "${function.basename}${script.target:invalid_func}"
settings set -f frame-format "custom-frame '${function.name-with-args}'\n"
-break set -n gunc
+break set -l 2
run
bt
diff --git a/lldb/test/Shell/Settings/TestFrameFormatFunctionBasename.test b/lldb/test/Shell/Settings/TestFrameFormatFunctionBasename.test
index 249a5fac5b55e..ae405be44578d 100644
--- a/lldb/test/Shell/Settings/TestFrameFormatFunctionBasename.test
+++ b/lldb/test/Shell/Settings/TestFrameFormatFunctionBasename.test
@@ -1,3 +1,5 @@
+# XFAIL: system-windows
+
# Test the ${function.basename} frame-format variable.
# RUN: split-file %s %t
@@ -36,7 +38,7 @@ int main() {
#--- commands.input
settings set -f frame-format "custom-frame '${function.basename}'\n"
-break set -n bar
+break set -l 5
run
bt
diff --git a/lldb/test/Shell/Settings/TestFrameFormatFunctionFormattedArguments.test b/lldb/test/Shell/Settings/TestFrameFormatFunctionFormattedArguments.test
index 5554830d3a247..31602c83b17c9 100644
--- a/lldb/test/Shell/Settings/TestFrameFormatFunctionFormattedArguments.test
+++ b/lldb/test/Shell/Settings/TestFrameFormatFunctionFormattedArguments.test
@@ -37,6 +37,6 @@ bt
# CHECK: custom-frame '(this={{.*}})'
# CHECK: custom-frame '()'
-# CHECK: custom-frame '((null)=5, x=10)'
-# CHECK: custom-frame '(str="hello", fptr=({{.*}}.out`foo(int, int) at main.cpp:{{[0-9]+}}))'
+# CHECK: custom-frame '({{.*}}=5, x=10)'
+# CHECK: custom-frame '(str="hello", fptr=({{.*}}.out`{{.*}}foo(int,{{.*}}int) at main.cpp:{{[0-9]+}}))'
# CHECK: custom-frame '(argc=1, argv={{.*}})'
diff --git a/lldb/test/Shell/Settings/TestFrameFormatFunctionQualifiers.test b/lldb/test/Shell/Settings/TestFrameFormatFunctionQualifiers.test
index 95a3be3811d85..3848f7d527f6b 100644
--- a/lldb/test/Shell/Settings/TestFrameFormatFunctionQualifiers.test
+++ b/lldb/test/Shell/Settings/TestFrameFormatFunctionQualifiers.test
@@ -1,3 +1,5 @@
+# XFAIL: system-windows
+
# Test the ${function.qualifiers} frame-format variable.
# RUN: split-file %s %t
diff --git a/lldb/test/Shell/Settings/TestFrameFormatFunctionReturn.test b/lldb/test/Shell/Settings/TestFrameFormatFunctionReturn.test
index a5e49a1054c86..f06753157d2c7 100644
--- a/lldb/test/Shell/Settings/TestFrameFormatFunctionReturn.test
+++ b/lldb/test/Shell/Settings/TestFrameFormatFunctionReturn.test
@@ -1,3 +1,5 @@
+# XFAIL: system-windows
+
# Test the ${function.return-left} and ${function.return-right}
# frame-format variables.
diff --git a/lldb/test/Shell/Settings/TestFrameFormatFunctionScope.test b/lldb/test/Shell/Settings/TestFrameFormatFunctionScope.test
index 28f0ab7ca39e3..a5da652372dbc 100644
--- a/lldb/test/Shell/Settings/TestFrameFormatFunctionScope.test
+++ b/lldb/test/Shell/Settings/TestFrameFormatFunctionScope.test
@@ -1,3 +1,5 @@
+# XFAIL: system-windows
+
# Test the ${function.scope} frame-format variable.
# RUN: split-file %s %t
diff --git a/lldb/test/Shell/Settings/TestFrameFormatFunctionTemplateArguments.test b/lldb/test/Shell/Settings/TestFrameFormatFunctionTemplateArguments.test
index 396dd29dfd02c..2c0bd9099eb1d 100644
--- a/lldb/test/Shell/Settings/TestFrameFormatFunctionTemplateArguments.test
+++ b/lldb/test/Shell/Settings/TestFrameFormatFunctionTemplateArguments.test
@@ -1,3 +1,5 @@
+# XFAIL: system-windows
+
# Test the ${function.template-arguments} frame-format variable.
# RUN: split-file %s %t
@@ -27,7 +29,7 @@ int main() { return bar(); }
#--- commands.input
settings set -f frame-format "custom-frame '${function.template-arguments}'\n"
-break set -n func
+break set -l 4
run
bt
More information about the lldb-commits
mailing list