pkg/vminfo: deduplicate syscall test programs

Properly dedup syscall tests.
This reduces number of test programs for linux from 4349 to 641.

1 files changed, 8 insertions, 16 deletions

diff --git a/pkg/vminfo/linux_test.go b/pkg/vminfo/linux_test.go
index 702167606..be157b858 100644
--- a/pkg/vminfo/linux_test.go
+++ b/pkg/vminfo/linux_test.go
@@ -14,8 +14,6 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/syzkaller/pkg/flatrpc"
-	"github.com/google/syzkaller/pkg/ipc"
-	"github.com/google/syzkaller/pkg/rpctype"
 	"github.com/google/syzkaller/sys/targets"
 	"github.com/stretchr/testify/assert"
 )
@@ -24,6 +22,13 @@ func TestLinuxSyscalls(t *testing.T) {
 	cfg := testConfig(t, targets.Linux, targets.AMD64)
 	checker := New(cfg)
 	_, checkProgs := checker.StartCheck()
+	t.Logf("got %v test programs", len(checkProgs))
+	if len(checkProgs) > 1000 {
+		// This is just a sanity check that we don't do something stupid accidentally.
+		// If it grows above the limit intentionally, the limit can be increased.
+		// Currently we have 641 (when we failed to properly dedup syscall tests, it was 4349).
+		t.Fatal("too many test programs")
+	}
 	filesystems := []string{
 		"", "9p", "esdfs", "incremental-fs", "cgroup", "cgroup2",
 		"pvfs2", "nfs", "nfs4", "fuse", "fuseblk", "afs", "pipefs",
@@ -47,20 +52,7 @@ func TestLinuxSyscalls(t *testing.T) {
 			Data:   []byte(strings.Join(filesystems, "\nnodev\t")),
 		},
 	}
-	var results []rpctype.ExecutionResult
-	for _, req := range checkProgs {
-		p, err := cfg.Target.DeserializeExec(req.ProgData, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		res := rpctype.ExecutionResult{
-			ID: req.ID,
-			Info: ipc.ProgInfo{
-				Calls: make([]ipc.CallInfo, len(p.Calls)),
-			},
-		}
-		results = append(results, res)
-	}
+	results := createSuccessfulResults(t, cfg.Target, checkProgs)
 	enabled, disabled, err := checker.FinishCheck(files, results)
 	if err != nil {
 		t.Fatal(err)