jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve regression testing framework

Browse Source
This commit is contained in:
Arvid Norberg
2014-03-16 23:55:18 +00:00
parent 2b5892289f
commit 6ac8b9e006
4 changed files with 101 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
tools/run_tests.py
View File

@@ -104,7 +104,8 @@ def run_tests(toolset, tests, features, options, test_dir, time_limit):
# works for actual unit tests
if 'launcher=valgrind' in options_copy:
options_copy.remove('launcher=valgrind')
cmdline = ['bjam', '--out-xml=%s' % xml_file, '-l%d' % time_limit, '-q', '--abbreviate-paths', toolset] + options_copy + feature_list
cmdline = ['bjam', '--out-xml=%s' % xml_file, '-l%d' % time_limit, \
'-q', '--abbreviate-paths', toolset] + options_copy + feature_list
# print ' '.join(cmdline)
@@ -170,10 +171,11 @@ def main(argv):
toolsets = []
num_processes = 4
num_processes = 2
incremental = False
test_dirs = []
build_dirs = []
configs = []
options = ['boost=source', 'preserve-test-targets=on']
time_limit = 1200
@@ -217,8 +219,14 @@ def main(argv):
if 'test_dirs' in cfg:
for d in cfg['test_dirs']:
test_dirs.append(os.path.abspath(d))
else:
print 'no test directory specified by .regression.yml'
if 'build_dirs' in cfg:
for d in cfg['build_dirs']:
build_dirs.append(os.path.abspath(d))
test_dirs.append(os.path.abspath(d))
if len(build_dirs) == 0 and len(test_dirs) == 0:
print 'no test or build directory specified by .regression.yml'
sys.exit(1)
configs = []
@@ -228,6 +236,11 @@ def main(argv):
else:
configs = ['']
build_configs = []
if 'build_features' in cfg:
for d in cfg['build_features']:
build_configs.append(d)
clean_files = []
if 'clean' in cfg:
clean_files = cfg['clean']
@@ -241,7 +254,7 @@ def main(argv):
# it takes a bit longer to run in valgrind
if 'launcher=valgrind' in options:
time_limit *= 6
time_limit *= 7
architecture = platform.machine()
build_platform = platform.system() + '-' + platform.release()
@@ -250,7 +263,7 @@ def main(argv):
timestamp = datetime.now()
# tester_pool = Pool(processes=num_processes)
tester_pool = Pool(processes=num_processes)
print '%s-%d - %s - %s' % (branch_name, revision, author, timestamp)
@@ -292,18 +305,22 @@ def main(argv):
if not toolset in results: results[toolset] = {}
toolset_found = False
# futures = []
# for features in configs:
# futures.append(tester_pool.apply_async(run_tests, [toolset, tests, features, options, test_dir, time_limit]))
additional_configs = []
if test_dir in build_dirs:
additional_configs = build_configs
# for future in futures:
# (compiler, r) = future.get()
# results[toolset].update(r)
futures = []
for features in configs + additional_configs:
futures.append(tester_pool.apply_async(run_tests, [toolset, tests, features, options, test_dir, time_limit]))
for features in configs:
(compiler, r) = run_tests(toolset, tests, features, options, test_dir, time_limit)
for future in futures:
(compiler, r) = future.get()
results[toolset].update(r)
# for features in configs + additional_configs:
# (compiler, r) = run_tests(toolset, tests, features, options, test_dir, time_limit)
# results[toolset].update(r)
print ''
if len(clean_files) > 0: