Test: Rework icalrecur_test - pass test data via params rather than hard-coding it.

Author: minichma

cmake/run_test.cmake

@@ -8,16 +8,6 @@ if(NOT test_cmd)
   message(FATAL_ERROR "Variable test_cmd not defined")
 endif()
 
-# output_blessed contains the name of the "blessed" output file
-if(NOT output_blessed)
-  message(FATAL_ERROR "Variable output_blessed not defined")
-endif()
-
-# output_test contains the name of the output file the test_cmd will produce
-if(NOT output_test)
-  message(FATAL_ERROR "Variable output_test not defined")
-endif()
-
 # convert the space-separated string to a list
 separate_arguments(test_args UNIX_COMMAND ${test_args})
 
@@ -30,16 +20,3 @@ execute_process(
 if(test_not_successful)
   message(SEND_ERROR "Unable to run test '${test_cmd}': ${err} : shell output: ${test_not_successful}!")
 endif()
-
-execute_process(
-  COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${output_blessed} ${output_test}
-  RESULT_VARIABLE test_not_successful
-  ERROR_VARIABLE err
-)
-
-if(test_not_successful)
-  message(
-    SEND_ERROR
-      "Output does not match for ${output_blessed} and ${output_test}: ${err} : shell output: ${test_not_successful}!"
-  )
-endif()

src/test/CMakeLists.txt

@@ -183,6 +183,10 @@ set(CMAKE_COMPARE_FILES_IGNORE_EOL TRUE)
 #ignore_eol doesn't work on Cygwin. testing years greater than 2037 will fail
 if(NOT CYGWIN AND NOT USE_32BIT_TIME_T)
   set(icalrecurtest_SRCS icalrecur_test.c)
+  configure_file(icalrecur_test.out icalrecur_test.out COPYONLY)
+  configure_file(icalrecur_withicu_test.out icalrecur_withicu_test.out COPYONLY)
+  configure_file(icalrecur_withouticu_test.out icalrecur_withouticu_test.out COPYONLY)
+  configure_file(icalrecur_withicu_dangi_test.out icalrecur_withicu_dangi_test.out COPYONLY)
   add_executable(icalrecurtest ${icalrecurtest_SRCS})
   target_link_libraries(icalrecurtest ical icalss icalvcal)
   if(WITH_CXX_BINDINGS)
@@ -192,31 +196,29 @@ if(NOT CYGWIN AND NOT USE_32BIT_TIME_T)
   set(test_cmd "${PROJECT_BINARY_DIR}/src/test/icalrecurtest${CMAKE_EXECUTABLE_SUFFIX}")
 
   #test rscale capable rrules
-  set(test_args "-r")
   if(HAVE_ICU_DANGI)
     set(reference_data "icalrecur_withicu_dangi_test.out")
   elseif(ICU_FOUND)
     set(reference_data "icalrecur_withicu_test.out")
   else()
     set(reference_data "icalrecur_withouticu_test.out")
   endif()
+  set(test_args "-f ${PROJECT_BINARY_DIR}/src/test/${reference_data}")
   add_test(
     NAME icalrecurtest-r
     COMMAND
-      ${CMAKE_COMMAND} -D test_cmd=${test_cmd} -D test_args:string=${test_args} -D
-      output_blessed=${PROJECT_SOURCE_DIR}/src/test/${reference_data} -D output_test=${PROJECT_BINARY_DIR}/bin/test.out
+      ${CMAKE_COMMAND} -D test_cmd=${test_cmd} -D test_args:string=${test_args}
       -P ${PROJECT_SOURCE_DIR}/cmake/run_test.cmake
   )
   setprops(icalrecurtest-r)
 
   #test non-rscale rrules
-  set(test_args "")
   set(reference_data "icalrecur_test.out")
+  set(test_args "-f ${PROJECT_BINARY_DIR}/src/test/${reference_data}")
   add_test(
     NAME icalrecurtest
     COMMAND
-      ${CMAKE_COMMAND} -D test_cmd=${test_cmd} -D test_args:string=${test_args} -D
-      output_blessed=${PROJECT_SOURCE_DIR}/src/test/${reference_data} -D output_test=${PROJECT_BINARY_DIR}/bin/test.out
+      ${CMAKE_COMMAND} -D test_cmd=${test_cmd} -D test_args:string=${test_args}
       -P ${PROJECT_SOURCE_DIR}/cmake/run_test.cmake
   )
   setprops(icalrecurtest)