Skip to content

Commit d2b71c7

Browse files
committed
[libc++] Fix how we run codesign in the test suite when --codesign_identity is provided
1 parent 77d8ce5 commit d2b71c7

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

libcxx/utils/run.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@ def main():
4242
# Do any necessary codesigning of test-executables found in the command line.
4343
if args.codesign_identity:
4444
for exe in filter(isTestExe, commandLine):
45-
subprocess.check_call(
46-
["xcrun", "codesign", "-f", "-s", args.codesign_identity, exe], env={}
47-
)
45+
codesign = ["codesign", "-f", "-s", args.codesign_identity, exe]
46+
subprocess.check_call(codesign, env={})
4847

4948
# Extract environment variables into a dictionary
5049
env = {k: v for (k, v) in map(lambda s: s.split("=", 1), args.env)}

libcxx/utils/ssh.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def runCommand(command, *args_, **kwargs):
8585
# Do any necessary codesigning of test-executables found in the command line.
8686
if args.codesign_identity:
8787
for exe in filter(isTestExe, commandLine):
88-
codesign = ["xcrun", "codesign", "-f", "-s", args.codesign_identity, exe]
88+
codesign = ["codesign", "-f", "-s", args.codesign_identity, exe]
8989
runCommand(codesign, env={}, check=True)
9090

9191
# tar up the execution directory (which contains everything that's needed

0 commit comments

Comments
 (0)