diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-02-28 20:42:33 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-02-28 20:44:44 +0900 |
| commit | c74c269b66770f0eddde255d2805b79f274409e9 (patch) | |
| tree | 02cb3e1bed01d24776d8d47a9c8fca47ed3d7343 /internal | |
| parent | 4b0cce4db5f8e75c79e104f8c5ec02cb4541ed76 (diff) | |
container: use /proc/self/exe directly
This is a more reliable form of pathname to self and also cheaper than os.Executable.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/lockedfile/internal/filelock/filelock_test.go | 4 | ||||
| -rw-r--r-- | internal/lockedfile/lockedfile_test.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/internal/lockedfile/internal/filelock/filelock_test.go b/internal/lockedfile/internal/filelock/filelock_test.go index 4e407394..4498423a 100644 --- a/internal/lockedfile/internal/filelock/filelock_test.go +++ b/internal/lockedfile/internal/filelock/filelock_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "hakurei.app/container" + "hakurei.app/container/fhs" "hakurei.app/internal/lockedfile/internal/filelock" "hakurei.app/internal/lockedfile/internal/testexec" ) @@ -197,7 +197,7 @@ func TestLockNotDroppedByExecCommand(t *testing.T) { // Some kinds of file locks are dropped when a duplicated or forked file // descriptor is unlocked. Double-check that the approach used by os/exec does // not accidentally drop locks. - cmd := testexec.CommandContext(t, t.Context(), container.MustExecutable(nil), "-test.run=^$") + cmd := testexec.CommandContext(t, t.Context(), fhs.ProcSelfExe, "-test.run=^$") if err := cmd.Run(); err != nil { t.Fatalf("exec failed: %v", err) } diff --git a/internal/lockedfile/lockedfile_test.go b/internal/lockedfile/lockedfile_test.go index 6182dd99..7ad3c2c5 100644 --- a/internal/lockedfile/lockedfile_test.go +++ b/internal/lockedfile/lockedfile_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "hakurei.app/container" + "hakurei.app/container/fhs" "hakurei.app/internal/lockedfile" "hakurei.app/internal/lockedfile/internal/testexec" ) @@ -215,7 +215,7 @@ func TestSpuriousEDEADLK(t *testing.T) { t.Fatal(err) } - cmd := testexec.CommandContext(t, t.Context(), container.MustExecutable(nil), "-test.run=^"+t.Name()+"$") + cmd := testexec.CommandContext(t, t.Context(), fhs.ProcSelfExe, "-test.run=^"+t.Name()+"$") cmd.Env = append(os.Environ(), fmt.Sprintf("%s=%s", dirVar, dir)) qDone := make(chan struct{}) |