Author: Michael Buch
Date: 2025-11-04T11:45:29Z
New Revision: c80faaefe10fcf3bac1c41b78e038d8d7533dd71

URL: 
https://github.com/llvm/llvm-project/commit/c80faaefe10fcf3bac1c41b78e038d8d7533dd71
DIFF: 
https://github.com/llvm/llvm-project/commit/c80faaefe10fcf3bac1c41b78e038d8d7533dd71.diff

LOG: [lldb][test] registration-unique.test: don't hardcode the order of 
recognizer registration

These might get registered in a different order on different platforms.
Use `CHECK-DAG` to account for that.

Attempts to fix the failure seen on the x86 Linux bots:
```
******************** TEST 'lldb-shell :: Recognizer/registration-unique.test' 
FAILED ********************
Exit Code: 1

Command Output (stdout):
--
RUN: at line 4
lit-file 
C:\Users\tcwg\llvm-worker\lldb-aarch64-windows\llvm-project\lldb\test\Shell\Recognizer\registration-unique.test
 
C:\Users\tcwg\llvm-worker\lldb-aarch64-windows\build\tools\lldb\test\Shell\Recognizer\Output\registration-unique.test.tmp
executed command: split-file 
'C:\Users\tcwg\llvm-worker\lldb-aarch64-windows\llvm-project\lldb\test\Shell\Recognizer\registration-unique.test'
 
'C:\Users\tcwg\llvm-worker\lldb-aarch64-windows\build\tools\lldb\test\Shell\Recognizer\Output\registration-unique.test.tmp'
note: command had no output on stdout or stderr
RUN: at line 6
\users\tcwg\llvm-worker\lldb-aarch64-windows\build\bin\clang.exe 
--target=specify-a-target-or-use-a-_host-substitution 
--target=aarch64-pc-windows-msvc 
-fmodules-cache-path=C:/Users/tcwg/llvm-worker/lldb-aarch64-windows/build/lldb-test-build.noindex/module-cache-clang\lldb-shell
 
C:\Users\tcwg\llvm-worker\lldb-aarch64-windows\build\tools\lldb\test\Shell\Recognizer\Output\registration-unique.test.tmp/main.cpp
 -g -o 
C:\Users\tcwg\llvm-worker\lldb-aarch64-windows\build\tools\lldb\test\Shell\Recognizer\Output\registration-unique.test.tmp/cpp.out
executed command: 
'c:\users\tcwg\llvm-worker\lldb-aarch64-windows\build\bin\clang.exe' 
--target=specify-a-target-or-use-a-_host-substitution 
--target=aarch64-pc-windows-msvc 
'-fmodules-cache-path=C:/Users/tcwg/llvm-worker/lldb-aarch64-windows/build/lldb-test-build.noindex/module-cache-clang\lldb-shell'
 
'C:\Users\tcwg\llvm-worker\lldb-aarch64-windows\build\tools\lldb\test\Shell\Recognizer\Output\registration-unique.test.tmp/main.cpp'
 -g -o 
'C:\Users\tcwg\llvm-worker\lldb-aarch64-windows\build\tools\lldb\test\Shell\Recognizer\Output\registration-unique.test.tmp/cpp.out'
.---command stderr------------
| clang: warning: argument unused during compilation: 
'-fmodules-cache-path=C:/Users/tcwg/llvm-worker/lldb-aarch64-windows/build/lldb-test-build.noindex/module-cache-clang\lldb-shell'
 [-Wunused-command-line-argument]
`-----------------------------
RUN: at line 7
\users\tcwg\llvm-worker\lldb-aarch64-windows\build\bin\lldb.exe --no-lldbinit 
-S 
C:/Users/tcwg/llvm-worker/lldb-aarch64-windows/build/tools/lldb\test\Shell\lit-lldb-init-quiet
 -b -s 
C:\Users\tcwg\llvm-worker\lldb-aarch64-windows\build\tools\lldb\test\Shell\Recognizer\Output\registration-unique.test.tmp/commands.input
 
C:\Users\tcwg\llvm-worker\lldb-aarch64-windows\build\tools\lldb\test\Shell\Recognizer\Output\registration-unique.test.tmp/cpp.out
 | c:\users\tcwg\llvm-worker\lldb-aarch64-windows\build\bin\filecheck.exe 
C:\Users\tcwg\llvm-worker\lldb-aarch64-windows\llvm-project\lldb\test\Shell\Recognizer\registration-unique.test
executed command: 
'c:\users\tcwg\llvm-worker\lldb-aarch64-windows\build\bin\lldb.exe' 
--no-lldbinit -S 
'C:/Users/tcwg/llvm-worker/lldb-aarch64-windows/build/tools/lldb\test\Shell\lit-lldb-init-quiet'
 -b -s 
'C:\Users\tcwg\llvm-worker\lldb-aarch64-windows\build\tools\lldb\test\Shell\Recognizer\Output\registration-unique.test.tmp/commands.input'
 
'C:\Users\tcwg\llvm-worker\lldb-aarch64-windows\build\tools\lldb\test\Shell\Recognizer\Output\registration-unique.test.tmp/cpp.out'
note: command had no output on stdout or stderr
executed command: 
'c:\users\tcwg\llvm-worker\lldb-aarch64-windows\build\bin\filecheck.exe' 
'C:\Users\tcwg\llvm-worker\lldb-aarch64-windows\llvm-project\lldb\test\Shell\Recognizer\registration-unique.test'
.---command stderr------------
| 
C:\Users\tcwg\llvm-worker\lldb-aarch64-windows\llvm-project\lldb\test\Shell\Recognizer\registration-unique.test:45:10:
 error: CHECK: expected string not found in input
| # CHECK: Assert StackFrame Recognizer
|          ^
| <stdin>:20:38: note: scanning from here
| 1: Verbose Trap StackFrame Recognizer, demangled symbol regex 
^__clang_trap_msg
|                                      ^
| <stdin>:34:10: note: possible intended match here
| 3: Verbose Trap StackFrame Recognizer, demangled symbol regex 
^__clang_trap_msg
|          ^
|
| Input file: <stdin>
| Check file: 
C:\Users\tcwg\llvm-worker\lldb-aarch64-windows\llvm-project\lldb\test\Shell\Recognizer\registration-unique.test
|
| -dump-input=help explains the following input dump.
|
| Input was:
| <<<<<<
```

Added: 
    

Modified: 
    lldb/test/Shell/Recognizer/registration-unique.test

Removed: 
    


################################################################################
diff  --git a/lldb/test/Shell/Recognizer/registration-unique.test 
b/lldb/test/Shell/Recognizer/registration-unique.test
index f6052bb57c940..bc1e4a6ea235b 100644
--- a/lldb/test/Shell/Recognizer/registration-unique.test
+++ b/lldb/test/Shell/Recognizer/registration-unique.test
@@ -41,14 +41,14 @@ frame recognizer list
 # CHECK-NEXT: no matching results found.
 
 # CHECK: frame recognizer list
-# CHECK: Verbose Trap StackFrame Recognizer
-# CHECK: Assert StackFrame Recognizer
+# CHECK-DAG: Verbose Trap StackFrame Recognizer
+# CHECK-DAG: Assert StackFrame Recognizer
 # CHECK-NOT: Verbose Trap StackFrame Recognizer
 # CHECK-NOT: Assert StackFrame Recognizer
 
 # FIXME: avoid duplicate frame recognizers in the target: 
https://github.com/llvm/llvm-project/issues/166341
 # CHECK: frame recognizer list
-# CHECK: Verbose Trap StackFrame Recognizer
-# CHECK: Assert StackFrame Recognizer
-# CHECK: Verbose Trap StackFrame Recognizer
-# CHECK: Assert StackFrame Recognizer
+# CHECK-DAG: Verbose Trap StackFrame Recognizer
+# CHECK-DAG: Assert StackFrame Recognizer
+# CHECK-DAG: Verbose Trap StackFrame Recognizer
+# CHECK-DAG: Assert StackFrame Recognizer


        
_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Reply via email to