diff --git a/common.gypi b/common.gypi index 46feda51235103..eadc679febb874 100644 --- a/common.gypi +++ b/common.gypi @@ -36,7 +36,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.31', + 'v8_embedder_string': '-node.32', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/test/test262/testcfg.py b/deps/v8/test/test262/testcfg.py index 16eda7405f1e9c..2baa74b5576523 100644 --- a/deps/v8/test/test262/testcfg.py +++ b/deps/v8/test/test262/testcfg.py @@ -25,15 +25,11 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import imp -import itertools -import os -import re +import importlib.machinery import sys from testrunner.local import statusfile from testrunner.local import testsuite -from testrunner.local import utils from testrunner.objects import testcase from testrunner.outproc import base as outproc from testrunner.outproc import test262 @@ -141,11 +137,12 @@ def _load_parse_test_record(self): root = os.path.join(*TEST_262_TOOLS_ABS_PATH) f = None try: - (f, pathname, description) = imp.find_module("parseTestRecord", [root]) - module = imp.load_module("parseTestRecord", f, pathname, description) + loader = importlib.machinery.SourceFileLoader( + "parseTestRecord", f"{root}/parseTestRecord.py") + module = loader.load_module() return module.parseTestRecord - except: - print('Cannot load parseTestRecord') + except Exception as e: + print(f'Cannot load parseTestRecord: {e}') raise finally: if f: diff --git a/deps/v8/tools/testrunner/local/testsuite.py b/deps/v8/tools/testrunner/local/testsuite.py index 60d52e8d30134d..94f9e50b207275 100644 --- a/deps/v8/tools/testrunner/local/testsuite.py +++ b/deps/v8/tools/testrunner/local/testsuite.py @@ -26,7 +26,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import imp +import importlib.machinery import itertools import os from contextlib import contextmanager @@ -238,12 +238,13 @@ def merge(self, test_generator): def _load_testsuite_module(name, root): f = None try: - (f, pathname, description) = imp.find_module("testcfg", [root]) - yield imp.load_module(name + "_testcfg", f, pathname, description) + yield importlib.machinery.SourceFileLoader( + name + "_testcfg", f"{root}/testcfg.py").load_module() finally: if f: f.close() + class TestSuite(object): @staticmethod def Load(ctx, root, test_config):