testing: remove struct_ops dummy helpers

Signed-off-by: shun159 <[email protected]>

Author: shun159

collection_test.go

@@ -771,12 +771,12 @@ func ExampleCollectionSpec_LoadAndAssign() {
 }
 
 func TestStructOpsMapSpecSimpleLoadAndAssign(t *testing.T) {
-	requireStructOpsDummy(t)
+	requireTestmod(t)
 
 	spec := &CollectionSpec{
 		Programs: map[string]*ProgramSpec{
-			"dummy_test_1": {
-				Name:    "dummy_test_1",
+			"test_func_1": {
+				Name:    "test_func_1",
 				Type:    StructOps,
 				License: "GPL",
 				Instructions: asm.Instructions{
@@ -786,9 +786,8 @@ func TestStructOpsMapSpecSimpleLoadAndAssign(t *testing.T) {
 			},
 		},
 		Maps: map[string]*MapSpec{
-			// TODO: we should use "bpf_testmod_ops" for this case (tentative test case)
-			"dummy_ops": {
-				Name:       "dummy_ops",
+			"testmod_ops": {
+				Name:       "testmod_ops",
 				Type:       StructOpsMap,
 				Flags:      sys.BPF_F_LINK,
 				KeySize:    4,
@@ -799,7 +798,7 @@ func TestStructOpsMapSpecSimpleLoadAndAssign(t *testing.T) {
 					{Key: uint32(0), Value: structOpsMeta{
 						data: make([]byte, 448),
 						funcs: []structOpsFunc{
-							{"test_1", "dummy_test_1"},
+							{"test_1", "test_func_1"},
 						},
 					}},
 				},
@@ -808,8 +807,8 @@ func TestStructOpsMapSpecSimpleLoadAndAssign(t *testing.T) {
 	}
 
 	var obj struct {
-		DummyTest1 *Program `ebpf:"dummy_test_1"`
-		DummyOps   *Map     `ebpf:"dummy_ops"`
+		DummyTest1 *Program `ebpf:"test_func_1"`
+		DummyOps   *Map     `ebpf:"testmod_ops"`
 	}
 
 	err := spec.LoadAndAssign(&obj, nil)

helpers_test.go

@@ -44,36 +44,6 @@ func requireTestmod(tb testing.TB) {
 	}
 }
 
-var haveStructOpsDummy = sync.OnceValues(func() (bool, error) {
-	if platform.IsWindows {
-		return false, nil
-	}
-	kspec, err := btf.LoadKernelSpec()
-	if err != nil {
-		return false, nil
-	}
-	_, err = kspec.AnyTypeByName("bpf_struct_ops_bpf_dummy_ops")
-	if err == nil {
-		return true, nil
-	}
-	if errors.Is(err, btf.ErrNotFound) {
-		return false, nil
-	}
-	return false, err
-})
-
-func requireStructOpsDummy(tb testing.TB) {
-	tb.Helper()
-
-	ok, err := haveStructOpsDummy()
-	if err != nil {
-		tb.Fatal(err)
-	}
-	if !ok {
-		tb.Skip("struct_ops dummy_ops wrapper type not present in vmlinux BTF")
-	}
-}
-
 func newMap(tb testing.TB, spec *MapSpec, opts *MapOptions) (*Map, error) {
 	tb.Helper()
 

struct_ops_test.go

@@ -9,23 +9,22 @@ import (
 )
 
 func TestCreateStructOpsMapSpecSimple(t *testing.T) {
-	requireStructOpsDummy(t)
+	requireTestmod(t)
 
-	// TODO: we should use "bpf_testmod_ops" for this case (tentative test case)
 	ms := &MapSpec{
-		Name:       "dummy_ops",
+		Name:       "testmod_ops",
 		Type:       StructOpsMap,
 		Flags:      sys.BPF_F_LINK,
 		KeySize:    4,
-		ValueSize:  128,
+		ValueSize:  448,
 		MaxEntries: 1,
 		// we use `Value` to specify a user struct type as BTF
-		Value: &btf.Struct{Name: "bpf_dummy_ops"},
+		Value: &btf.Struct{Name: "bpf_testmod_ops"},
 		Contents: []MapKV{
 			{
 				Key: uint32(0),
 				Value: structOpsMeta{
-					data:  make([]byte, 128),
+					data:  make([]byte, 448),
 					funcs: []structOpsFunc{},
 				},
 			},