From aac546368faab9f140d52b4c5fb329c75a9ddca7 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 30 Mar 2022 12:51:13 +0200
Subject: [PATCH] test: re-enable `test-child-process-stdio-overlapped`
 (#33502)

---
 .circleci/build_config.yml                  | 11 +++++++++++
 patches/node/build_add_gn_build_files.patch | 13 +++++++++++--
 script/node-disabled-tests.json             |  1 -
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/.circleci/build_config.yml b/.circleci/build_config.yml
index f25a498be8d2..0424b3e2d829 100644
--- a/.circleci/build_config.yml
+++ b/.circleci/build_config.yml
@@ -674,6 +674,7 @@ step-persist-data-for-tests: &step-persist-data-for-tests
       - src/out/Default/chromedriver.zip
       - src/out/Default/shell_browser_ui_unittests
       - src/out/Default/gen/node_headers
+      - src/out/Default/overlapped-checker
       - src/out/ffmpeg/ffmpeg.zip
       - src/electron
       - src/third_party/electron_node
@@ -811,6 +812,13 @@ step-mksnapshot-build: &step-mksnapshot-build
         (cd out/Default; zip mksnapshot.zip mksnapshot_args gen/v8/embedded.S)
       fi
 
+step-nodejs-build-test-executable: &step-nodejs-build-test-executable
+  run:
+    name: Build Node.js Test Executables
+    command: |
+      cd src
+      ninja -C out/Default third_party/electron_node:overlapped-checker
+
 step-hunspell-build: &step-hunspell-build
   run:
     name: hunspell build
@@ -1433,6 +1441,9 @@ commands:
             # Node.js headers
             - *step-nodejs-headers-build
 
+            # Node.js test executable
+            - *step-nodejs-build-test-executable
+
             - *step-show-goma-stats
 
             # mksnapshot
diff --git a/patches/node/build_add_gn_build_files.patch b/patches/node/build_add_gn_build_files.patch
index d18f8e519d5a..fbf050490c49 100644
--- a/patches/node/build_add_gn_build_files.patch
+++ b/patches/node/build_add_gn_build_files.patch
@@ -7,10 +7,10 @@ This adds GN build files for Node, so we don't have to build with GYP.
 
 diff --git a/BUILD.gn b/BUILD.gn
 new file mode 100644
-index 0000000000000000000000000000000000000000..bd5788caa61305fd9af8f9d7f8f1937a224fda83
+index 0000000000000000000000000000000000000000..4afca42d22ee702af50da92aa08c1de897891424
 --- /dev/null
 +++ b/BUILD.gn
-@@ -0,0 +1,394 @@
+@@ -0,0 +1,403 @@
 +import("//electron/build/asar.gni")
 +import("//v8/gni/v8.gni")
 +
@@ -192,6 +192,15 @@ index 0000000000000000000000000000000000000000..bd5788caa61305fd9af8f9d7f8f1937a
 +  }
 +}
 +
++executable("overlapped-checker") {
++  sources = []
++  if (is_win) {
++    sources += [ "test/overlapped-checker/main_win.c" ]
++  } else {
++    sources += [ "test/overlapped-checker/main_unix.c" ]
++  }
++}
++
 +component("node_lib") {
 +  deps = [
 +    ":node_js2c",
diff --git a/script/node-disabled-tests.json b/script/node-disabled-tests.json
index 52128823432f..bfaf96bf9415 100644
--- a/script/node-disabled-tests.json
+++ b/script/node-disabled-tests.json
@@ -4,7 +4,6 @@
   "async-hooks/test-crypto-randomBytes",
   "parallel/test-bootstrap-modules",
   "parallel/test-child-process-fork-exec-path",
-  "parallel/test-child-process-stdio-overlapped",
   "parallel/test-cli-node-print-help",
   "parallel/test-cluster-bind-privileged-port",
   "parallel/test-cluster-shared-handle-bind-privileged-port",