From a90a5cba08fdf6c0ceb95101c275108a152a3aed Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:35:37 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- .../css-break/flexbox/multi-line-row-flex-fragmentation-018.html.ini | 4 +++- .../css-break/flexbox/multi-line-row-flex-fragmentation-019.html.ini | 2 -- .../css-break/flexbox/multi-line-row-flex-fragmentation-030.html.ini | 4 +++- .../flexbox/single-line-column-flex-fragmentation-015.html.ini | 4 +++- .../flexbox/single-line-column-flex-fragmentation-057.html.ini | 4 +++- 5 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 testing/web-platform/meta/css/css-break/flexbox/multi-line-row-flex-fragmentation-019.html.ini (limited to 'testing/web-platform/meta/css/css-break/flexbox') diff --git a/testing/web-platform/meta/css/css-break/flexbox/multi-line-row-flex-fragmentation-018.html.ini b/testing/web-platform/meta/css/css-break/flexbox/multi-line-row-flex-fragmentation-018.html.ini index f00b643435..3b79198f3b 100644 --- a/testing/web-platform/meta/css/css-break/flexbox/multi-line-row-flex-fragmentation-018.html.ini +++ b/testing/web-platform/meta/css/css-break/flexbox/multi-line-row-flex-fragmentation-018.html.ini @@ -1,2 +1,4 @@ [multi-line-row-flex-fragmentation-018.html] - expected: FAIL + expected: + if (os == "mac") and not debug: [PASS, FAIL] + if (os == "android") and not debug: [PASS, FAIL] diff --git a/testing/web-platform/meta/css/css-break/flexbox/multi-line-row-flex-fragmentation-019.html.ini b/testing/web-platform/meta/css/css-break/flexbox/multi-line-row-flex-fragmentation-019.html.ini deleted file mode 100644 index ac8dd78b07..0000000000 --- a/testing/web-platform/meta/css/css-break/flexbox/multi-line-row-flex-fragmentation-019.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[multi-line-row-flex-fragmentation-019.html] - expected: FAIL diff --git a/testing/web-platform/meta/css/css-break/flexbox/multi-line-row-flex-fragmentation-030.html.ini b/testing/web-platform/meta/css/css-break/flexbox/multi-line-row-flex-fragmentation-030.html.ini index f73477fd32..d831697b6f 100644 --- a/testing/web-platform/meta/css/css-break/flexbox/multi-line-row-flex-fragmentation-030.html.ini +++ b/testing/web-platform/meta/css/css-break/flexbox/multi-line-row-flex-fragmentation-030.html.ini @@ -1,2 +1,4 @@ [multi-line-row-flex-fragmentation-030.html] - expected: FAIL + expected: + if (os == "mac") and not debug: [PASS, FAIL] + if (os == "android") and not debug: [PASS, FAIL] diff --git a/testing/web-platform/meta/css/css-break/flexbox/single-line-column-flex-fragmentation-015.html.ini b/testing/web-platform/meta/css/css-break/flexbox/single-line-column-flex-fragmentation-015.html.ini index 80955370ba..9ddf71df5a 100644 --- a/testing/web-platform/meta/css/css-break/flexbox/single-line-column-flex-fragmentation-015.html.ini +++ b/testing/web-platform/meta/css/css-break/flexbox/single-line-column-flex-fragmentation-015.html.ini @@ -1,2 +1,4 @@ [single-line-column-flex-fragmentation-015.html] - expected: FAIL + expected: + if (os == "mac") and not debug: [PASS, FAIL] + if (os == "android") and not debug: [PASS, FAIL] diff --git a/testing/web-platform/meta/css/css-break/flexbox/single-line-column-flex-fragmentation-057.html.ini b/testing/web-platform/meta/css/css-break/flexbox/single-line-column-flex-fragmentation-057.html.ini index ea8a1f5a68..f8a65b96ed 100644 --- a/testing/web-platform/meta/css/css-break/flexbox/single-line-column-flex-fragmentation-057.html.ini +++ b/testing/web-platform/meta/css/css-break/flexbox/single-line-column-flex-fragmentation-057.html.ini @@ -1,2 +1,4 @@ [single-line-column-flex-fragmentation-057.html] - expected: FAIL + expected: + if (os == "mac") and not debug: [PASS, FAIL] + if (os == "android") and not debug: [PASS, FAIL] -- cgit v1.2.3