Run ign-cmake's copy of check_test_ran

CMakeLists.txt

@@ -43,6 +43,10 @@ install(DIRECTORY benchmark/
 install(DIRECTORY codecheck/
         DESTINATION ${IGN_DATA_INSTALL_DIR}/codecheck)
 
+#--------------------------------------
+# Install the tools files
+install(DIRECTORY tools/
+        DESTINATION ${IGN_DATA_INSTALL_DIR}/tools)
 
 #============================================================================
 # Configure the package to be installed

cmake/IgnUtils.cmake

@@ -1718,7 +1718,7 @@ macro(ign_build_tests)
       if(PYTHONINTERP_FOUND)
         # Check that the test produced a result and create a failure if it didn't.
         # Guards against crashed and timed out tests.
-        add_test(check_${target_name} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/check_test_ran.py
+        add_test(check_${target_name} ${PYTHON_EXECUTABLE} ${IGNITION_CMAKE_TOOLS_DIR}/check_test_ran.py
           ${CMAKE_BINARY_DIR}/test_results/${target_name}.xml)
       endif()
     endforeach()

config/ignition-cmake-config.cmake.in

@@ -66,5 +66,6 @@ if( NOT IGNITION_CMAKE_VERSION_MAJOR
   set(IGNITION_CMAKE_DOXYGEN_DIR "@PACKAGE_IGN_DATA_INSTALL_DIR@/doxygen")
   set(IGNITION_CMAKE_CODECHECK_DIR "@PACKAGE_IGN_DATA_INSTALL_DIR@/codecheck")
   set(IGNITION_CMAKE_BENCHMARK_DIR "@PACKAGE_IGN_DATA_INSTALL_DIR@/benchmark")
+  set(IGNITION_CMAKE_TOOLS_DIR "@PACKAGE_IGN_DATA_INSTALL_DIR@/tools")
 
 endif()

tools/check_test_ran.py

@@ -59,18 +59,18 @@ def check_main():
 
     print("Checking for test results in %s"%test_file)
 
-    if not os.path.exists(test_file):
+    if not os.path.exists(test_file) or os.path.getsize(test_file) == 0:
         if not os.path.exists(os.path.dirname(test_file)):
             os.makedirs(os.path.dirname(test_file))
 
         print("Cannot find results, writing failure results to", test_file)
 
         with open(test_file, 'w') as f:
             test_name = os.path.basename(test_file)
-            d = {'test': test_name, 'test_file': test_file }
+            d = {'test': test_name, 'test_file': test_file , 'test_no_xml': test_name.replace('.xml', '')}
             f.write("""<?xml version="1.0" encoding="UTF-8"?>
 <testsuite tests="1" failures="1" time="1" errors="0" name="%(test)s">
-  <testcase name="test_ran" status="run" time="1" classname="Results">
+  <testcase name="test_ran" status="run" time="1" classname="%(test_no_xml)s">
     <failure message="Unable to find test results for %(test)s, test did not run.\nExpected results in %(test_file)s" type=""/>
   </testcase>
 </testsuite>"""%d)