src/test/CMakeLists.txt, icalrecur_test.c - post-merge fixes

2 files changed, 18 insertions, 24 deletions

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 24c600e8..2b586a6f 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -181,24 +181,24 @@ if(NOT WIN32 OR CMAKE_COMPARE_FILES_IGNORE_EOL)
     target_link_libraries(icalrecurtest ical icalss icalvcal)
     set(test_cmd "${CMAKE_BINARY_DIR}/src/test/icalrecurtest${CMAKE_EXECUTABLE_SUFFIX}")
 
-    if(ICU_FOUND)
-      #test rscale capable rrules
-      set(test_args "-r")
-      if(HAVE_ICU_DANGI)
-        set(reference_data "icalrecur_withicu_dangi_test.out")
-      else()
-        set(reference_data "icalrecur_withicu_test.out")
-      endif()
-      add_test(NAME icalrecurtest-r
-        COMMAND ${CMAKE_COMMAND}
-        -D test_cmd=${test_cmd}
-        -D test_args:string=${test_args}
-        -D output_blessed=${CMAKE_SOURCE_DIR}/src/test/${reference_data}
-        -D output_test=${CMAKE_BINARY_DIR}/bin/test.out
-        -P ${CMAKE_SOURCE_DIR}/cmake/run_test.cmake
-      )
-      setprops(icalrecurtest-r)
+    #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()
+    add_test(NAME icalrecurtest-r
+      COMMAND ${CMAKE_COMMAND}
+      -D test_cmd=${test_cmd}
+      -D test_args:string=${test_args}
+      -D output_blessed=${CMAKE_SOURCE_DIR}/src/test/${reference_data}
+      -D output_test=${CMAKE_BINARY_DIR}/bin/test.out
+      -P ${CMAKE_SOURCE_DIR}/cmake/run_test.cmake
+    )
+    setprops(icalrecurtest-r)
 
     #test non-rscale rrules
     set(test_args "")
diff --git a/src/test/icalrecur_test.c b/src/test/icalrecur_test.c
index 2e337ced..7bd9821f 100644
--- a/src/test/icalrecur_test.c
+++ b/src/test/icalrecur_test.c
@@ -593,17 +593,11 @@ int main(int argc, char *argv[])
 
     /* Do not use getopt for command line parsing -- for portability on Windows */
     for (int i = 1; i < argc; ++i) {
-#if defined(HAVE_LIBICU)
         if (strncmp(argv[i], "-r", 2) == 0) { /* Do RSCALE tests */
-            if (!icalrecurrencetype_rscale_is_supported()) {
-                fprintf(stderr, "error: RSCALE not supported\n");
-                fclose(fp);
-                return (1);
-            }
             r = rscale;
             continue;
         }
-#endif
+
         if (strncmp(argv[i], "-v", 2) == 0) { /* Verbose output to stdout */
             verbose = 1;
             continue;