From cbcac660a9c7eac6a91ca3761f24ac0c2b5fb459 Mon Sep 17 00:00:00 2001
From: James Price <jrprice@google.com>
Date: Thu, 16 Dec 2021 14:28:54 -0500
Subject: [PATCH] Fix initialization of nodePath variable

When running Emscripten-generated scripts via `node -e "<script>"`,
the `fs` variable is already defined and so `nodePath` was never being
initialized.
---
 src/node_shell_read.js | 7 ++++---
 tests/test_other.py    | 6 ++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/node_shell_read.js b/src/node_shell_read.js
index ca82f30ec2347..9ca5ea08efa29 100644
--- a/src/node_shell_read.js
+++ b/src/node_shell_read.js
@@ -5,9 +5,10 @@
  */
 
 requireNodeFS = function() {
-  // We always initialize both of these together, so we can use
-  // either one as the indicator for them not being initialized.
-  if (!fs) {
+  // Use nodePath as the indicator for these not being initialized,
+  // since in some environments a global fs may have already been
+  // created.
+  if (!nodePath) {
     fs = require('fs');
     nodePath = require('path');
   }
diff --git a/tests/test_other.py b/tests/test_other.py
index 249622d423ed2..74fc767b217d4 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -8408,6 +8408,12 @@ def test_node_js_system(self):
     ret = self.run_process(config.NODE_JS + ['a.js'], stdout=PIPE).stdout
     self.assertContained('OK', ret)
 
+  def test_node_eval(self):
+    self.run_process([EMCC, '-sENVIRONMENT=node', test_file('hello_world.c'), '-o', 'a.js', '-O3'])
+    js = open('a.js').read()
+    ret = self.run_process(config.NODE_JS + ['-e', js], stdout=PIPE).stdout
+    self.assertContained('hello, world!', ret)
+
   def test_is_bitcode(self):
     fname = 'tmp.o'