prog: factor out common code in tests

Factor out a common test helper for tests that deserialize and check programs.

1 files changed, 68 insertions, 82 deletions

diff --git a/prog/size_test.go b/prog/size_test.go
index 5356c5263..7fed10fdc 100644
--- a/prog/size_test.go
+++ b/prog/size_test.go
@@ -5,7 +5,6 @@ package prog
 
 import (
 	"bytes"
-	"strings"
 	"testing"
 )
 
@@ -29,148 +28,135 @@ func TestAssignSizeRandom(t *testing.T) {
 }
 
 func TestAssignSize(t *testing.T) {
-	target := initTargetTest(t, "test", "64")
 	// nolint: lll
-	tests := []struct {
-		unsizedProg string
-		sizedProg   string
-	}{
+	testDeserialize(t, func(target *Target, p *Prog) {
+		for _, call := range p.Calls {
+			target.assignSizesCall(call)
+		}
+	}, []deserializeTest{
 		{
-			"test$length0(&(0x7f0000000000)={0xff, 0x0})",
-			"test$length0(&(0x7f0000000000)={0xff, 0x2})",
+			input:  "test$length0(&(0x7f0000000000)={0xff, 0x0})",
+			output: "test$length0(&(0x7f0000000000)={0xff, 0x2})",
 		},
 		{
-			"test$length1(&(0x7f0000001000)={0xff, 0x0})",
-			"test$length1(&(0x7f0000001000)={0xff, 0x4})",
+			input:  "test$length1(&(0x7f0000001000)={0xff, 0x0})",
+			output: "test$length1(&(0x7f0000001000)={0xff, 0x4})",
 		},
 		{
-			"test$length2(&(0x7f0000001000)={0xff, 0x0})",
-			"test$length2(&(0x7f0000001000)={0xff, 0x8})",
+			input:  "test$length2(&(0x7f0000001000)={0xff, 0x0})",
+			output: "test$length2(&(0x7f0000001000)={0xff, 0x8})",
 		},
 		{
-			"test$length3(&(0x7f0000005000)={0xff, 0x0, 0x0})",
-			"test$length3(&(0x7f0000005000)={0xff, 0x4, 0x2})",
+			input:  "test$length3(&(0x7f0000005000)={0xff, 0x0, 0x0})",
+			output: "test$length3(&(0x7f0000005000)={0xff, 0x4, 0x2})",
 		},
 		{
-			"test$length4(&(0x7f0000003000)={0x0, 0x0})",
-			"test$length4(&(0x7f0000003000)={0x2, 0x2})",
+			input:  "test$length4(&(0x7f0000003000)={0x0, 0x0})",
+			output: "test$length4(&(0x7f0000003000)={0x2, 0x2})",
 		},
 		{
-			"test$length5(&(0x7f0000002000)={0xff, 0x0})",
-			"test$length5(&(0x7f0000002000)={0xff, 0x4})",
+			input:  "test$length5(&(0x7f0000002000)={0xff, 0x0})",
+			output: "test$length5(&(0x7f0000002000)={0xff, 0x4})",
 		},
 		{
-			"test$length6(&(0x7f0000002000)={[0xff, 0xff, 0xff, 0xff], 0x0})",
-			"test$length6(&(0x7f0000002000)={[0xff, 0xff, 0xff, 0xff], 0x4})",
+			input:  "test$length6(&(0x7f0000002000)={[0xff, 0xff, 0xff, 0xff], 0x0})",
+			output: "test$length6(&(0x7f0000002000)={[0xff, 0xff, 0xff, 0xff], 0x4})",
 		},
 		{
-			"test$length7(&(0x7f0000003000)={[0xff, 0xff, 0xff, 0xff], 0x0})",
-			"test$length7(&(0x7f0000003000)={[0xff, 0xff, 0xff, 0xff], 0x8})",
+			input:  "test$length7(&(0x7f0000003000)={[0xff, 0xff, 0xff, 0xff], 0x0})",
+			output: "test$length7(&(0x7f0000003000)={[0xff, 0xff, 0xff, 0xff], 0x8})",
 		},
 		{
-			"test$length8(&(0x7f000001f000)={0x00, {0xff, 0x0, 0x00, [0xff, 0xff, 0xff]}, [{0xff, 0x0, 0x00, [0xff, 0xff, 0xff]}], 0x00, 0x0, [0xff, 0xff]})",
-			"test$length8(&(0x7f000001f000)={0x32, {0xff, 0x1, 0x10, [0xff, 0xff, 0xff]}, [{0xff, 0x1, 0x10, [0xff, 0xff, 0xff]}], 0x10, 0x1, [0xff, 0xff]})",
+			input:  "test$length8(&(0x7f000001f000)={0x00, {0xff, 0x0, 0x00, [0xff, 0xff, 0xff]}, [{0xff, 0x0, 0x00, [0xff, 0xff, 0xff]}], 0x00, 0x0, [0xff, 0xff]})",
+			output: "test$length8(&(0x7f000001f000)={0x32, {0xff, 0x1, 0x10, [0xff, 0xff, 0xff]}, [{0xff, 0x1, 0x10, [0xff, 0xff, 0xff]}], 0x10, 0x1, [0xff, 0xff]})",
 		},
 		{
-			"test$length9(&(0x7f000001f000)={&(0x7f0000000000/0x5000)=nil, 0x0000})",
-			"test$length9(&(0x7f000001f000)={&(0x7f0000000000/0x5000)=nil, 0x5000})",
+			input:  "test$length9(&(0x7f000001f000)={&(0x7f0000000000/0x5000)=nil, 0x0000})",
+			output: "test$length9(&(0x7f000001f000)={&(0x7f0000000000/0x5000)=nil, 0x5000})",
 		},
 		{
-			"test$length10(&(0x7f0000000000/0x5000)=nil, 0x0000, 0x0000, 0x0000, 0x0000)",
-			"test$length10(&(0x7f0000000000/0x5000)=nil, 0x5000, 0x5000, 0x2800, 0x1400)",
+			input:  "test$length10(&(0x7f0000000000/0x5000)=nil, 0x0000, 0x0000, 0x0000, 0x0000)",
+			output: "test$length10(&(0x7f0000000000/0x5000)=nil, 0x5000, 0x5000, 0x2800, 0x1400)",
 		},
 		{
-			"test$length11(&(0x7f0000000000)={0xff, 0xff, [0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]}, 0x00)",
-			"test$length11(&(0x7f0000000000)={0xff, 0xff, [0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]}, 0x30)",
+			input:  "test$length11(&(0x7f0000000000)={0xff, 0xff, [0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]}, 0x00)",
+			output: "test$length11(&(0x7f0000000000)={0xff, 0xff, [0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]}, 0x30)",
 		},
 		{
-			"test$length12(&(0x7f0000000000)={0xff, 0xff, [0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]}, 0x00)",
-			"test$length12(&(0x7f0000000000)={0xff, 0xff, [0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]}, 0x30)",
+			input:  "test$length12(&(0x7f0000000000)={0xff, 0xff, [0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]}, 0x00)",
+			output: "test$length12(&(0x7f0000000000)={0xff, 0xff, [0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]}, 0x30)",
 		},
 		{
-			"test$length13(&(0x7f0000000000)={0xff, 0xff, [0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]}, &(0x7f0000001000)=0x00)",
-			"test$length13(&(0x7f0000000000)={0xff, 0xff, [0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]}, &(0x7f0000001000)=0x30)",
+			input:  "test$length13(&(0x7f0000000000)={0xff, 0xff, [0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]}, &(0x7f0000001000)=0x00)",
+			output: "test$length13(&(0x7f0000000000)={0xff, 0xff, [0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]}, &(0x7f0000001000)=0x30)",
 		},
 		{
-			"test$length14(&(0x7f0000000000)={0xff, 0xff, [0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]}, &(0x7f0000001000)=0x00)",
-			"test$length14(&(0x7f0000000000)={0xff, 0xff, [0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]}, &(0x7f0000001000)=0x30)",
+			input:  "test$length14(&(0x7f0000000000)={0xff, 0xff, [0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]}, &(0x7f0000001000)=0x00)",
+			output: "test$length14(&(0x7f0000000000)={0xff, 0xff, [0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]}, &(0x7f0000001000)=0x30)",
 		},
 		{
-			"test_length15(0xff, 0x0)",
-			"test_length15(0xff, 0x2)",
+			input:  "test_length15(0xff, 0x0)",
+			output: "test_length15(0xff, 0x2)",
 		},
 		{
-			"test$length16(&(0x7f0000000000)={[0x42, 0x42], 0xff, 0xff, 0xff, 0xff, 0xff})",
-			"test$length16(&(0x7f0000000000)={[0x42, 0x42], 0x2, 0x10, 0x8, 0x4, 0x2})",
+			input:  "test$length16(&(0x7f0000000000)={[0x42, 0x42], 0xff, 0xff, 0xff, 0xff, 0xff})",
+			output: "test$length16(&(0x7f0000000000)={[0x42, 0x42], 0x2, 0x10, 0x8, 0x4, 0x2})",
 		},
 		{
-			"test$length17(&(0x7f0000000000)={0x42, 0xff, 0xff, 0xff, 0xff})",
-			"test$length17(&(0x7f0000000000)={0x42, 0x8, 0x4, 0x2, 0x1})",
+			input:  "test$length17(&(0x7f0000000000)={0x42, 0xff, 0xff, 0xff, 0xff})",
+			output: "test$length17(&(0x7f0000000000)={0x42, 0x8, 0x4, 0x2, 0x1})",
 		},
 		{
-			"test$length18(&(0x7f0000000000)={0x42, 0xff, 0xff, 0xff, 0xff})",
-			"test$length18(&(0x7f0000000000)={0x42, 0x8, 0x4, 0x2, 0x1})",
+			input:  "test$length18(&(0x7f0000000000)={0x42, 0xff, 0xff, 0xff, 0xff})",
+			output: "test$length18(&(0x7f0000000000)={0x42, 0x8, 0x4, 0x2, 0x1})",
 		},
 		{
-			"test$length19(&(0x7f0000000000)={{0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0xff}, 0xff, 0xff, 0xff})",
-			"test$length19(&(0x7f0000000000)={{0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x14}, 0x14, 0x14, 0x5})",
+			input:  "test$length19(&(0x7f0000000000)={{0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0xff}, 0xff, 0xff, 0xff})",
+			output: "test$length19(&(0x7f0000000000)={{0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x14}, 0x14, 0x14, 0x5})",
 		},
 		{
-			"test$length20(&(0x7f0000000000)={{{0xff, 0xff, 0xff, 0xff}, 0xff, 0xff, 0xff}, 0xff, 0xff})",
-			"test$length20(&(0x7f0000000000)={{{0x4, 0x4, 0x7, 0x9}, 0x7, 0x7, 0x9}, 0x9, 0x9})",
+			input:  "test$length20(&(0x7f0000000000)={{{0xff, 0xff, 0xff, 0xff}, 0xff, 0xff, 0xff}, 0xff, 0xff})",
+			output: "test$length20(&(0x7f0000000000)={{{0x4, 0x4, 0x7, 0x9}, 0x7, 0x7, 0x9}, 0x9, 0x9})",
 		},
 		{
-			"test$length21(&(0x7f0000000000)=0x0, 0x0)",
-			"test$length21(&(0x7f0000000000), 0x40)",
+			input:  "test$length21(&(0x7f0000000000)=0x0, 0x0)",
+			output: "test$length21(&(0x7f0000000000), 0x40)",
 		},
 		{
-			"test$length22(&(0x7f0000000000)='12345', 0x0)",
-			"test$length22(&(0x7f0000000000)='12345', 0x28)",
+			input:  "test$length22(&(0x7f0000000000)='12345', 0x0)",
+			output: "test$length22(&(0x7f0000000000)='12345', 0x28)",
 		},
 		{
-			"test$length23(&(0x7f0000000000)={0x1, {0x2, 0x0}})",
-			"test$length23(&(0x7f0000000000)={0x1, {0x2, 0x6}})",
+			input:  "test$length23(&(0x7f0000000000)={0x1, {0x2, 0x0}})",
+			output: "test$length23(&(0x7f0000000000)={0x1, {0x2, 0x6}})",
 		},
 		{
-			"test$length24(&(0x7f0000000000)={{0x0, {0x0}}, {0x0, {0x0}}})",
-			"test$length24(&(0x7f0000000000)={{0x0, {0x8}}, {0x0, {0x10}}})",
+			input:  "test$length24(&(0x7f0000000000)={{0x0, {0x0}}, {0x0, {0x0}}})",
+			output: "test$length24(&(0x7f0000000000)={{0x0, {0x8}}, {0x0, {0x10}}})",
 		},
 		{
-			"test$length26(&(0x7f0000000000), 0x0)",
-			"test$length26(&(0x7f0000000000), 0x8)",
+			input:  "test$length26(&(0x7f0000000000), 0x0)",
+			output: "test$length26(&(0x7f0000000000), 0x8)",
 		},
 		{
-			"test$length27(&(0x7f0000000000), 0x0)",
-			"test$length27(&(0x7f0000000000), 0x2a)",
+			input:  "test$length27(&(0x7f0000000000), 0x0)",
+			output: "test$length27(&(0x7f0000000000), 0x2a)",
 		},
 		{
-			"test$length28(&(0x7f0000000000), 0x0)",
-			"test$length28(&(0x7f0000000000), 0x2a)",
+			input:  "test$length28(&(0x7f0000000000), 0x0)",
+			output: "test$length28(&(0x7f0000000000), 0x2a)",
 		},
 		{
-			"test$length29(&(0x7f0000000000)={'./a\\x00', './b/c\\x00', 0x0, 0x0, 0x0})",
-			"test$length29(&(0x7f0000000000)={'./a\\x00', './b/c\\x00', 0xa, 0x14, 0x21})",
+			input:  "test$length29(&(0x7f0000000000)={'./a\\x00', './b/c\\x00', 0x0, 0x0, 0x0})",
+			output: "test$length29(&(0x7f0000000000)={'./a\\x00', './b/c\\x00', 0xa, 0x14, 0x21})",
 		},
 		{
-			"test$length30(&(0x7f0000000000)={{{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, {'a', 'aaa', 'aaaaa', 'aaaaaa'}, &(0x7f0000000000)={'a', 'aaa', 'aaaaa', 'aaaaaa'}, &(0x7f0000000000)=&(0x7f0000000000)={'a', 'aaa', 'aaaaa', 'aaaaaa'}, 0x0}, 0x0}, 0x0, &(0x7f0000000000)=0x0, 0x0)",
-			"test$length30(&(0x7f0000000000)={{{0x0, 0x18, 0x1, 0x3, 0x5, 0x6}, {'a', 'aaa', 'aaaaa', 'aaaaaa'}, &(0x7f0000000000)={'a', 'aaa', 'aaaaa', 'aaaaaa'}, &(0x7f0000000000)=&(0x7f0000000000)={'a', 'aaa', 'aaaaa', 'aaaaaa'}, 0x2}, 0x4}, 0x40, &(0x7f0000000000)=0x18, 0x2)",
+			input:  "test$length30(&(0x7f0000000000)={{{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, {'a', 'aaa', 'aaaaa', 'aaaaaa'}, &(0x7f0000000000)={'a', 'aaa', 'aaaaa', 'aaaaaa'}, &(0x7f0000000000)=&(0x7f0000000000)={'a', 'aaa', 'aaaaa', 'aaaaaa'}, 0x0}, 0x0}, 0x0, &(0x7f0000000000)=0x0, 0x0)",
+			output: "test$length30(&(0x7f0000000000)={{{0x0, 0x18, 0x1, 0x3, 0x5, 0x6}, {'a', 'aaa', 'aaaaa', 'aaaaaa'}, &(0x7f0000000000)={'a', 'aaa', 'aaaaa', 'aaaaaa'}, &(0x7f0000000000)=&(0x7f0000000000)={'a', 'aaa', 'aaaaa', 'aaaaaa'}, 0x2}, 0x4}, 0x40, &(0x7f0000000000)=0x18, 0x2)",
 		},
 		{
-			"test$offsetof0(&(0x7f0000000000)={0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0})",
-			"test$offsetof0(&(0x7f0000000000)={0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0x6, 0x8, 0x10, 0x18, 0x18, 0x20})",
+			input:  "test$offsetof0(&(0x7f0000000000)={0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0})",
+			output: "test$offsetof0(&(0x7f0000000000)={0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0x6, 0x8, 0x10, 0x18, 0x18, 0x20})",
 		},
-	}
-	for i, test := range tests {
-		p, err := target.Deserialize([]byte(test.unsizedProg), Strict)
-		if err != nil {
-			t.Fatalf("failed to deserialize prog %v: %v", i, err)
-		}
-		for _, call := range p.Calls {
-			target.assignSizesCall(call)
-		}
-		p1 := strings.TrimSpace(string(p.Serialize()))
-		if p1 != test.sizedProg {
-			t.Fatalf("failed to assign sizes in prog %v\ngot  %v\nwant %v", i, p1, test.sizedProg)
-		}
-	}
+	})
 }