pkg/ifuzz: use sub-tests for arches

Testing different arches is a good use for sub-tests.

1 files changed, 18 insertions, 10 deletions

diff --git a/pkg/ifuzz/ifuzz_test.go b/pkg/ifuzz/ifuzz_test.go
index 173c7aec6..5d02f8d1e 100644
--- a/pkg/ifuzz/ifuzz_test.go
+++ b/pkg/ifuzz/ifuzz_test.go
@@ -16,7 +16,17 @@ import (
 	_ "github.com/google/syzkaller/pkg/ifuzz/x86/generated"
 )
 
-func testmodearch(t *testing.T, arch string) {
+var allArches = []string{ifuzz.ArchX86, ifuzz.ArchPowerPC}
+
+func TestMode(t *testing.T) {
+	for _, arch := range allArches {
+		t.Run(arch, func(t *testing.T) {
+			testMode(t, arch)
+		})
+	}
+}
+
+func testMode(t *testing.T, arch string) {
 	all := make(map[ifuzz.Insn]bool)
 	for mode := 0; mode < ifuzz.ModeLast; mode++ {
 		for priv := 0; priv < 2; priv++ {
@@ -38,12 +48,15 @@ func testmodearch(t *testing.T, arch string) {
 	t.Logf("total: %v instructions", len(all))
 }
 
-func TestMode(t *testing.T) {
-	testmodearch(t, ifuzz.ArchX86)
-	testmodearch(t, ifuzz.ArchPowerPC)
+func TestDecode(t *testing.T) {
+	for _, arch := range allArches {
+		t.Run(arch, func(t *testing.T) {
+			testDecode(t, arch)
+		})
+	}
 }
 
-func testdecodearch(t *testing.T, arch string) {
+func testDecode(t *testing.T, arch string) {
 	insnset := ifuzzimpl.Types[arch]
 	xedEnabled := false
 	if _, err := insnset.DecodeExt(0, nil); err == nil {
@@ -117,8 +130,3 @@ func testdecodearch(t *testing.T, arch string) {
 		}
 	}
 }
-
-func TestDecode(t *testing.T) {
-	testdecodearch(t, ifuzz.ArchX86)
-	testdecodearch(t, ifuzz.ArchPowerPC)
-}