[lldb/test] Allow indentation in inline tests

[labath]

Summary

This makes it possible to use for loops (and other language constructs)
in inline tests.

[teemperor]

LGTM, thanks.

On a more general note: I wish we would just kill off inline tests instead of trying to make them usable. But I think that's a discussion for the mailing lists...

lldb/test/API/test_utils/TestInlineTest.py

11

nit: maybe give this a more unique name + a doc string.

11

Also I think this should be a NO_DEBUG_INFO_TESTCASE ?

[labath]

lldb/test/API/test_utils/TestInlineTest.py

11

Fun fact: tests which inherit from Base (instead of TestBase) don't automatically get debug info multiplication. (They also don't get a lot of other things, which is why this isn't suitable for regular tests, but this isn't a regular test.)

[labath]

In D112706#3093179, @teemperor wrote:

On a more general note: I wish we would just kill off inline tests instead of trying to make them usable. But I think that's a discussion for the mailing lists...

I actually kinda like the inline tests, as they allow you to put the source code and the test expectations into the same file (which makes them very similar to llvm tests). But they do leave a lot to be desired...

[shafik]

I agree, we should be trying to get ride of inline tests. The last time I had to debug one it was not a fun experience. Maybe some of the recent improvements have helped there though.

lldb/packages/Python/lldbsuite/test/lldbinline.py

 from __future__ import print_function
 from __future__ import absolute_import
 
 # System modules
 import os
+import textwrap
 
 # Third-party modules
 import io
 
 # LLDB modules
 import lldb
 from .lldbtest import *
 from . import configuration
class CommandParser:
 
     def parse_one_command(self, line):
         parts = line.split('//%')
 
         command = None
         new_breakpoint = True
 
         if len(parts) == 2:
-            command = parts[1].strip()  # take off whitespace
+            command = parts[1].rstrip()
             new_breakpoint = parts[0].strip() != ""
 
         return (command, new_breakpoint)
 
     def parse_source_files(self, source_files):
         for source_file in source_files:
             file_handle = io.open(source_file, encoding='utf-8')
             lines = file_handle.readlines()
def parse_source_files(self, source_files):
                         current_breakpoint = {}
                         current_breakpoint['file_name'] = source_file
                         current_breakpoint['line_number'] = line_number
                         current_breakpoint['command'] = command
                         self.breakpoints.append(current_breakpoint)
                     else:
                         current_breakpoint['command'] = current_breakpoint[
                             'command'] + "\n" + command
+        for bkpt in self.breakpoints:
+            bkpt['command'] = textwrap.dedent(bkpt['command'])
 
     def set_breakpoints(self, target):
         for breakpoint in self.breakpoints:
             breakpoint['breakpoint'] = target.BreakpointCreateByLocation(
                 breakpoint['file_name'], breakpoint['line_number'])
 
     def handle_breakpoint(self, test, breakpoint_id):
         for breakpoint in self.breakpoints:

lldb/test/API/test_utils/TestInlineTest.py

+from lldbsuite.test.lldbinline import CommandParser
+from lldbsuite.test.lldbtest import Base
+import textwrap
+
+
+class TestCommandParser(Base):
+
+    mydir = Base.compute_mydir(__file__)
+
+    def test_indentation(self):
+        """Test indentation handling"""
+        filename = self.getBuildArtifact("test_file.cpp")
+        with open(filename, "w") as f:
+            f.write(textwrap.dedent("""\
+                    int q;
+                    int w; //% first break
+                    int e;
+                    int r; //% second break
+                    //% continue second
+                    //%   continuing indented
+                      //% not indented
+                    int t; //% third break
+                    """))
+        p = CommandParser()
+        p.parse_source_files([filename])
+
+        def bkpt(line, cmd):
+            return {'file_name': filename, 'line_number': line, 'command': cmd}
+        self.assertEqual(
+            p.breakpoints, [
+                bkpt(2, 'first break'),
+                bkpt(4, 'second break\ncontinue second\n  continuing indented\nnot indented'),
+                bkpt(8, "third break")])