Skip to content

Commit

Permalink
darwintracelib1.0: re-enable proc tests on arm64
Browse files Browse the repository at this point in the history
Relax the path check in sipp_copy_proc.c so that it also passes in the
build tree, not only in the install location.
  • Loading branch information
neverpanic committed Nov 3, 2024
1 parent 102c6d8 commit c97822d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
4 changes: 0 additions & 4 deletions src/darwintracelib1.0/tests/proc.test
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ package require Pextlib 1.0

source "testlib.tcl"

testConstraint notarm64 [expr {[exec -ignorestderr -- /usr/bin/arch] ne "arm64"}]

test execve_selfpreserving_env "Test that you cannot get out of the sandbox by unsetting environment variables" \
-setup [setup [list allow $cwd]] \
-cleanup [expect] \
Expand Down Expand Up @@ -211,7 +209,6 @@ test spawn_non_existing_inside_sandbox "Test that posix_spawn(2) on a non-existi
# Apple-signed binaries, or arbitrary binaries on systems that are booted with
# boot-args=-arm64e_preview_abi (which cannot be enabled without disabling SIP).
test spawn_sip_binary "Test that posix_spawn(2) works on a SIP-protected binary (which will make a copy)" \
-constraints {notarm64} \
-setup {
file delete -force [file join $::env(DARWINTRACE_SIP_WORKAROUND_PATH) [getuid] usr/bin/env]
[setup [list allow /]]
Expand All @@ -235,7 +232,6 @@ test spawn_sip_binary "Test that posix_spawn(2) works on a SIP-protected binary
# Apple-signed binaries, or arbitrary binaries on systems that are booted with
# boot-args=-arm64e_preview_abi (which cannot be enabled without disabling SIP).
test spawn_sip_script "Test that posix_spawn(2) works on a SIP-protected shell script (which will copy the interpreter)" \
-constraints {notarm64} \
-setup [setup [list allow /]] \
-cleanup [expect {}] \
-body {exec -ignorestderr -- ./posix_spawn /usr/bin/umask} \
Expand Down
2 changes: 1 addition & 1 deletion src/pextlib1.0/sip_copy_proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ static int resign(const char *filepath) {
}

static struct timespec determine_pextlib_mtime() {
const char *needle_darwintrace = "/darwintrace1.0/darwintrace.dylib";
const char *needle_darwintrace = "/darwintrace.dylib";
size_t needle_darwintrace_len = strlen(needle_darwintrace);
const char *needle_pextlib = "/pextlib1.0/Pextlib.dylib";
size_t needle_pextlib_len = strlen(needle_pextlib);
Expand Down

0 comments on commit c97822d

Please sign in to comment.