integration: add FeatureMergeDiff compat

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

Author: crazy-max

client/client_test.go

@@ -5817,6 +5817,7 @@ func testProxyEnv(t *testing.T, sb integration.Sandbox) {
 }
 
 func testMergeOp(t *testing.T, sb integration.Sandbox) {
+	integration.CheckFeatureCompat(t, sb, integration.FeatureMergeDiff)
 	requiresLinux(t)
 
 	c, err := New(sb.Context(), sb.Address())
@@ -5929,7 +5930,7 @@ func testMergeOpCacheMax(t *testing.T, sb integration.Sandbox) {
 
 func testMergeOpCache(t *testing.T, sb integration.Sandbox, mode string) {
 	t.Helper()
-	integration.CheckFeatureCompat(t, sb, integration.FeatureDirectPush)
+	integration.CheckFeatureCompat(t, sb, integration.FeatureDirectPush, integration.FeatureMergeDiff)
 	requiresLinux(t)
 
 	cdAddress := sb.ContainerdAddress()

client/mergediff_test.go

@@ -1187,6 +1187,7 @@ func (tc verifyContents) Name() string {
 }
 
 func (tc verifyContents) Run(t *testing.T, sb integration.Sandbox) {
+	integration.CheckFeatureCompat(t, sb, integration.FeatureMergeDiff)
 	if tc.skipOnRootless && sb.Rootless() {
 		t.Skip("rootless")
 	}

util/testutil/integration/sandbox.go

@@ -297,6 +297,7 @@ const (
 	FeatureFrontendTargets      = "frontend_targets"
 	FeatureImageExporter        = "image_exporter"
 	FeatureInfo                 = "info"
+	FeatureMergeDiff            = "merge_diff"
 	FeatureMultiCacheExport     = "multi_cache_export"
 	FeatureMultiPlatform        = "multi_platform"
 	FeatureOCIExporter          = "oci_exporter"
@@ -322,6 +323,7 @@ var features = map[string]struct{}{
 	FeatureFrontendTargets:      {},
 	FeatureImageExporter:        {},
 	FeatureInfo:                 {},
+	FeatureMergeDiff:            {},
 	FeatureMultiCacheExport:     {},
 	FeatureMultiPlatform:        {},
 	FeatureOCIExporter:          {},