mirror of
https://github.com/nodejs/node.git
synced 2024-11-28 22:46:31 +01:00
dd260d2152
I broke the python script in commit edaf7af
but because test-all does
not run test-addons, it slipped under the radar. Mea culpa.
Fixes the following test runner error:
Traceback (most recent call last):
File "tools/test.py", line 1522, in <module>
sys.exit(Main())
File "tools/test.py", line 1454, in Main
test_list = root.ListTests([], path, context, arch, mode)
File "tools/test.py", line 720, in ListTests
test.AddTestsToList(result, full_path, path, context, arch, mode)
File "tools/test.py", line 690, in AddTestsToList
arch, mode)
File "/home/bnoordhuis/src/v1.x/test/gc/../testpy/__init__.py", line 176, in ListTests
result.append(SimpleTestCase(test, file_path, mode, self.context, self))
TypeError: __init__() takes at least 7 arguments (6 given)
PR-URL: https://github.com/iojs/io.js/pull/313
Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com>
179 lines
6.0 KiB
Python
179 lines
6.0 KiB
Python
# Copyright 2008 the V8 project authors. All rights reserved.
|
|
# Redistribution and use in source and binary forms, with or without
|
|
# modification, are permitted provided that the following conditions are
|
|
# met:
|
|
#
|
|
# * Redistributions of source code must retain the above copyright
|
|
# notice, this list of conditions and the following disclaimer.
|
|
# * Redistributions in binary form must reproduce the above
|
|
# copyright notice, this list of conditions and the following
|
|
# disclaimer in the documentation and/or other materials provided
|
|
# with the distribution.
|
|
# * Neither the name of Google Inc. nor the names of its
|
|
# contributors may be used to endorse or promote products derived
|
|
# from this software without specific prior written permission.
|
|
#
|
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
# (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 test
|
|
import os
|
|
import shutil
|
|
from shutil import rmtree
|
|
from os import mkdir
|
|
from glob import glob
|
|
from os.path import join, dirname, exists
|
|
import re
|
|
|
|
|
|
FLAGS_PATTERN = re.compile(r"//\s+Flags:(.*)")
|
|
FILES_PATTERN = re.compile(r"//\s+Files:(.*)")
|
|
|
|
|
|
class SimpleTestCase(test.TestCase):
|
|
|
|
def __init__(self, path, file, arch, mode, context, config, additional=[]):
|
|
super(SimpleTestCase, self).__init__(context, path, arch, mode)
|
|
self.file = file
|
|
self.config = config
|
|
self.arch = arch
|
|
self.mode = mode
|
|
self.tmpdir = join(dirname(self.config.root), 'tmp')
|
|
self.additional_flags = additional
|
|
|
|
def GetTmpDir(self):
|
|
return "%s.%d" % (self.tmpdir, self.thread_id)
|
|
|
|
|
|
def AfterRun(self, result):
|
|
# delete the whole tmp dir
|
|
try:
|
|
rmtree(self.GetTmpDir())
|
|
except:
|
|
pass
|
|
# make it again.
|
|
try:
|
|
mkdir(self.GetTmpDir())
|
|
except:
|
|
pass
|
|
|
|
def BeforeRun(self):
|
|
# delete the whole tmp dir
|
|
try:
|
|
rmtree(self.GetTmpDir())
|
|
except:
|
|
pass
|
|
# make it again.
|
|
# intermittently fails on win32, so keep trying
|
|
while not os.path.exists(self.GetTmpDir()):
|
|
try:
|
|
mkdir(self.GetTmpDir())
|
|
except:
|
|
pass
|
|
|
|
def GetLabel(self):
|
|
return "%s %s" % (self.mode, self.GetName())
|
|
|
|
def GetName(self):
|
|
return self.path[-1]
|
|
|
|
def GetCommand(self):
|
|
result = [self.config.context.GetVm(self.arch, self.mode)]
|
|
source = open(self.file).read()
|
|
flags_match = FLAGS_PATTERN.search(source)
|
|
if flags_match:
|
|
result += flags_match.group(1).strip().split()
|
|
files_match = FILES_PATTERN.search(source);
|
|
additional_files = []
|
|
if files_match:
|
|
additional_files += files_match.group(1).strip().split()
|
|
for a_file in additional_files:
|
|
result.append(join(dirname(self.config.root), '..', a_file))
|
|
|
|
if self.additional_flags:
|
|
result += self.additional_flags
|
|
|
|
result += [self.file]
|
|
|
|
return result
|
|
|
|
def GetSource(self):
|
|
return open(self.file).read()
|
|
|
|
class SimpleTestConfiguration(test.TestConfiguration):
|
|
|
|
def __init__(self, context, root, section, additional=[]):
|
|
super(SimpleTestConfiguration, self).__init__(context, root)
|
|
self.section = section
|
|
self.additional_flags = additional
|
|
|
|
def Ls(self, path):
|
|
def SelectTest(name):
|
|
return name.startswith('test-') and name.endswith('.js')
|
|
return [f[:-3] for f in os.listdir(path) if SelectTest(f)]
|
|
|
|
def ListTests(self, current_path, path, arch, mode):
|
|
all_tests = [current_path + [t] for t in self.Ls(join(self.root))]
|
|
result = []
|
|
for test in all_tests:
|
|
if self.Contains(path, test):
|
|
file_path = join(self.root, reduce(join, test[1:], "") + ".js")
|
|
result.append(SimpleTestCase(test, file_path, arch, mode, self.context,
|
|
self, self.additional_flags))
|
|
return result
|
|
|
|
def GetBuildRequirements(self):
|
|
return ['sample', 'sample=shell']
|
|
|
|
def GetTestStatus(self, sections, defs):
|
|
status_file = join(self.root, '%s.status' % (self.section))
|
|
if exists(status_file):
|
|
test.ReadConfigurationInto(status_file, sections, defs)
|
|
|
|
class ParallelTestConfiguration(SimpleTestConfiguration):
|
|
def __init__(self, context, root, section, additional=[]):
|
|
super(ParallelTestConfiguration, self).__init__(context, root, section,
|
|
additional)
|
|
|
|
def ListTests(self, current_path, path, arch, mode):
|
|
result = super(ParallelTestConfiguration, self).ListTests(
|
|
current_path, path, arch, mode)
|
|
for test in result:
|
|
test.parallel = True
|
|
return result
|
|
|
|
class AddonTestConfiguration(SimpleTestConfiguration):
|
|
def __init__(self, context, root, section, additional=[]):
|
|
super(AddonTestConfiguration, self).__init__(context, root, section)
|
|
|
|
def Ls(self, path):
|
|
def SelectTest(name):
|
|
return name.endswith('.js')
|
|
|
|
result = []
|
|
for subpath in os.listdir(path):
|
|
if os.path.isdir(join(path, subpath)):
|
|
for f in os.listdir(join(path, subpath)):
|
|
if SelectTest(f):
|
|
result.append([subpath, f[:-3]])
|
|
return result
|
|
|
|
def ListTests(self, current_path, path, arch, mode):
|
|
all_tests = [current_path + t for t in self.Ls(join(self.root))]
|
|
result = []
|
|
for test in all_tests:
|
|
if self.Contains(path, test):
|
|
file_path = join(self.root, reduce(join, test[1:], "") + ".js")
|
|
result.append(
|
|
SimpleTestCase(test, file_path, arch, mode, self.context, self))
|
|
return result
|