Test: Rework icalrecur_test - pass test data via params rather than h…

…ard-coding it.
minichma · Oct 21, 2024 · fa3a48c · fa3a48c
1 parent ac9f760
commit fa3a48c
Show file tree

Hide file tree

Showing 2 changed files with 142 additions and 617 deletions.
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
@@ -140,6 +140,10 @@ testme(recur "${recur_SRCS}")
 
 if(HAVE_GETOPT) #getopt is required
   set(icalrecur_test_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)
   buildme(icalrecur_test "${icalrecur_test_SRCS}")
 endif()
 
@@ -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)