Skip to content

Commit 8b89b68

Browse files
committed
Fix failing Node.js specs
nodejs/node#32798
1 parent 5e0b7c7 commit 8b89b68

2 files changed

Lines changed: 80 additions & 0 deletions

File tree

patches/node/.patches

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,4 @@ fix_window_c-ares_incompatibilities.patch
3737
chore_sethostcleanupfinalizationgroupcallback_has_been_removed_from.patch
3838
fix_remove_bad_semicolon_outside_fn.patch
3939
fix_comment_out_incompatible_crypto_modules.patch
40+
test_account_for_non-node_basename.patch
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Shelley Vohr <shelley.vohr@gmail.com>
3+
Date: Thu, 18 Jun 2020 14:40:35 -0700
4+
Subject: test: account for non-node basename
5+
6+
Refs https://github.com/nodejs/node/commit/edf75e4299219d57e53f98956b8e27e4945dd5d6.
7+
8+
Because Electron smoketests with Node.js' own specs, it's the case for us that the basename is
9+
`Electron`. These tests were failing as they're hardcoded to assume it's `node` so this makes
10+
them more flexible for embedders.
11+
12+
Upstreamed at https://github.com/nodejs/node/pull/33952.
13+
14+
diff --git a/test/message/eval_messages.out b/test/message/eval_messages.out
15+
index 8840633959a18baf9b40305d73511d47ae213978..64743d4ae67acf1f8cb28b832b1f7204ace48952 100644
16+
--- a/test/message/eval_messages.out
17+
+++ b/test/message/eval_messages.out
18+
@@ -55,11 +55,11 @@ ReferenceError: y is not defined
19+
var ______________________________________________; throw 10
20+
^
21+
10
22+
-(Use `node --trace-uncaught ...` to show where the exception was thrown)
23+
+(Use `* --trace-uncaught ...` to show where the exception was thrown)
24+
25+
[eval]:1
26+
var ______________________________________________; throw 10
27+
^
28+
10
29+
-(Use `node --trace-uncaught ...` to show where the exception was thrown)
30+
+(Use `* --trace-uncaught ...` to show where the exception was thrown)
31+
done
32+
diff --git a/test/message/stdin_messages.out b/test/message/stdin_messages.out
33+
index 72edb0b00b28cd6cf6bac51519be4fde4708b161..3c71c5683b7d949bc7b1a46e7cbd4473c40cf871 100644
34+
--- a/test/message/stdin_messages.out
35+
+++ b/test/message/stdin_messages.out
36+
@@ -67,11 +67,11 @@ ReferenceError: y is not defined
37+
let ______________________________________________; throw 10
38+
^
39+
10
40+
-(Use `node --trace-uncaught ...` to show where the exception was thrown)
41+
+(Use `* --trace-uncaught ...` to show where the exception was thrown)
42+
43+
[stdin]:1
44+
let ______________________________________________; throw 10
45+
^
46+
10
47+
-(Use `node --trace-uncaught ...` to show where the exception was thrown)
48+
+(Use `* --trace-uncaught ...` to show where the exception was thrown)
49+
done
50+
diff --git a/test/message/throw_error_with_getter_throw.out b/test/message/throw_error_with_getter_throw.out
51+
index 5daf35aad44ce37e3681d73d19c7e0eb7e7c3439..2162185e7845fcc5f716aa652e253db95462a622 100644
52+
--- a/test/message/throw_error_with_getter_throw.out
53+
+++ b/test/message/throw_error_with_getter_throw.out
54+
@@ -3,4 +3,4 @@
55+
throw { // eslint-disable-line no-throw-literal
56+
^
57+
[object Object]
58+
-(Use `node --trace-uncaught ...` to show where the exception was thrown)
59+
+(Use `* --trace-uncaught ...` to show where the exception was thrown)
60+
diff --git a/test/message/throw_null.out b/test/message/throw_null.out
61+
index db6cc3edf583eff7c815ea4fe24c3ecc60b03888..c97dcbfe134a22721d68f2bb5570d8e59450c3bb 100644
62+
--- a/test/message/throw_null.out
63+
+++ b/test/message/throw_null.out
64+
@@ -3,4 +3,4 @@
65+
throw null;
66+
^
67+
null
68+
-(Use `node --trace-uncaught ...` to show where the exception was thrown)
69+
+(Use `* --trace-uncaught ...` to show where the exception was thrown)
70+
diff --git a/test/message/throw_undefined.out b/test/message/throw_undefined.out
71+
index 016eb8ffd95e3389c93e24912d71ccb152fd99d7..4b2bfdbc5907085b19f43ba1306aaa6efc41beee 100644
72+
--- a/test/message/throw_undefined.out
73+
+++ b/test/message/throw_undefined.out
74+
@@ -3,4 +3,4 @@
75+
throw undefined;
76+
^
77+
undefined
78+
-(Use `node --trace-uncaught ...` to show where the exception was thrown)
79+
+(Use `* --trace-uncaught ...` to show where the exception was thrown)

0 commit comments

Comments
 (0)