From 51f24b998ba555d15f924ccd4fb5b46219f6537b Mon Sep 17 00:00:00 2001 From: don bright Date: Fri, 9 Dec 2011 09:47:13 -0600 Subject: [PATCH 1/2] MSVC compile fix --- src/CGALRenderer.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/CGALRenderer.cc b/src/CGALRenderer.cc index 95bcba15..bac25a63 100644 --- a/src/CGALRenderer.cc +++ b/src/CGALRenderer.cc @@ -24,6 +24,11 @@ * */ +#ifdef _MSC_VER +// Boost conflicts with MPFR under MSVC (google it) +#include +#endif + // dxfdata.h must come first for Eigen SIMD alignment issues #include "dxfdata.h" #include "polyset.h" From fcf172de5034c8d9f45eb6984d72cea6416458d9 Mon Sep 17 00:00:00 2001 From: don bright Date: Fri, 9 Dec 2011 11:31:18 -0600 Subject: [PATCH 2/2] modify test_pretty_print to allow showing of only failed tests --- tests/test_pretty_print.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/test_pretty_print.py b/tests/test_pretty_print.py index fa8b3905..85f4ec7e 100755 --- a/tests/test_pretty_print.py +++ b/tests/test_pretty_print.py @@ -246,6 +246,10 @@ TESTLOG imgs = {} passed_tests = filter(lambda x: 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))) s = wiki_template repeat1 = ezsearch('(.*?)',s) @@ -256,7 +260,8 @@ TESTLOG 'NUMTESTS':len(tests), 'NUMPASSED':len(passed_tests), 'PERCENTPASSED':percent } for key in dic.keys(): s = s.replace(key,str(dic[key])) - for t in tests: + + for t in tests_to_report: if t.type=='txt': newchunk = re.sub('FTESTNAME',t.fullname,repeat2) 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) percent = str(int(100.0*len(passed_tests) / len(tests))) + tests_to_report = tests + if failed_only: tests_to_report = failed_tests + s='' s+= '\n
'
@@ -324,7 +332,7 @@ def tohtml(wiki_rootpath, startdate, tests, enddate, sysinfo, sysid, makefiles):
 	s+= '\nPERCENTPASSED: '+ percent
 	s+= '\n
' - for t in tests: + for t in tests_to_report: if t.type=='txt': s+='\n
'+t.fullname+'
\n' s+='

'+t.fulltestlog+'
\n\n' @@ -481,4 +489,7 @@ builddir = os.getcwd() # os.getcwd()+'/build' verbose = False maxretry = 10 +failed_only = False +if '--failed-only' in sys.argv: failed_only = True + main()