Revert "REMOVE? Testfix"

This reverts commit ec765d5.

Author: vehre

CMakeLists.txt

@@ -804,25 +804,11 @@ function(add_caf_test name num_caf_img test_target)
     endif()
   endif()
   set(test_parameters -np ${num_caf_img} ${test_parameters})
-  if(WIN32)
-    set(LAUNCHER "${CMAKE_INSTALL_BINDIR}/cafrun.bat")
-  else()
-    set(LAUNCHER "${BASH_EXECUTABLE}" "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/cafrun")
-  endif()
   if(DEFINED ARGN)
-    add_test(
-      NAME ${name}
-      COMMAND "${LAUNCHER}" ${test_parameters} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${test_target}" ${ARGN}
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    )
+    add_test(NAME ${name} COMMAND "${BASH_EXECUTABLE}" "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/cafrun" ${test_parameters} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${test_target}" ${ARGN})
   else()
-    add_test(
-      NAME ${name}
-      COMMAND "${LAUNCHER}" ${test_parameters} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${test_target}"
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    )
+    add_test(NAME ${name} COMMAND "${BASH_EXECUTABLE}" "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/cafrun" ${test_parameters} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${test_target}")
   endif()
-  set_property(TEST ${name} PROPERTY TEST_LAUCHNER "")
   set_property(TEST ${name} PROPERTY PASS_REGULAR_EXPRESSION "Test passed.")
 endfunction(add_caf_test)