[libcxx-commits] [libcxx] d2b71c7 - [libc++] Fix how we run codesign in the test suite when --codesign_identity is provided

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2023-09-21T13:34:58-04:00
New Revision: d2b71c7a1aef52a500909283aab5c968f71c9ff4

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

LOG: [libc++] Fix how we run codesign in the test suite when --codesign_identity is provided

Added: 
    

Modified: 
    libcxx/utils/run.py
    libcxx/utils/ssh.py

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/run.py b/libcxx/utils/run.py
index 32961d7b0275a8b..6b4d615444bcfa5 100755
--- a/libcxx/utils/run.py
+++ b/libcxx/utils/run.py
@@ -42,9 +42,8 @@ def main():
     # Do any necessary codesigning of test-executables found in the command line.
     if args.codesign_identity:
         for exe in filter(isTestExe, commandLine):
-            subprocess.check_call(
-                ["xcrun", "codesign", "-f", "-s", args.codesign_identity, exe], env={}
-            )
+            codesign = ["codesign", "-f", "-s", args.codesign_identity, exe]
+            subprocess.check_call(codesign, env={})
 
     # Extract environment variables into a dictionary
     env = {k: v for (k, v) in map(lambda s: s.split("=", 1), args.env)}

diff  --git a/libcxx/utils/ssh.py b/libcxx/utils/ssh.py
index e8f06e013e2a6b3..f39e41355261246 100755
--- a/libcxx/utils/ssh.py
+++ b/libcxx/utils/ssh.py
@@ -85,7 +85,7 @@ def runCommand(command, *args_, **kwargs):
         # Do any necessary codesigning of test-executables found in the command line.
         if args.codesign_identity:
             for exe in filter(isTestExe, commandLine):
-                codesign = ["xcrun", "codesign", "-f", "-s", args.codesign_identity, exe]
+                codesign = ["codesign", "-f", "-s", args.codesign_identity, exe]
                 runCommand(codesign, env={}, check=True)
 
         # tar up the execution directory (which contains everything that's needed