mirror of https://github.com/vitalif/openscad
commit
832edd8c30
|
@ -24,6 +24,11 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
// Boost conflicts with MPFR under MSVC (google it)
|
||||||
|
#include <mpfr.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
// dxfdata.h must come first for Eigen SIMD alignment issues
|
// dxfdata.h must come first for Eigen SIMD alignment issues
|
||||||
#include "dxfdata.h"
|
#include "dxfdata.h"
|
||||||
#include "polyset.h"
|
#include "polyset.h"
|
||||||
|
|
|
@ -246,6 +246,10 @@ TESTLOG
|
||||||
imgs = {}
|
imgs = {}
|
||||||
passed_tests = filter(lambda x: x.passed, tests)
|
passed_tests = filter(lambda x: x.passed, tests)
|
||||||
failed_tests = filter(lambda x: not x.passed, tests)
|
failed_tests = filter(lambda x: not x.passed, tests)
|
||||||
|
|
||||||
|
tests_to_report = tests
|
||||||
|
if failed_only: tests_to_report = failed_tests
|
||||||
|
|
||||||
percent = str(int(100.0*len(passed_tests) / len(tests)))
|
percent = str(int(100.0*len(passed_tests) / len(tests)))
|
||||||
s = wiki_template
|
s = wiki_template
|
||||||
repeat1 = ezsearch('(<REPEAT1>.*?</REPEAT1>)',s)
|
repeat1 = ezsearch('(<REPEAT1>.*?</REPEAT1>)',s)
|
||||||
|
@ -256,7 +260,8 @@ TESTLOG
|
||||||
'NUMTESTS':len(tests), 'NUMPASSED':len(passed_tests), 'PERCENTPASSED':percent }
|
'NUMTESTS':len(tests), 'NUMPASSED':len(passed_tests), 'PERCENTPASSED':percent }
|
||||||
for key in dic.keys():
|
for key in dic.keys():
|
||||||
s = s.replace(key,str(dic[key]))
|
s = s.replace(key,str(dic[key]))
|
||||||
for t in tests:
|
|
||||||
|
for t in tests_to_report:
|
||||||
if t.type=='txt':
|
if t.type=='txt':
|
||||||
newchunk = re.sub('FTESTNAME',t.fullname,repeat2)
|
newchunk = re.sub('FTESTNAME',t.fullname,repeat2)
|
||||||
newchunk = newchunk.replace('TESTLOG',t.fulltestlog)
|
newchunk = newchunk.replace('TESTLOG',t.fulltestlog)
|
||||||
|
@ -308,6 +313,9 @@ def tohtml(wiki_rootpath, startdate, tests, enddate, sysinfo, sysid, makefiles):
|
||||||
failed_tests = filter(lambda x: not x.passed, tests)
|
failed_tests = filter(lambda x: not x.passed, tests)
|
||||||
percent = str(int(100.0*len(passed_tests) / len(tests)))
|
percent = str(int(100.0*len(passed_tests) / len(tests)))
|
||||||
|
|
||||||
|
tests_to_report = tests
|
||||||
|
if failed_only: tests_to_report = failed_tests
|
||||||
|
|
||||||
s=''
|
s=''
|
||||||
|
|
||||||
s+= '\n<pre>'
|
s+= '\n<pre>'
|
||||||
|
@ -324,7 +332,7 @@ def tohtml(wiki_rootpath, startdate, tests, enddate, sysinfo, sysid, makefiles):
|
||||||
s+= '\nPERCENTPASSED: '+ percent
|
s+= '\nPERCENTPASSED: '+ percent
|
||||||
s+= '\n</pre>'
|
s+= '\n</pre>'
|
||||||
|
|
||||||
for t in tests:
|
for t in tests_to_report:
|
||||||
if t.type=='txt':
|
if t.type=='txt':
|
||||||
s+='\n<pre>'+t.fullname+'</pre>\n'
|
s+='\n<pre>'+t.fullname+'</pre>\n'
|
||||||
s+='<p><pre>'+t.fulltestlog+'</pre>\n\n'
|
s+='<p><pre>'+t.fulltestlog+'</pre>\n\n'
|
||||||
|
@ -481,4 +489,7 @@ builddir = os.getcwd() # os.getcwd()+'/build'
|
||||||
verbose = False
|
verbose = False
|
||||||
maxretry = 10
|
maxretry = 10
|
||||||
|
|
||||||
|
failed_only = False
|
||||||
|
if '--failed-only' in sys.argv: failed_only = True
|
||||||
|
|
||||||
main()
|
main()
|
||||||
|
|
Loading…
Reference in New Issue