test: re-enable failing Node.js specs (#31315)

This commit is contained in:
Shelley Vohr 2021-10-12 20:59:40 +02:00 committed by GitHub
parent 22ae945311
commit 757c01587a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 41 deletions

View file

@ -4,7 +4,6 @@ feat_initialize_asar_support.patch
expose_get_builtin_module_function.patch
build_add_gn_build_files.patch
fix_add_default_values_for_variables_in_common_gypi.patch
feat_add_new_built_with_electron_variable_to_config_gypi.patch
feat_add_flags_for_low-level_hooks_and_exceptions.patch
fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch
pass_all_globals_through_require.patch

View file

@ -1796,19 +1796,30 @@ index a572d9b95853730a29a67349b46d47d6180586f3..888a95f93411a9168b75751e0af12c74
// The NAPI_VERSION provided by this version of the runtime. This is the version
// which the Node binary being built supports.
diff --git a/tools/generate_config_gypi.py b/tools/generate_config_gypi.py
new file mode 100644
index 0000000000000000000000000000000000000000..01f62d4ae6e3b9d539444e3dff069f0011353caa
new file mode 100755
index 0000000000000000000000000000000000000000..c12dcb2b844f7f415318d81115ff697fd8eb4689
--- /dev/null
+++ b/tools/generate_config_gypi.py
@@ -0,0 +1,11 @@
+# TODO: assess which if any of the config variables are important to include in
+# the js2c'd config.gypi.
@@ -0,0 +1,22 @@
+import sys
+import json
+
+def main(args):
+ out = args[0]
+ output = {
+ 'variables': {
+ 'built_with_electron': 1,
+ 'v8_enable_i18n_support': 1,
+ },
+ 'include_dirs': [],
+ 'libraries': [],
+ 'defines': [],
+ 'cflags': [],
+ }
+
+ with open(out, 'w') as f:
+ f.write("{'variables':{}}\n")
+ f.write(json.dumps(output))
+ f.write("\n")
+
+if __name__ == '__main__':
+ main(sys.argv[1:])

View file

@ -1,21 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 2 Oct 2018 11:39:58 -0700
Subject: feat: add new built_with_electron variable to config.gypi
This allows 3rd-party native modules to know whether they're being built
against Electron.
diff --git a/tools/generate_config_gypi.py b/tools/generate_config_gypi.py
index 01f62d4ae6e3b9d539444e3dff069f0011353caa..d8b279f590c115108d5dca879747de7b0c9f1934 100644
--- a/tools/generate_config_gypi.py
+++ b/tools/generate_config_gypi.py
@@ -5,7 +5,7 @@ import sys
def main(args):
out = args[0]
with open(out, 'w') as f:
- f.write("{'variables':{}}\n")
+ f.write("{'variables':{'built_with_electron': 1}}\n")
if __name__ == '__main__':
main(sys.argv[1:])

View file

@ -39,16 +39,7 @@
"parallel/test-process-env-allowed-flags-are-documented",
"parallel/test-process-versions",
"parallel/test-repl",
"parallel/test-repl-harmony",
"parallel/test-repl-pretty-custom-stack",
"parallel/test-repl-pretty-stack",
"parallel/test-repl-sigint",
"parallel/test-repl-sigint-nested-eval",
"parallel/test-repl-tab-complete",
"parallel/test-repl-uncaught-exception",
"parallel/test-repl-underscore",
"parallel/test-signal-handler",
"parallel/test-source-map",
"parallel/test-stdout-close-catch",
"parallel/test-tls-cert-chains-concat",
"parallel/test-tls-cert-chains-in-ca",
@ -115,7 +106,6 @@
"parallel/test-trace-events-v8",
"parallel/test-trace-events-vm",
"parallel/test-trace-events-worker-metadata",
"parallel/test-v8-flags",
"parallel/test-v8-untrusted-code-mitigations",
"parallel/test-webcrypto-derivebits-hkdf",
"parallel/test-webcrypto-derivebits-node-dh",
@ -127,7 +117,6 @@
"parallel/test-webcrypto-rsa-pss-params",
"parallel/test-webcrypto-sign-verify-node-dsa",
"parallel/test-webcrypto-x25519-x448",
"parallel/test-whatwg-encoding-custom-textdecoder",
"parallel/test-worker-stdio",
"parallel/test-zlib-unused-weak",
"report/test-report-fatal-error",
@ -139,7 +128,5 @@
"report/test-report-worker",
"report/test-report-writereport",
"sequential/test-tls-connect",
"sequential/test-worker-prof",
"wpt/test-encoding",
"wpt/test-webcrypto"
]