diff --git a/.regression.yml b/.regression.yml
index b2e18bbde..d5ab6a666 100644
--- a/.regression.yml
+++ b/.regression.yml
@@ -7,7 +7,6 @@ project:
features:
- variant=release
- asserts=production
- - encryption=gcrypt
- statistics=on logging=verbose disk-stats=on bandwidth-limit-logging=on
- ipv6=off
- deprecated-functions=off
diff --git a/tools/parse_test_results.py b/tools/parse_test_results.py
index 1cba49aac..c7dfc346c 100755
--- a/tools/parse_test_results.py
+++ b/tools/parse_test_results.py
@@ -46,7 +46,7 @@ def style_output(o):
ret += '%s\n' % l
elif '**passed**' in l:
ret += '%s\n' % l
- elif ': error: ' in l:
+ elif ': error: ' in l or ': fatal error: ' in l:
ret += '%s\n' % l
elif ': warning: ' in l:
ret += '%s\n' % l
@@ -74,14 +74,11 @@ os.chdir('regression_tests')
def modification_time(file):
mtime = 0
try:
- st = os.stat(file)
- mtime = st.st_mtime
- except Exception, e:
- print e
+ mtime = os.stat(file).st_mtime
+ except: pass
return mtime
index_mtime = modification_time('index.html')
-print 'index mtime: %d' % index_mtime
latest_rev = 0
@@ -147,12 +144,6 @@ for f in glob.glob(os.path.join(rev_dir, '*.json')):
platform = platform_toolset[0]
toolset = platform_toolset[1]
- if not platform in platforms:
- platforms[platform] = {}
-
- if not toolset in platforms[platform]:
- platforms[platform][toolset] = {}
-
for cfg in j:
test_name = cfg.split('|')[0]
features = cfg.split('|')[1]
@@ -162,18 +153,26 @@ for f in glob.glob(os.path.join(rev_dir, '*.json')):
tests[features].add(test_name)
+ if not platform in platforms:
+ platforms[platform] = {}
+
+ if not toolset in platforms[platform]:
+ platforms[platform][toolset] = {}
+
if not features in platforms[platform][toolset]:
platforms[platform][toolset][features] = {}
platforms[platform][toolset][features][test_name] = j[cfg]
+
html = open('index.html', 'w')
print >>html, '''regression tests, %s revision %d