From 0eb64d8f7afe10ee270e3463a49cd8713d6bb664 Mon Sep 17 00:00:00 2001
From: chrysn <chrysn@fsfe.org>
Date: Tue, 25 Jun 2013 10:18:22 +0200
Subject: ctest infrastructure for native .term tests


diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 313ac62..2739df3 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -902,7 +902,7 @@ add_cmdline_test(moduledumptest EXE ${GUI_BINPATH} ARGS -o SUFFIX ast FILES
                  ${CMAKE_SOURCE_DIR}/../testdata/scad/minimal/allfunctions.scad
                  ${CMAKE_SOURCE_DIR}/../testdata/scad/minimal/allexpressions.scad)
 add_cmdline_test(csgtexttest SUFFIX txt FILES ${MINIMAL_FILES})
-add_cmdline_test(csgtermtest SUFFIX txt FILES ${MINIMAL_FILES})
+add_cmdline_test(csgtermtest EXE ${GUI_BINPATH} ARGS -o SUFFIX term FILES ${MINIMAL_FILES})
 add_cmdline_test(cgalpngtest EXE ${GUI_BINPATH} ARGS --render -o SUFFIX png FILES ${CGALPNGTEST_FILES})
 add_cmdline_test(opencsgtest SUFFIX png FILES ${OPENCSGTEST_FILES})
 add_cmdline_test(throwntogethertest SUFFIX png FILES ${THROWNTOGETHERTEST_FILES})
diff --git a/tests/test_pretty_print.py b/tests/test_pretty_print.py
index 988503c..15cb236 100755
--- a/tests/test_pretty_print.py
+++ b/tests/test_pretty_print.py
@@ -266,7 +266,7 @@ TESTLOG
 		s = s.replace(key,str(dic[key]))
 
 	for t in tests_to_report:
-		if t.type in ('txt', 'ast', 'csg'):
+		if t.type in ('txt', 'ast', 'csg', 'term'):
 			newchunk = re.sub('FTESTNAME',t.fullname,repeat2)
 			newchunk = newchunk.replace('TESTLOG',t.fulltestlog)
 			s = s.replace(repeat2, newchunk+repeat2)
@@ -369,7 +369,7 @@ def tohtml(wiki_rootpath, startdate, tests, enddate, sysinfo, sysid, makefiles):
 		s+= '<p>none</p>'
 
 	for t in tests_to_report:
-		if t.type in ('txt', 'ast', 'csg'):
+		if t.type in ('txt', 'ast', 'csg', 'term'):
 			s+='\n<pre>'+t.fullname+'</pre>\n'
 			s+='<p><pre>'+t.fulltestlog+'</pre>\n\n'
 		elif t.type=='png':
-- 
cgit v0.10.1