[Lldb-commits] [lldb] b1e9bae - [lldb] Enable TestPublicAPIHeaders.py on Apple Silicon

[Alex Langford via lldb-commits]

Author: Alex Langford
Date: 2023-03-17T12:43:14-07:00
New Revision: b1e9baea3a2c486dc09b6a098439d1f75548b582

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

LOG: [lldb] Enable TestPublicAPIHeaders.py on Apple Silicon

This cleans up the test a bit and enables it to run on apple silicon
machines.

Added: 
    

Modified: 
    lldb/test/API/api/check_public_api_headers/TestPublicAPIHeaders.py

Removed: 
    


################################################################################
diff  --git a/lldb/test/API/api/check_public_api_headers/TestPublicAPIHeaders.py b/lldb/test/API/api/check_public_api_headers/TestPublicAPIHeaders.py
index b74e395b3e671..d57817d228e6c 100644
--- a/lldb/test/API/api/check_public_api_headers/TestPublicAPIHeaders.py
+++ b/lldb/test/API/api/check_public_api_headers/TestPublicAPIHeaders.py
@@ -9,6 +9,8 @@
 
 
 @skipIfNoSBHeaders
+ at skipIfRemote
+ at skipUnlessDarwin
 class SBDirCheckerCase(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
@@ -20,12 +22,8 @@ def setUp(self):
     def test_sb_api_directory(self):
         """Test the SB API directory and make sure there's no unwanted stuff."""
 
-        # Only proceed if this is an Apple OS, "x86_64", and local platform.
-        if not (self.platformIsDarwin() and self.getArchitecture() == "x86_64"):
+        if not self.isAArch64() and self.getArchitecture() != "x86_64":
             self.skipTest("This test is only for LLDB.framework built 64-bit")
-        if self.getArchitecture() == "i386":
-            self.skipTest(
-                "LLDB is 64-bit and cannot be linked to 32-bit test program.")
 
         exe_name = self.getBuildArtifact("a.out")
         self.buildDriver(self.source, exe_name)
@@ -33,7 +31,6 @@ def test_sb_api_directory(self):
 
     def sanity_check_executable(self, exe_name):
         """Sanity check executable compiled from the auto-generated program."""
-        exe_name = self.getBuildArtifact("a.out")
         exe = self.getBuildArtifact(exe_name)
         self.runCmd("file %s" % exe, CURRENT_EXECUTABLE_SET)
 
@@ -46,10 +43,6 @@ def sanity_check_executable(self, exe_name):
         if self.TraceOn():
             print("Set environment to: ", env_cmd)
         self.runCmd(env_cmd)
-        self.addTearDownHook(
-            lambda: self.dbg.HandleCommand(
-                "settings remove target.env-vars %s" %
-                self.dylibPath))
 
         lldbutil.run_break_set_by_file_and_line(
             self, self.source, self.line_to_break, num_expected_locations=-1)