diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 13 | ||||
| -rwxr-xr-x | tests/test_pretty_print.py | 8 |
2 files changed, 10 insertions, 11 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 58df471..314b51f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -462,7 +462,7 @@ enable_testing() # set up custom pretty printing of results set(INFOCMD "execute_process(COMMAND ${CMAKE_CURRENT_BINARY_DIR}/opencsgtest --info OUTPUT_FILE sysinfo.txt)") -set(PRETTYCMD "\"${PYTHON_EXECUTABLE} test_pretty_print.py --builddir=${CMAKE_CURRENT_BINARY_DIR}\"") +set(PRETTYCMD "\"${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_pretty_print.py --builddir=${CMAKE_CURRENT_BINARY_DIR}\"") set(CTEST_CUSTOM_FILE ${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake) set(CTEST_CUSTOM_TXT "\n message(\"running 'opencsgtest --info' to generate sysinfo.txt\")\n @@ -471,14 +471,13 @@ set(CTEST_CUSTOM_TXT "\n ") file(WRITE ${CTEST_CUSTOM_FILE} ${CTEST_CUSTOM_TXT}) -foreach(FILE test_pretty_print.py) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${FILE} - ${CMAKE_CURRENT_BINARY_DIR}/${FILE} COPYONLY) -endforeach() +#foreach(FILE test_pretty_print.py) +# configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${FILE} +# ${CMAKE_CURRENT_BINARY_DIR}/${FILE} COPYONLY) +#endforeach() set_directory_properties(PROPERTIES TEST_INCLUDE_FILE "${CMAKE_SOURCE_DIR}/EnforceConfig.cmake") - # Find all scad files file(GLOB MINIMAL_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/minimal/*.scad) file(GLOB FEATURES_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/features/*.scad) @@ -527,7 +526,7 @@ disable_tests(dumptest_transform-tests disable_tests(opencsgtest_child-background) # FIXME: This single test takes over an hour to run on a 2.7 GHz P4 -disable_tests(opencsgtest_example006) +disable_tests(opencsgtest_example006 cgalpngtest_example006) # These tests only makes sense in OpenCSG mode disable_tests(cgalpngtest_child-background diff --git a/tests/test_pretty_print.py b/tests/test_pretty_print.py index 8f519d7..e2193e2 100755 --- a/tests/test_pretty_print.py +++ b/tests/test_pretty_print.py @@ -59,7 +59,7 @@ def tryread(filename): def trysave(filename,data): try: if not os.path.isdir(os.path.dirname(filename)): - print 'creating',os.path.dirname(filename) + #print 'creating',os.path.dirname(filename) os.mkdir(os.path.dirname(filename)) f=open(filename,'wb') f.write(data) @@ -386,14 +386,14 @@ def main(): logpath, logfilename = findlogfile(builddir) testlog = tryread(logfilename) startdate, tests, enddate = parselog(testlog) - print 'found sysinfo.txt' - print 'found', len(makefiles),'makefiles' + print 'found sysinfo.txt,', + print 'found', len(makefiles),'makefiles,', print 'found', len(tests),'test results' imgs, txtpages = towiki(wiki_rootpath, startdate, tests, enddate, sysinfo, sysid, makefiles) wikidir = os.path.join(logpath,sysid+'_wiki') - print 'writing',len(imgs),'images and',len(txtpages),'wiki pages to:\n ', wikidir + print 'writing',len(imgs),'images and',len(txtpages),'wiki pages to:\n ', '.'+wikidir.replace(os.getcwd(),'') for k in sorted(imgs): trysave( os.path.join(wikidir,k), imgs[k]) for k in sorted(txtpages): trysave( os.path.join(wikidir,k), txtpages[k]) |