Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 21 insertions, 35 deletions

diff --git a/testing/web-platform/meta/file-system-access/sandboxed_FileSystemDirectoryHandle-move.https.any.js.ini b/testing/web-platform/meta/file-system-access/sandboxed_FileSystemDirectoryHandle-move.https.any.js.ini
index 0e49ecffcf..27fcd8e0f6 100644
--- a/testing/web-platform/meta/file-system-access/sandboxed_FileSystemDirectoryHandle-move.https.any.js.ini
+++ b/testing/web-platform/meta/file-system-access/sandboxed_FileSystemDirectoryHandle-move.https.any.js.ini
@@ -1,89 +1,83 @@
 [sandboxed_FileSystemDirectoryHandle-move.https.any.worker.html]
   expected:
-    if (os == "win") and not debug and (processor == "x86_64"): [OK, TIMEOUT]
+    if (os == "win") and not debug and (processor == "x86_64"): [TIMEOUT, OK]
     if (os == "win") and not debug and (processor == "x86"): [OK, TIMEOUT]
     if (os == "win") and debug: [OK, TIMEOUT]
   [move(dir) to move a non-empty directory to a new directory]
     expected:
-      if (os == "win") and not debug and (processor == "x86_64"): [PASS, NOTRUN]
+      if (os == "win") and not debug and (processor == "x86_64"): [PASS, TIMEOUT, NOTRUN]
       if (os == "win") and not debug and (processor == "x86"): [PASS, NOTRUN]
 
   [move(dir, name) to move a non-empty directory to a new directory]
     expected:
-      if (processor == "x86_64") and (os == "win") and not debug: [PASS, NOTRUN]
-      if (processor == "x86") and (os == "win") and debug: [PASS, TIMEOUT]
-      if (processor == "x86") and (os == "win") and not debug: [PASS, NOTRUN, TIMEOUT]
-      if (processor == "x86") and (os == "linux"): [PASS, TIMEOUT, NOTRUN]
+      if (processor == "x86_64") and (os == "win") and not debug: [PASS, TIMEOUT, NOTRUN]
+      if (processor == "x86") and debug: [PASS, TIMEOUT]
+      if (processor == "x86") and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [move(dir) can be called multiple times]
     expected:
-      if (processor == "x86_64") and (os == "win") and not debug: [PASS, TIMEOUT, NOTRUN]
-      if (processor == "x86") and (os == "win") and debug: [PASS, NOTRUN]
-      if (processor == "x86") and (os == "win") and not debug: [PASS, NOTRUN]
-      if (processor == "x86") and (os == "linux"): [PASS, NOTRUN]
+      if (processor == "x86_64") and (os == "win") and not debug: [NOTRUN, TIMEOUT, PASS]
+      if processor == "x86": [PASS, NOTRUN]
 
   [move(dir, name) can be called multiple times]
     expected:
       if (os == "win") and debug and (processor == "x86_64"): [PASS, TIMEOUT]
       if (os == "win") and debug and (processor == "x86"): [PASS, NOTRUN]
-      if (os == "win") and not debug and (processor == "x86_64"): [PASS, TIMEOUT, NOTRUN]
-      if (os == "win") and not debug and (processor == "x86"): [PASS, NOTRUN, TIMEOUT]
+      if (os == "win") and not debug and (processor == "x86_64"): [NOTRUN, TIMEOUT, PASS]
+      if (os == "win") and not debug and (processor == "x86"): [PASS, TIMEOUT, NOTRUN]
 
   [move(dir, name) with a name with invalid characters should fail]
     expected:
-      if (os == "win") and not debug and (processor == "x86_64"): [PASS, TIMEOUT, NOTRUN]
-      if (os == "win") and not debug and (processor == "x86"): [PASS, NOTRUN, TIMEOUT]
+      if (os == "win") and not debug and (processor == "x86_64"): [NOTRUN, PASS, TIMEOUT]
+      if (os == "win") and not debug and (processor == "x86"): [PASS, TIMEOUT, NOTRUN]
       if (os == "win") and debug: [PASS, NOTRUN]
 
   [move(dir, "") should fail]
     expected:
-      if (os == "win") and not debug and (processor == "x86_64"): [PASS, NOTRUN]
+      if (os == "win") and not debug and (processor == "x86_64"): [NOTRUN, PASS, TIMEOUT]
       if (os == "win") and not debug and (processor == "x86"): [PASS, NOTRUN]
       if (os == "win") and debug: [PASS, NOTRUN]
 
   [move(dir, name) to move a directory within itself fails]
     expected:
-      if (os == "win") and not debug and (processor == "x86_64"): [PASS, NOTRUN]
+      if (os == "win") and not debug and (processor == "x86_64"): [NOTRUN, PASS]
       if (os == "win") and not debug and (processor == "x86"): [PASS, NOTRUN]
       if (os == "win") and debug: [PASS, NOTRUN]
 
   [move(dir, name) to move a directory within itself and rename fails]
     expected:
-      if (os == "win") and not debug and (processor == "x86_64"): [PASS, NOTRUN]
+      if (os == "win") and not debug and (processor == "x86_64"): [NOTRUN, PASS]
       if (os == "win") and not debug and (processor == "x86"): [PASS, NOTRUN]
       if (os == "win") and debug: [PASS, NOTRUN]
 
   [move(dir) to move a directory within a descendent fails]
     expected:
-      if (os == "win") and not debug and (processor == "x86_64"): [PASS, NOTRUN]
+      if (os == "win") and not debug and (processor == "x86_64"): [NOTRUN, PASS]
       if (os == "win") and not debug and (processor == "x86"): [PASS, NOTRUN]
       if (os == "win") and debug: [PASS, NOTRUN]
 
   [move(dir, name) to move a directory within a descendent fails]
     expected:
-      if (os == "win") and not debug and (processor == "x86_64"): [PASS, TIMEOUT, NOTRUN]
-      if (os == "win") and not debug and (processor == "x86"): [PASS, NOTRUN, TIMEOUT]
+      if (os == "win") and not debug and (processor == "x86_64"): [NOTRUN, PASS, TIMEOUT]
+      if (os == "win") and not debug and (processor == "x86"): [PASS, TIMEOUT, NOTRUN]
       if (os == "win") and debug: [PASS, NOTRUN]
 
   [move(dir, name) to rename an empty directory]
     expected:
-      if (os == "win") and not debug and (processor == "x86_64"): [PASS, TIMEOUT, NOTRUN]
-      if (os == "win") and not debug and (processor == "x86"): [PASS, TIMEOUT, NOTRUN]
+      if (os == "win") and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [move(dir, name) to rename a non-empty directory]
     expected:
-      if (os == "win") and not debug and (processor == "x86_64"): [PASS, TIMEOUT, NOTRUN]
-      if (os == "win") and not debug and (processor == "x86"): [PASS, NOTRUN, TIMEOUT]
+      if (os == "win") and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [move(dir) to move an empty directory to a new directory]
     expected:
-      if (os == "win") and not debug and (processor == "x86_64"): [PASS, TIMEOUT, NOTRUN]
-      if (os == "win") and not debug and (processor == "x86"): [PASS, NOTRUN, TIMEOUT]
+      if (os == "win") and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [move(dir, name) to move an empty directory to a new directory]
     expected:
       if (os == "win") and not debug and (processor == "x86_64"): [PASS, TIMEOUT, NOTRUN]
-      if (os == "win") and not debug and (processor == "x86"): [PASS, NOTRUN, TIMEOUT]
+      if (os == "win") and not debug and (processor == "x86"): [PASS, TIMEOUT, NOTRUN]
 
   [move(name) to rename a non-empty directory]
     expected:
@@ -156,11 +150,3 @@
   [move(dir, name) to move an empty directory to a new directory]
     expected:
       if (os == "win") and not debug: [PASS, TIMEOUT, NOTRUN]
-
-  [move(name) to rename a non-empty directory]
-    expected:
-      if (processor == "x86") and (os == "linux"): [PASS, TIMEOUT, NOTRUN]
-
-  [move("") to rename an empty directory fails]
-    expected:
-      if (processor == "x86") and (os == "linux"): [PASS, TIMEOUT]