update eof for windows (#36963)

* update eof for windows

* check equals to win32 to match format of other windows checkers

* use plain text string instead of encoded + consider alternative case that rwt already considers

* don't use linesep as it's not supported across platforms

* don't use linesep as it's not supported across platforms

Co-authored-by: Nihar Damarasingu <[email protected]>

tools/wptrunner/wptrunner/executors/executorcontentshell.py

@@ -5,7 +5,6 @@
 from time import time
 from queue import Empty
 from base64 import b64encode
-from os import linesep
 import json
 
 
@@ -41,7 +40,7 @@ class ContentShellTestPart(ProtocolPart):
     https://chromium.googlesource.com/chromium/src.git/+/HEAD/content/web_test/browser/test_info_extractor.h
     """
     name = "content_shell_test"
-    eof_marker = "#EOF" + linesep  # Marker sent by content_shell after blocks.
+    eof_marker = '#EOF\n'  # Marker sent by content_shell after blocks.
 
     def __init__(self, parent):
         super().__init__(parent)
@@ -67,7 +66,7 @@ def do_test(self, command, timeout=None):
     def _send_command(self, command):
         """Sends a single `command`, i.e. a URL to open, to content_shell.
         """
-        self.stdin_queue.put((command + linesep).encode("utf-8"))
+        self.stdin_queue.put((command + "\n").encode("utf-8"))
 
     def _read_block(self, deadline=None):
         """Tries to read a single block of content from stdout before the `deadline`.
@@ -95,6 +94,10 @@ def _read_text_block(self, deadline=None):
             if line.endswith(self.eof_marker):
                 result += line[:-len(self.eof_marker)]
                 break
+            elif line.endswith('#EOF\r\n'):
+                result += line[:-len('#EOF\r\n')]
+                self.logger.warning('Got a CRLF-terminated #EOF - this is a driver bug.')
+                break
 
             result += line