[lldb] Split TestCxxChar8_t

[JDevlieghere]

Summary

Split TestCxxChar8_t into two parts: one that check reading variables without a process and another part with. This allows us to skip the former on Apple Silicon, where lack of support for chained fix-ups causes the test to fail.

[JDevlieghere]

lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py

22

The name of this helper method is terribly confusing. I had to look at the source to realize it is meant to specify that it's the make_target helper function of run_to_breakpoint. Something for a subsequent patch.

[shafik]

I recently ran into this, thanks for fixing the test.

[jingham]

Seems fine to me to break this into running and not running cases, but you should use the right lldbutil method for the running case.

lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py

40–43

You don't need to do this in three steps, do you? Can't you just use lldbutil.run_to_source_breakpoint? That will catch errors in running & hitting the breakpoint which you don't check here.

[JDevlieghere]

lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py

40–43

Yes, that would work here, but not for the test above. I'll update the patch.

[JDevlieghere]

Address Jim's comment

[jingham]

LGTM

[labath]

Looks good. Thanks for fixing this up.

lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py

 import lldbsuite.test.lldbutil as lldbutil
 
 
 class CxxChar8_tTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
     @skipIf(compiler="clang", compiler_version=['<', '7.0'])
-    def test(self):
-        """Test that C++ supports char8_t correctly."""
+    @expectedFailureDarwin(archs=["arm64", "arm64e"]) # <rdar://problem/37773624>
+    def test_without_process(self):
+        """Test that C++ supports char8_t without a running process."""
         self.build()
-
         lldbutil.run_to_breakpoint_make_target(self)
 
-        # Make sure the variables can be printed without a running process.
         self.expect("target variable a", substrs=["char8_t", "0x61 u8'a'"])
         self.expect("target variable ab",
                 substrs=["const char8_t *", 'u8"你好"'])
         self.expect("target variable abc", substrs=["char8_t[9]", 'u8"你好"'])
 
         self.expect_expr("a", result_type="char8_t", result_summary="0x61 u8'a'")
         self.expect_expr("ab", result_type="const char8_t *", result_summary='u8"你好"')
+
         # FIXME: This should work too.
         self.expect("expr abc", substrs=['u8"你好"'], matching=False)
 
-        lldbutil.run_break_set_by_source_regexp(self, "// break here", "-f main.cpp")
-        self.runCmd("run")
+
+    @skipIf(compiler="clang", compiler_version=['<', '7.0'])
+    def test_with_process(self):
+        """Test that C++ supports char8_t with a running process."""
+        self.build()
+        lldbutil.run_to_source_breakpoint(self, '// break here', lldb.SBFileSpec("main.cpp"))
 
         # As well as with it
         self.expect_expr("a", result_type="char8_t", result_summary="0x61 u8'a'")
         self.expect_expr("ab", result_type="const char8_t *", result_summary='u8"你好"')
         self.expect_expr("abc", result_type="char8_t[9]", result_summary='u8"你好"')