Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -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 #####

Expand Down
15 changes: 6 additions & 9 deletions deps/v8/test/test262/testcfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
7 changes: 4 additions & 3 deletions deps/v8/tools/testrunner/local/testsuite.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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):
Expand Down
Loading