[v6.x] fix wpts on windows (#4093)

* [v6.x] fix wpts on windows

Signed-off-by: Matteo Collina <[email protected]>

* fixup

Signed-off-by: Matteo Collina <[email protected]>

---------

Signed-off-by: Matteo Collina <[email protected]>

Author: mcollina

test/wpt/start-FileAPI.mjs

@@ -1,10 +1,9 @@
 import { WPTRunner } from './runner/runner.mjs'
-import { join } from 'path'
 import { fileURLToPath } from 'url'
 import { fork } from 'child_process'
 import { on } from 'events'
 
-const serverPath = fileURLToPath(join(import.meta.url, '../server/server.mjs'))
+const serverPath = fileURLToPath(new URL('./server/server.mjs', import.meta.url))
 
 const child = fork(serverPath, [], {
   stdio: ['pipe', 'pipe', 'pipe', 'ipc']

test/wpt/start-cacheStorage.mjs

@@ -1,10 +1,9 @@
 import { WPTRunner } from './runner/runner.mjs'
-import { join } from 'path'
 import { fileURLToPath } from 'url'
 import { fork } from 'child_process'
 import { on } from 'events'
 
-const serverPath = join(fileURLToPath(import.meta.url), '../server/server.mjs')
+const serverPath = fileURLToPath(new URL('./server/server.mjs', import.meta.url))
 
 const child = fork(serverPath, [], {
   stdio: ['pipe', 'pipe', 'pipe', 'ipc']

test/wpt/start-eventsource.mjs

@@ -1,10 +1,9 @@
 import { WPTRunner } from './runner/runner.mjs'
-import { join } from 'path'
 import { fileURLToPath } from 'url'
 import { fork } from 'child_process'
 import { on } from 'events'
 
-const serverPath = join(fileURLToPath(import.meta.url), '../server/server.mjs')
+const serverPath = fileURLToPath(new URL('./server/server.mjs', import.meta.url))
 
 const child = fork(serverPath, [], {
   stdio: ['pipe', 'pipe', 'pipe', 'ipc']

test/wpt/start-fetch.mjs

@@ -1,12 +1,11 @@
 import { WPTRunner } from './runner/runner.mjs'
-import { join } from 'path'
 import { fileURLToPath } from 'url'
 import { fork } from 'child_process'
 import { on } from 'events'
 
 const { WPT_REPORT } = process.env
 
-const serverPath = join(fileURLToPath(import.meta.url), '../server/server.mjs')
+const serverPath = fileURLToPath(new URL('./server/server.mjs', import.meta.url))
 
 const child = fork(serverPath, [], {
   stdio: ['pipe', 'pipe', 'pipe', 'ipc']

test/wpt/start-mimesniff.mjs

@@ -1,12 +1,11 @@
 import { WPTRunner } from './runner/runner.mjs'
-import { join } from 'path'
 import { fileURLToPath } from 'url'
 import { fork } from 'child_process'
 import { on } from 'events'
 
 const { WPT_REPORT } = process.env
 
-const serverPath = join(fileURLToPath(import.meta.url), '../server/server.mjs')
+const serverPath = fileURLToPath(new URL('./server/server.mjs', import.meta.url))
 
 const child = fork(serverPath, [], {
   stdio: ['pipe', 'pipe', 'pipe', 'ipc']

test/wpt/start-websockets.mjs

@@ -1,5 +1,4 @@
 import { WPTRunner } from './runner/runner.mjs'
-import { join } from 'path'
 import { fileURLToPath } from 'url'
 import { fork } from 'child_process'
 import { on } from 'events'
@@ -22,7 +21,7 @@ if (process.env.CI) {
   // process.exit(0)
 }
 
-const serverPath = join(fileURLToPath(import.meta.url), '../server/websocket.mjs')
+const serverPath = fileURLToPath(new URL('./server/websocket.mjs', import.meta.url))
 
 const child = fork(serverPath, [], {
   stdio: ['pipe', 'pipe', 'pipe', 'ipc']