From 1c3761bb53c95d75751f95e8f77d9d1e5928b968 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Tue, 25 Aug 2026 14:48:27 +0900 Subject: container: enter init path early There is generally no use case where any setup is required before init, and requiring the explicit function call is error-prone and unnecessary. It also causes trouble with packages using a similar trick. This change moves argv0 check early and makes it an import side effect. The stub will be removed in v0.5. Signed-off-by: Ophestra --- internal/dbus/proc_test.go | 3 +-- internal/helper/stub_test.go | 3 +-- internal/pkg/pkg_test.go | 2 -- internal/rosa/rosa_test.go | 3 --- 4 files changed, 2 insertions(+), 9 deletions(-) (limited to 'internal') diff --git a/internal/dbus/proc_test.go b/internal/dbus/proc_test.go index 544856ed..b6e5283b 100644 --- a/internal/dbus/proc_test.go +++ b/internal/dbus/proc_test.go @@ -4,8 +4,7 @@ import ( "os" "testing" - "hakurei.app/container" "hakurei.app/internal/helper" ) -func TestMain(m *testing.M) { container.TryArgv0(nil); helper.InternalHelperStub(); os.Exit(m.Run()) } +func TestMain(m *testing.M) { helper.InternalHelperStub(); os.Exit(m.Run()) } diff --git a/internal/helper/stub_test.go b/internal/helper/stub_test.go index 4b438a5b..c662d059 100644 --- a/internal/helper/stub_test.go +++ b/internal/helper/stub_test.go @@ -4,8 +4,7 @@ import ( "os" "testing" - "hakurei.app/container" "hakurei.app/internal/helper" ) -func TestMain(m *testing.M) { container.TryArgv0(nil); helper.InternalHelperStub(); os.Exit(m.Run()) } +func TestMain(m *testing.M) { helper.InternalHelperStub(); os.Exit(m.Run()) } diff --git a/internal/pkg/pkg_test.go b/internal/pkg/pkg_test.go index 39218d96..b23948f8 100644 --- a/internal/pkg/pkg_test.go +++ b/internal/pkg/pkg_test.go @@ -85,8 +85,6 @@ func newRContext(tb testing.TB, c *pkg.Cache) *pkg.RContext { return &r } -func TestMain(m *testing.M) { container.TryArgv0(nil); os.Exit(m.Run()) } - // overrideIdent overrides the ID method of [Artifact]. type overrideIdent struct { id pkg.ID diff --git a/internal/rosa/rosa_test.go b/internal/rosa/rosa_test.go index 86468ea4..76e8a53e 100644 --- a/internal/rosa/rosa_test.go +++ b/internal/rosa/rosa_test.go @@ -10,7 +10,6 @@ import ( "testing" "hakurei.app/check" - "hakurei.app/container" "hakurei.app/internal/pkg" "hakurei.app/internal/rosa" "hakurei.app/message" @@ -28,8 +27,6 @@ var ( ) func TestMain(m *testing.M) { - container.TryArgv0(nil) - code := m.Run() if buildTestCache != nil { buildTestCacheCancel() -- cgit v1.3.1