pkg: rename test helper

This is less ambiguous, and more consistent with upcoming integration
test suite changes.

Signed-off-by: Ophestra <cat@gensokyo.uk>

11 files changed, 113 insertions, 112 deletions

diff --git a/.gitignore b/.gitignore
index 022468e6..18df150d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@
 # go generate
 /cmd/hakurei/LICENSE
 /cmd/mbf/internal/pkgsite/ui/static
-/pkg/internal/testtool/testtool
+/pkg/internal/tester/tester
 /internal/rosa/hakurei_current.tar.gz
 
 # cmd/dist default destination
diff --git a/pkg/exec_test.go b/pkg/exec_test.go
index 051af551..a24c1e5e 100644
--- a/pkg/exec_test.go
+++ b/pkg/exec_test.go
@@ -23,18 +23,18 @@ import (
 	"hakurei.app/internal/stub"
 	"hakurei.app/pkg"
 
-	"hakurei.app/pkg/internal/testtool/expected"
+	"hakurei.app/pkg/internal/tester/expected"
 )
 
-// testtoolBin is the container test tool binary made available to the
+// testHelperBin is the container test helper binary made available to the
 // execArtifact for testing its curing environment.
 //
-//go:generate env CGO_ENABLED=0 go build -tags testtool -o internal/testtool ./internal/testtool
-//go:embed internal/testtool/testtool
-var testtoolBin []byte
+//go:generate env CGO_ENABLED=0 go build -tags tester -o internal/tester ./internal/tester
+//go:embed internal/tester/tester
+var testHelperBin []byte
 
 func init() {
-	pathname, err := filepath.Abs("internal/testtool/testtool")
+	pathname, err := filepath.Abs("internal/tester/tester")
 	if err != nil {
 		panic(err)
 	}
@@ -153,15 +153,15 @@ func TestExec(t *testing.T) {
 
 	checkWithCache(t, []cacheTestCase{
 		{"offline", pkg.CValidateKnown | checkDestroySubstitutes, nil, func(t *testing.T, base *check.Absolute, c *pkg.Cache) {
-			testtool, testtoolDestroy := newTesttool()
+			testHelper, destroyTestHelper := newTestHelper()
 
 			cureMany(t, c, []cureStep{
 				{"container", pkg.NewExec(
 					"exec-offline", "", new(wantOffline.hash()), 0, false, false,
 					pkg.AbsWork,
 					[]string{"HAKUREI_TEST=1"},
-					check.MustAbs("/opt/bin/testtool"),
-					[]string{"testtool"},
+					check.MustAbs("/opt/bin/tester"),
+					[]string{"tester"},
 
 					pkg.MustPath("/file", false, newStubFile(
 						pkg.KindHTTPGet,
@@ -176,15 +176,15 @@ func TestExec(t *testing.T) {
 							return os.MkdirAll(t.GetWorkDir().String(), 0700)
 						},
 					}),
-					pkg.MustPath("/opt", false, testtool),
+					pkg.MustPath("/opt", false, testHelper),
 				), ignorePathname, wantOffline, pkg.WNew, nil},
 
 				{"substitution", pkg.NewExec(
 					"exec-offline", "", new(wantOffline.hash()), 0, false, false,
 					pkg.AbsWork,
 					[]string{"HAKUREI_TEST=1"},
-					check.MustAbs("/opt/bin/testtool"),
-					[]string{"testtool"},
+					check.MustAbs("/opt/bin/tester"),
+					[]string{"tester"},
 
 					pkg.MustPath("/file", false, newStubFile(
 						pkg.KindHTTPGet,
@@ -192,7 +192,7 @@ func TestExec(t *testing.T) {
 						nil,
 						nil, nil,
 					)),
-					// substitution miss fails in testtool due to differing idents
+					// substitution miss fails in tester due to differing idents
 					pkg.MustPath("/.hakurei", false, &stubArtifact{
 						kind:   pkg.KindTar,
 						params: []byte("empty directory (substituted)"),
@@ -200,15 +200,15 @@ func TestExec(t *testing.T) {
 							return os.MkdirAll(t.GetWorkDir().String(), 0700)
 						},
 					}),
-					pkg.MustPath("/opt", false, testtool),
+					pkg.MustPath("/opt", false, testHelper),
 				), ignorePathname, wantOffline, pkg.WSubstitute, nil},
 
 				{"error passthrough", pkg.NewExec(
 					"", "", nil, 0, false, true,
 					pkg.AbsWork,
 					[]string{"HAKUREI_TEST=1"},
-					check.MustAbs("/opt/bin/testtool"),
-					[]string{"testtool"},
+					check.MustAbs("/opt/bin/tester"),
+					[]string{"tester"},
 
 					pkg.MustPath("/proc/nonexistent", false, failingArtifact),
 				), nil, nil, pkg.WNew, pkg.InputError{
@@ -219,8 +219,8 @@ func TestExec(t *testing.T) {
 					"", "", nil, 0, false, false,
 					pkg.AbsWork,
 					[]string{"HAKUREI_TEST=1"},
-					check.MustAbs("/opt/bin/testtool"),
-					[]string{"testtool"},
+					check.MustAbs("/opt/bin/tester"),
+					[]string{"tester"},
 
 					pkg.ExecPath{},
 				), nil, nil, pkg.WNew, pkg.ErrInvalidPaths},
@@ -231,8 +231,8 @@ func TestExec(t *testing.T) {
 				"", "", nil, 0, false, false,
 				pkg.AbsWork,
 				nil,
-				check.MustAbs("/opt/bin/testtool"),
-				[]string{"testtool"},
+				check.MustAbs("/opt/bin/tester"),
+				[]string{"tester"},
 			)
 			var exitError *exec.ExitError
 			if _, _, err := c.Cure(initFailureArtifact); !errors.As(err, &exitError) ||
@@ -256,13 +256,13 @@ func TestExec(t *testing.T) {
 			if !bytes.HasPrefix(faultStatus, []byte(
 				"hakurei.app/pkg ",
 			)) || !bytes.Contains(faultStatus, []byte(
-				"\ninit: fork/exec /opt/bin/testtool: no such file or directory\n",
+				"\ninit: fork/exec /opt/bin/tester: no such file or directory\n",
 			)) {
 				t.Errorf("unexpected status:\n%s", string(faultStatus))
 			}
 
 			destroyStatus(t, base, 2, 1)
-			testtoolDestroy(t, base, c)
+			destroyTestHelper(t, base, c)
 		}, expectsFS{
 			".": {Mode: fs.ModeDir | 0700},
 
@@ -286,7 +286,7 @@ func TestExec(t *testing.T) {
 		}},
 
 		{"net", pkg.CValidateKnown | checkDestroySubstitutes, nil, func(t *testing.T, base *check.Absolute, c *pkg.Cache) {
-			testtool, testtoolDestroy := newTesttool()
+			testHelper, destroyTestHelper := newTestHelper()
 
 			wantNet := expectsFS{
 				".": {Mode: fs.ModeDir | 0500},
@@ -298,8 +298,8 @@ func TestExec(t *testing.T) {
 					"exec-net", "", new(wantNet.hash()), 0, true, false,
 					pkg.AbsWork,
 					[]string{"HAKUREI_TEST=1"},
-					check.MustAbs("/opt/bin/testtool"),
-					[]string{"testtool", "net"},
+					check.MustAbs("/opt/bin/tester"),
+					[]string{"tester", "net"},
 
 					pkg.MustPath("/file", false, newStubFile(
 						pkg.KindHTTPGet,
@@ -314,12 +314,12 @@ func TestExec(t *testing.T) {
 							return os.MkdirAll(t.GetWorkDir().String(), 0700)
 						},
 					}),
-					pkg.MustPath("/opt", false, testtool),
+					pkg.MustPath("/opt", false, testHelper),
 				), ignorePathname, wantNet, pkg.WNew, nil},
 			})
 
 			destroyStatus(t, base, 2, 0)
-			testtoolDestroy(t, base, c)
+			destroyTestHelper(t, base, c)
 		}, expectsFS{
 			".": {Mode: fs.ModeDir | 0700},
 
@@ -341,15 +341,15 @@ func TestExec(t *testing.T) {
 		}},
 
 		{"overlay root", pkg.CValidateKnown | checkDestroySubstitutes, nil, func(t *testing.T, base *check.Absolute, c *pkg.Cache) {
-			testtool, testtoolDestroy := newTesttool()
+			testHelper, destroyTestHelper := newTestHelper()
 
 			cureMany(t, c, []cureStep{
 				{"container", pkg.NewExec(
 					"exec-overlay-root", "", nil, 0, false, false,
 					pkg.AbsWork,
 					[]string{"HAKUREI_TEST=1", "HAKUREI_ROOT=1"},
-					check.MustAbs("/opt/bin/testtool"),
-					[]string{"testtool"},
+					check.MustAbs("/opt/bin/tester"),
+					[]string{"tester"},
 
 					pkg.MustPath("/", true, &stubArtifact{
 						kind:   pkg.KindTar,
@@ -358,12 +358,12 @@ func TestExec(t *testing.T) {
 							return os.MkdirAll(t.GetWorkDir().String(), 0700)
 						},
 					}),
-					pkg.MustPath("/opt", false, testtool),
+					pkg.MustPath("/opt", false, testHelper),
 				), ignorePathname, wantOffline, pkg.WNew, nil},
 			})
 
 			destroyStatus(t, base, 2, 0)
-			testtoolDestroy(t, base, c)
+			destroyTestHelper(t, base, c)
 		}, expectsFS{
 			".": {Mode: fs.ModeDir | 0700},
 
@@ -383,15 +383,15 @@ func TestExec(t *testing.T) {
 		}},
 
 		{"overlay work", pkg.CValidateKnown | checkDestroySubstitutes, nil, func(t *testing.T, base *check.Absolute, c *pkg.Cache) {
-			testtool, testtoolDestroy := newTesttool()
+			testHelper, destroyTestHelper := newTestHelper()
 
 			cureMany(t, c, []cureStep{
 				{"container", pkg.NewExec(
 					"exec-overlay-work", "", nil, 0, false, false,
 					pkg.AbsWork,
 					[]string{"HAKUREI_TEST=1", "HAKUREI_ROOT=1"},
-					check.MustAbs("/work/bin/testtool"),
-					[]string{"testtool"},
+					check.MustAbs("/work/bin/tester"),
+					[]string{"tester"},
 
 					pkg.MustPath("/", true, &stubArtifact{
 						kind:   pkg.KindTar,
@@ -405,12 +405,12 @@ func TestExec(t *testing.T) {
 						cure: func(t *pkg.TContext) error {
 							return os.MkdirAll(t.GetWorkDir().String(), 0700)
 						},
-					}), pkg.Path(pkg.AbsWork, false /* ignored */, testtool),
+					}), pkg.Path(pkg.AbsWork, false /* ignored */, testHelper),
 				), ignorePathname, wantOffline, pkg.WNew, nil},
 			})
 
 			destroyStatus(t, base, 2, 0)
-			testtoolDestroy(t, base, c)
+			destroyTestHelper(t, base, c)
 		}, expectsFS{
 			".": {Mode: fs.ModeDir | 0700},
 
@@ -430,15 +430,15 @@ func TestExec(t *testing.T) {
 		}},
 
 		{"multiple layers", pkg.CValidateKnown | checkDestroySubstitutes, nil, func(t *testing.T, base *check.Absolute, c *pkg.Cache) {
-			testtool, testtoolDestroy := newTesttool()
+			testHelper, destroyTestHelper := newTestHelper()
 
 			cureMany(t, c, []cureStep{
 				{"container", pkg.NewExec(
 					"exec-multiple-layers", "", nil, 0, false, false,
 					pkg.AbsWork,
 					[]string{"HAKUREI_TEST=1", "HAKUREI_ROOT=1"},
-					check.MustAbs("/opt/bin/testtool"),
-					[]string{"testtool", "layers"},
+					check.MustAbs("/opt/bin/tester"),
+					[]string{"tester", "layers"},
 
 					pkg.MustPath("/", true, &stubArtifact{
 						kind:   pkg.KindTar,
@@ -474,12 +474,12 @@ func TestExec(t *testing.T) {
 							return os.WriteFile(work.Append("check").String(), []byte("layers"), 0400)
 						},
 					}),
-					pkg.MustPath("/opt", false, testtool),
+					pkg.MustPath("/opt", false, testHelper),
 				), ignorePathname, wantOffline, pkg.WNew, nil},
 			})
 
 			destroyStatus(t, base, 2, 0)
-			testtoolDestroy(t, base, c)
+			destroyTestHelper(t, base, c)
 		}, expectsFS{
 			".": {Mode: fs.ModeDir | 0700},
 
@@ -504,15 +504,15 @@ func TestExec(t *testing.T) {
 		}},
 
 		{"overlay layer promotion", pkg.CValidateKnown | checkDestroySubstitutes, nil, func(t *testing.T, base *check.Absolute, c *pkg.Cache) {
-			testtool, testtoolDestroy := newTesttool()
+			testHelper, destroyTestHelper := newTestHelper()
 
 			cureMany(t, c, []cureStep{
 				{"container", pkg.NewExec(
 					"exec-layer-promotion", "", nil, 0, false, true,
 					pkg.AbsWork,
 					[]string{"HAKUREI_TEST=1", "HAKUREI_ROOT=1"},
-					check.MustAbs("/opt/bin/testtool"),
-					[]string{"testtool", "promote"},
+					check.MustAbs("/opt/bin/tester"),
+					[]string{"tester", "promote"},
 
 					pkg.MustPath("/", true, &stubArtifact{
 						kind:   pkg.KindTar,
@@ -527,12 +527,12 @@ func TestExec(t *testing.T) {
 							return os.MkdirAll(t.GetWorkDir().String(), 0700)
 						},
 					}),
-					pkg.MustPath("/opt", false, testtool),
+					pkg.MustPath("/opt", false, testHelper),
 				), ignorePathname, wantOffline, pkg.WNew, nil},
 			})
 
 			destroyStatus(t, base, 2, 0)
-			testtoolDestroy(t, base, c)
+			destroyTestHelper(t, base, c)
 		}, expectsFS{
 			".": {Mode: fs.ModeDir | 0700},
 
@@ -621,14 +621,14 @@ func TestExec(t *testing.T) {
 	})
 }
 
-// newTesttool returns an [Artifact] that cures into testtoolBin. The returned
+// newTestHelper returns an [Artifact] that cures into testHelperBin. The returned
 // function must be called at the end of the test but not deferred.
-func newTesttool() (
-	testtool pkg.Artifact,
-	testtoolDestroy func(t *testing.T, base *check.Absolute, c *pkg.Cache),
+func newTestHelper() (
+	testHelper pkg.Artifact,
+	destroyTestHelper func(t *testing.T, base *check.Absolute, c *pkg.Cache),
 ) {
-	// testtoolBin is built during go:generate and is not deterministic
-	testtool = overrideIdent{pkg.ID{0xfe, 0xff}, &stubArtifact{
+	// testHelperBin is built during go:generate and is not deterministic
+	testHelper = overrideIdent{pkg.ID{0xfe, 0xff}, &stubArtifact{
 		kind: pkg.KindTar,
 		cure: func(t *pkg.TContext) error {
 			work := t.GetWorkDir()
@@ -661,10 +661,10 @@ func newTesttool() (
 
 			return os.WriteFile(t.GetWorkDir().Append(
 				"bin",
-				"testtool",
-			).String(), testtoolBin, 0500)
+				"tester",
+			).String(), testHelperBin, 0500)
 		},
 	}}
-	testtoolDestroy = newDestroyArtifactFunc(testtool)
+	destroyTestHelper = newDestroyArtifactFunc(testHelper)
 	return
 }
diff --git a/pkg/internal/testtool/expected/expected.go b/pkg/internal/tester/expected/expected.go
index c0e8e4a2..c0e8e4a2 100644
--- a/pkg/internal/testtool/expected/expected.go
+++ b/pkg/internal/tester/expected/expected.go
diff --git a/pkg/internal/tester/expected/sum_amd64.go b/pkg/internal/tester/expected/sum_amd64.go
new file mode 100644
index 00000000..c3ef87b6
--- /dev/null
+++ b/pkg/internal/tester/expected/sum_amd64.go
@@ -0,0 +1,11 @@
+package expected
+
+const (
+	Offline  = "8cvRbO_908FqbZvom0pp2MdLHiZMlllsBBHtwJMDOPeIm_Y55AvL8nkB5-ZvKQP7"
+	OfflineS = "R4nw81-Egce4yJgi4eoK0nDzPNkvCffaPUn8KPP1q1sdQ-dxjGc6YaYtBViUZTz4"
+	OvlRoot  = "0W_DBfLbYbYiXkCL9BIwq1BBL_CAOQw1Al75FmU-w1pYWxc-s1CpaUl2VGiK1wU6"
+	Layers   = "X0e6BdvAC_-MOguDI8f_9OrLyv9r32nV4zKRkLMr2Xye0-Nlc3Rew9Cycm0FlNfb"
+	Net      = "B4VXPvG7mhh96PWmjwwma8Fy4HliP9WFEEW5vtq2lQrPEulZT_lSixX7Iowqpe_J"
+	Promote  = "T_WzFNqwS4hZvNXsnDKOQkc7iwl38CY0GUsCGVnAhiJkU7iLARbeNDtAcA7C-FX1"
+	Work     = "HknOKpTaBKOA5hwAP4eiqwzOQrw9JPQpJVhf-mpd2mIpQc6dfP7xqDALV2h4z0Ce"
+)
diff --git a/pkg/internal/tester/expected/sum_arm64.go b/pkg/internal/tester/expected/sum_arm64.go
new file mode 100644
index 00000000..3b0d3a5b
--- /dev/null
+++ b/pkg/internal/tester/expected/sum_arm64.go
@@ -0,0 +1,11 @@
+package expected
+
+const (
+	Offline  = "f2G7Tr0wDhFL8LuJcgggob3C6jjVUvR1Vrs_xIQVaFt7qaoZJwtWIZ3-KgI0BjAE"
+	OfflineS = "6ShIakYroFkApzv_spmRfdhndwnnUVZFD2fgBRVA8n6GiSuYoeqF_37Loun6DneC"
+	OvlRoot  = "RDokIPUWpf6kGWaaOtowwNGkeBFOIyQBjUY3sQbJ_KDnioKTQTKn2kijDdQ9L6Fp"
+	Layers   = "dKXuQIWrySwPm5CNlR86XCe6FLrppcAJ6UxQKP75RCIjuK0nXA8ee6FMh4VNmKQS"
+	Net      = "vxarc7CMN1BFQe7jOf4iDKNpz2DVT1Om1KdrVCAZyQd_7mr3loB0GjSnbE-mpjyC"
+	Promote  = "oypLdVJZmZ1c9Tmfk-8N-3EBzgO99MymPS9H5nsCBPtm9CV9woEj8CBtlKk3b7gH"
+	Work     = "JlGKRqXYGu6cREq_D4FIAHRT4zqu7uGIUtppWXDdEzRpQKflh7Y4sNHda1ecxRzj"
+)
diff --git a/pkg/internal/tester/expected/sum_riscv64.go b/pkg/internal/tester/expected/sum_riscv64.go
new file mode 100644
index 00000000..77c58120
--- /dev/null
+++ b/pkg/internal/tester/expected/sum_riscv64.go
@@ -0,0 +1,11 @@
+package expected
+
+const (
+	Offline  = "Xa9l5ZZx7lt0B0YZeHihzWa6P6bGQT3rYn2kaftMDqZ7L6bpE9eCG9_e1dWlz-pn"
+	OfflineS = "6_GnlF6L7phCGuzeG91SAXCgxYPMJqv3UsZVvvoTdCvTtl8nCKnYxTlxAjdTNYY_"
+	OvlRoot  = "2VZwLevuQ_ZmwFbAS-eZ4jGjcc71VqQYMkbZgzsV175oL3hGMto6jK-kFp6tcOF9"
+	Layers   = "QukD3gaFOC-1wSm4XvdLtkZllw5APdTSX4mcWT88XEDNGMhvcblgaOr6Q1a20D7W"
+	Net      = "XJME3Hjy2iZ2kGepJXtUOhETEMD6Li9ccLwi7y_4vQ7Kur0KGpXrfM8tyFnfLkFg"
+	Promote  = "l71HASLptywY1pYL_pJBD8qoBkuUJCUobA6mSLUIsajew1IYkscZckBsqPu_czYn"
+	Work     = "ZTJD0WoYxSB15h_VPjXHMuLhlL2bMgyGrJgltHRd4XBZhNr-WYNGVodt53GCBRXC"
+)
diff --git a/pkg/internal/testtool/main.go b/pkg/internal/tester/main.go
index 80f87435..72e20426 100644
--- a/pkg/internal/testtool/main.go
+++ b/pkg/internal/tester/main.go
@@ -1,5 +1,6 @@
-//go:build testtool
+//go:build tester
 
+// The tester program checks containers started by package pkg.
 package main
 
 import (
@@ -17,12 +18,12 @@ import (
 	"hakurei.app/fhs"
 	"hakurei.app/vfs"
 
-	"hakurei.app/pkg/internal/testtool/expected"
+	"hakurei.app/pkg/internal/tester/expected"
 )
 
 func main() {
 	log.SetFlags(0)
-	log.SetPrefix("testtool: ")
+	log.SetPrefix("tester: ")
 
 	if os.Getenv("HAKUREI_BINFMT") == "1" {
 		wantArgs := []string{"/interpreter", "/opt/bin/sample"}
@@ -50,27 +51,27 @@ func main() {
 	})
 
 	var hostNet, layers, promote bool
-	if len(os.Args) == 2 && os.Args[0] == "testtool" {
+	if len(os.Args) == 2 && os.Args[0] == "tester" {
 		switch os.Args[1] {
 		case "net":
 			hostNet = true
-			log.SetPrefix("testtool(net): ")
+			log.SetPrefix("tester(net): ")
 			break
 
 		case "layers":
 			layers = true
-			log.SetPrefix("testtool(layers): ")
+			log.SetPrefix("tester(layers): ")
 			break
 
 		case "promote":
 			promote = true
-			log.SetPrefix("testtool(promote): ")
+			log.SetPrefix("tester(promote): ")
 
 		default:
 			log.Fatalf("Args: %q", os.Args)
 			return
 		}
-	} else if wantArgs := []string{"testtool"}; !slices.Equal(os.Args, wantArgs) {
+	} else if wantArgs := []string{"tester"}; !slices.Equal(os.Args, wantArgs) {
 		log.Fatalf("Args: %q, want %q", os.Args, wantArgs)
 	}
 
@@ -79,7 +80,7 @@ func main() {
 	if len(environ) == 2 {
 		overlayRoot = true
 		if !layers && !promote {
-			log.SetPrefix("testtool(overlay root): ")
+			log.SetPrefix("tester(overlay root): ")
 		}
 		wantEnv = []string{"HAKUREI_TEST=1", "HAKUREI_ROOT=1"}
 	}
@@ -89,8 +90,8 @@ func main() {
 
 	var overlayWork bool
 	const (
-		wantExec     = "/opt/bin/testtool"
-		wantExecWork = "/work/bin/testtool"
+		wantExec     = "/opt/bin/tester"
+		wantExecWork = "/work/bin/tester"
 	)
 	var iftPath string
 	if got, err := os.Executable(); err != nil {
@@ -102,7 +103,7 @@ func main() {
 			switch got {
 			case wantExecWork:
 				overlayWork = true
-				log.SetPrefix("testtool(overlay work): ")
+				log.SetPrefix("tester(overlay work): ")
 
 			default:
 				log.Fatalf("Executable: %q, want %q", got, wantExec)
@@ -225,7 +226,7 @@ func main() {
 		ident = expected.Promote
 	}
 
-	next() // testtool artifact
+	next() // test helper artifact
 
 	next()
 	if overlayWork {
diff --git a/pkg/internal/testtool/expected/sum_amd64.go b/pkg/internal/testtool/expected/sum_amd64.go
deleted file mode 100644
index 354931be..00000000
--- a/pkg/internal/testtool/expected/sum_amd64.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package expected
-
-const (
-	Offline  = "IKmVhALejtYA3JhN1PCfjKF-Dio1XVcOeMWDHhfSHCbb4iBNhGjFy2UspZveZvb8"
-	OfflineS = "6ZubjSyCnz4-TKgQZi_BbY-JUwsStYCtD_f-BTDOOotfEbqkm47W20AazHRaLviz"
-	OvlRoot  = "Yox7WpG8B_OqIXWF4HWFZkUfsEl7DGzpFyZM0qtd9T8nQ-7SAkEUurlAe6_DJ6Iu"
-	Layers   = "aAwfxDB-efVo379FNl178jK7HEKU3LEjHbZdaVVjk7GnXGZGEANNsXnB3SCUxM9A"
-	Net      = "IU3GwU2jTBd7HjotvFo2wsDWBQGVGpamwiSKdc2G1EnhM-ZaacxAuK6q0wbTVxra"
-	Promote  = "rOjetGHzT_jPErrBR24IAZKDj8Q9dLLqxFQqloMgjsULss0VXDI--n6LxuMBHvmZ"
-	Work     = "7f9XDeREfvJIjCe0qesND0s0tasExAIcc-OH33-eq9tsrQPUXhJp4KEkpsYH4hCD"
-)
diff --git a/pkg/internal/testtool/expected/sum_arm64.go b/pkg/internal/testtool/expected/sum_arm64.go
deleted file mode 100644
index 2e6f7cbf..00000000
--- a/pkg/internal/testtool/expected/sum_arm64.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package expected
-
-const (
-	Offline  = "MTgCSzwPrzGigp9phvDPRwUTNGLm1KM2EsEtbz-l2cNieqjaGtnzm65CDXlSxXrl"
-	OfflineS = "p89bQg7_jR4nwaSbpEd08ne1jHOEw7Wlnlyv5FHq7ba1Kml3HSBZwEKRzu0gCqEb"
-	OvlRoot  = "9ifwO6MAaV9kTqRR2O5PJzm8XhfXbr50mFLWyEHQm8OHHcJtAEUgXZzJYoZt9YVV"
-	Layers   = "INuGActFPwJtS7mAR9Bkt7FD4yoHlXHSJ9CaSAQJrpkUBL_k815Cs_jvRfxy5-a7"
-	Net      = "kJvy24uk4ePvHoxSKf4vMOhR4NxLbmyWlA9bTS7d3z3fE9WF1Tvpao9g-QuYU4vm"
-	Promote  = "lYqyYrfjPawIbld5Qz0NbKvd_bmI3nJC1eEnlIQWzsjWE9uA1HuKPAaClnDeyG6L"
-	Work     = "V6k4FqOBMRCmHiqchs5-joVGZ_MhNWZyXm3gdbU0S7S5eMze7G4SwYMTf66ojKQL"
-)
diff --git a/pkg/internal/testtool/expected/sum_riscv64.go b/pkg/internal/testtool/expected/sum_riscv64.go
deleted file mode 100644
index 53872c08..00000000
--- a/pkg/internal/testtool/expected/sum_riscv64.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package expected
-
-const (
-	Offline  = "LlieSHVDe1lnKvfI8t4oGRg_2hPxwyy1drmaqc-EKCOENuS9C2YHrp2VY5pSyhbg"
-	OfflineS = "qccjM8oYjUuEYPKFFzAxDFVzMerSUKUZc18NdVQoiPWf-70XOsNK8NaUQqjTgTAD"
-	OvlRoot  = "lpV2bb_KGYFHPiOn-jtGop8K_ew0y1p3BezRp0ebM93_a-T9J-vkqGD5uokda1aN"
-	Layers   = "sM3DJm210CHPGHkAquIbrXhspB81FpVC60ApQrvJGD5El2i7cSONj7LWf7EWqKpT"
-	Net      = "JihQUwsVETRYjb2-yIXLYZ6WVsaFebwl8btSYAsNQ2QapS5MZVaI-dYwrVoySycR"
-	Promote  = "lGqwR4W2OjylSVitMQP1lc6wApOBkbMjsmIqkxQbfEZ3DHEQBbJr84ErW6Xb54zo"
-	Work     = "aZgtyv6aMtoHFkHAaJr6nLaA7N_SHjShgWPyQ5UdzaIqYSiVqvCrZqSokGTCcTii"
-)
diff --git a/pkg/ir_test.go b/pkg/ir_test.go
index 9cc024ae..7ad5a8f5 100644
--- a/pkg/ir_test.go
+++ b/pkg/ir_test.go
@@ -40,8 +40,8 @@ func TestIRRoundtrip(t *testing.T) {
 			"exec-offline", "", nil, 0, false, false,
 			pkg.AbsWork,
 			[]string{"HAKUREI_TEST=1"},
-			check.MustAbs("/opt/bin/testtool"),
-			[]string{"testtool"},
+			check.MustAbs("/opt/bin/tester"),
+			[]string{"tester"},
 
 			pkg.MustPath("/file", false, pkg.NewFile("file", []byte(
 				"stub file",
@@ -49,7 +49,7 @@ func TestIRRoundtrip(t *testing.T) {
 				nil, "file:///hakurei.tar",
 				pkg.Checksum(bytes.Repeat([]byte{0xfc}, len(pkg.Checksum{}))),
 			))), pkg.MustPath("/opt", false, pkg.NewTar(pkg.NewDecompress(pkg.NewHTTPGet(
-				nil, "file:///testtool.tar.gz",
+				nil, "file:///test-helper.tar.gz",
 				pkg.Checksum(bytes.Repeat([]byte{0xfc}, len(pkg.Checksum{}))),
 			), pkg.Gzip))),
 		)},
@@ -60,8 +60,8 @@ func TestIRRoundtrip(t *testing.T) {
 			0, false, false,
 			pkg.AbsWork,
 			[]string{"HAKUREI_TEST=1"},
-			check.MustAbs("/opt/bin/testtool"),
-			[]string{"testtool", "net"},
+			check.MustAbs("/opt/bin/tester"),
+			[]string{"tester", "net"},
 
 			pkg.MustPath("/file", false, pkg.NewFile("file", []byte(
 				"stub file",
@@ -69,7 +69,7 @@ func TestIRRoundtrip(t *testing.T) {
 				nil, "file:///hakurei.tar",
 				pkg.Checksum(bytes.Repeat([]byte{0xfc}, len(pkg.Checksum{}))),
 			))), pkg.MustPath("/opt", false, pkg.NewTar(pkg.NewDecompress(pkg.NewHTTPGet(
-				nil, "file:///testtool.tar.gz",
+				nil, "file:///test-helper.tar.gz",
 				pkg.Checksum(bytes.Repeat([]byte{0xfc}, len(pkg.Checksum{}))),
 			), pkg.Gzip))),
 		)},
@@ -80,8 +80,8 @@ func TestIRRoundtrip(t *testing.T) {
 			0, false, false,
 			pkg.AbsWork,
 			[]string{"HAKUREI_TEST=1"},
-			check.MustAbs("/opt/bin/testtool"),
-			[]string{"testtool", "measured"},
+			check.MustAbs("/opt/bin/tester"),
+			[]string{"tester", "measured"},
 
 			pkg.MustPath("/file", false, pkg.NewFile("file", []byte(
 				"stub file",
@@ -89,7 +89,7 @@ func TestIRRoundtrip(t *testing.T) {
 				nil, "file:///hakurei.tar",
 				pkg.Checksum(bytes.Repeat([]byte{0xfd}, len(pkg.Checksum{}))),
 			))), pkg.MustPath("/opt", false, pkg.NewTar(pkg.NewDecompress(pkg.NewHTTPGet(
-				nil, "file:///testtool.tar.gz",
+				nil, "file:///test-helper.tar.gz",
 				pkg.Checksum(bytes.Repeat([]byte{0xfd}, len(pkg.Checksum{}))),
 			), pkg.Gzip))),
 		)},