clayborg accepted this revision. clayborg added a comment. This revision is now accepted and ready to land.
Just switch all "-f" to the long option format as mentioned in inlined comments and this is good to go. ================ Comment at: lldb/test/API/commands/trace/TestTraceDumpInstructions.py:38 - self.expect("thread trace dump instructions --raw", - substrs=['''thread #1: tid = 3842849, total instructions = 21 + self.expect("thread trace dump instructions --raw --count 21 -f", + substrs=['''thread #1: tid = 3842849 ---------------- use long form of option for clarity ================ Comment at: lldb/test/API/commands/trace/TestTraceDumpInstructions.py:63 + # We check if we can pass count and skip + self.expect("thread trace dump instructions --count 5 --skip 6 --raw -f", + substrs=['''thread #1: tid = 3842849 ---------------- use long form of option for clarity ================ Comment at: lldb/test/API/commands/trace/TestTraceDumpInstructions.py:146 # The output should be work when too many instructions are asked - self.expect("thread trace dump instructions --count 20 --position 2", - substrs=['''thread #1: tid = 3842849, total instructions = 21 + self.expect("thread trace dump instructions --count 20 -f", + substrs=['''thread #1: tid = 3842849 ---------------- use long form of option for clarity ================ Comment at: lldb/test/API/commands/trace/TestTraceDumpInstructions.py:165 os.path.join(self.getSourceDir(), "intelpt-trace", "trace_bad_image.json")) - self.expect("thread trace dump instructions", - substrs=['''thread #1: tid = 3842849, total instructions = 2 - [0] 0x0000000000400511 error: no memory mapped at this address - [1] 0x0000000000400518 error: no memory mapped at this address''']) + self.expect("thread trace dump instructions -f", + substrs=['''thread #1: tid = 3842849 ---------------- use long form of option for clarity ================ Comment at: lldb/test/API/commands/trace/TestTraceDumpInstructions.py:173 os.path.join(self.getSourceDir(), "intelpt-trace", "trace_wrong_cpu.json")) - self.expect("thread trace dump instructions", - substrs=['''thread #1: tid = 3842849, total instructions = 1 - [0] error: unknown cpu''']) + self.expect("thread trace dump instructions -f", + substrs=['''thread #1: tid = 3842849 ---------------- use long form of option for clarity ================ Comment at: lldb/test/API/commands/trace/TestTraceDumpInstructions.py:195 # Finally, the instruction disassembly is included in the dump. - self.expect("thread trace dump instructions --count 50", - substrs=['''thread #1: tid = 815455, total instructions = 46 + self.expect("thread trace dump instructions --count 50 -f", + substrs=['''thread #1: tid = 815455 ---------------- use long form of option for clarity ================ Comment at: lldb/test/API/commands/trace/TestTraceDumpInstructions.py:340 + + self.expect("thread trace dump instructions --skip 100 -f", inHistory=True, + substrs=['''thread #1: tid = 815455 ---------------- use long form of option for clarity ================ Comment at: lldb/test/API/commands/trace/TestTraceStartStop.py:114 self.expect("n") - self.expect("thread trace dump instructions", - patterns=[f'''thread #1: tid = .*, total instructions = 1 + self.expect("thread trace dump instructions -f", + patterns=[f'''thread #1: tid = .* ---------------- use long form of option for clarity ================ Comment at: lldb/test/API/commands/trace/TestTraceStartStop.py:121 self.expect("n") - self.expect("thread trace dump instructions", - patterns=[f'''thread #1: tid = .*, total instructions = 5 + self.expect("thread trace dump instructions -f", + patterns=[f'''thread #1: tid = .* ---------------- use long form of option for clarity ================ Comment at: lldb/test/API/commands/trace/TestTraceStartStop.py:152 self.expect("n") + self.expect("thread trace dump instructions -f", + patterns=[f'''thread #1: tid = .* ---------------- use long form of option for clarity Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D105531/new/ https://reviews.llvm.org/D105531 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits