From: Benjamin Otte <otte@redhat.com>
Date: Sun, 21 May 2023 03:40:26 +0000 (+0200)
Subject: testsuite: Make clipped-repeat test work universally
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~183^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9070c457d64cea44e927edcfaf7fe48dbf333490;p=gtk4.git

testsuite: Make clipped-repeat test work universally

Cover the rounded corners so that they cause no visible difference in
the end result.
---

diff --git a/testsuite/gsk/compare/clipped-repeat-3d-ngl.node b/testsuite/gsk/compare/clipped-repeat-3d-ngl.node
deleted file mode 100644
index 288560c89d..0000000000
--- a/testsuite/gsk/compare/clipped-repeat-3d-ngl.node
+++ /dev/null
@@ -1,32 +0,0 @@
-transform {
- child: transform {
-  child: rounded-clip {
-    child: container {
-      repeat {
-        bounds: 0 0 159 34;
-        child: container {
-          color {
-            bounds: 0 0 10 10;
-            color: rgb(168,168,168);
-          }
-          color {
-            bounds: 10 0 10 10;
-            color: rgb(84,84,84);
-          }
-          color {
-            bounds: 0 10 10 10;
-            color: rgb(84,84,84);
-          }
-          color {
-            bounds: 10 10 10 10;
-            color: rgb(168,168,168);
-          }
-        }
-      }
-    }
-    clip: 0 0 159 34 / 6;
-  }
-  transform: scale(4, 4);
- }
- transform: translate(6, 20);
-}
diff --git a/testsuite/gsk/compare/clipped-repeat-3d-ngl.png b/testsuite/gsk/compare/clipped-repeat-3d-ngl.png
deleted file mode 100644
index b9a847d7c1..0000000000
Binary files a/testsuite/gsk/compare/clipped-repeat-3d-ngl.png and /dev/null differ
diff --git a/testsuite/gsk/compare/clipped-repeat.node b/testsuite/gsk/compare/clipped-repeat.node
new file mode 100644
index 0000000000..86fe2159af
--- /dev/null
+++ b/testsuite/gsk/compare/clipped-repeat.node
@@ -0,0 +1,51 @@
+transform {
+ child: transform {
+  child: rounded-clip {
+    child: container {
+      repeat {
+        bounds: 0 0 159 34;
+        child: container {
+          color {
+            bounds: 0 0 10 10;
+            color: rgb(168,168,168);
+          }
+          color {
+            bounds: 10 0 10 10;
+            color: rgb(84,84,84);
+          }
+          color {
+            bounds: 0 10 10 10;
+            color: rgb(84,84,84);
+          }
+          color {
+            bounds: 10 10 10 10;
+            color: rgb(168,168,168);
+          }
+        }
+      }
+    }
+    clip: 0 0 159 34 / 6;
+  }
+  transform: scale(4, 4);
+ }
+ transform: translate(6, 20);
+}
+
+/* cover the rounded corners */
+color {
+  color: red;
+  bounds: 6 20 25 25;
+}
+color {
+  color: red;
+  bounds: 617 20 25 25;
+}
+color {
+  color: red;
+  bounds: 6 131 25 25;
+}
+color {
+  color: red;
+  bounds: 617 131 25 25;
+}
+
diff --git a/testsuite/gsk/compare/clipped-repeat.png b/testsuite/gsk/compare/clipped-repeat.png
new file mode 100644
index 0000000000..cffc4dca25
Binary files /dev/null and b/testsuite/gsk/compare/clipped-repeat.png differ
diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
index df493d9332..eec36d5fac 100644
--- a/testsuite/gsk/meson.build
+++ b/testsuite/gsk/meson.build
@@ -28,7 +28,7 @@ compare_render_tests = [
   'clip-in-rounded-clip1',
   'clip-in-rounded-clip2',
   'clip-in-rounded-clip3',
-  'clipped-repeat-3d-ngl',
+  'clipped-repeat',
   'clipped_rounded_clip',
   'clip-nested1',
   'clip-translate-offscreen',