[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepimlibs/kcal/tests
From:       Volker Krause <vkrause () kde ! org>
Date:       2010-01-12 16:18:36
Message-ID: 1263313116.260602.23295.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1073656 by vkrause:

One step closer towards making the KCal tests run on Windows. Remaining issues \
AFAICS: the perl script uses /dev/null which does not work on Windows, and I'm seeing \
some ical/timezone crash when running a test manually.

 M  +24 -19    CMakeLists.txt  


--- trunk/KDE/kdepimlibs/kcal/tests/CMakeLists.txt #1073655:1073656
@@ -86,40 +86,45 @@
 FILE( GLOB_RECURSE vCalFilesAsIcal data/vCalendar/*.ics )
 FILE( GLOB_RECURSE vCalFiles       data/vCalendar/*.vcs )
 
+if (WIN32)
+  find_program(PERL_EXECUTABLE perl)
+endif (WIN32)
+
+macro(kcal_run_single_test _prefix _file _test _testarg)
+  get_filename_component( _fn ${_file} NAME)
+  set(_runner ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl)
+  if (UNIX)
+    set(_test_path ${EXECUTABLE_OUTPUT_PATH}/${_test}.shell)
+  endif (UNIX)
+  if (WIN32)
+    set(_test_path ${EXECUTABLE_OUTPUT_PATH}/${_test}.exe.bat)
+    set(_runner ${PERL_EXECUTABLE} ${_runner}) 
+  endif (WIN32)
+
+  add_test( ${_prefix}-${_fn} ${_runner} ${_test_path} ${_testarg} ${_file} )
+endmacro(kcal_run_single_test)
+
 FOREACH( file ${testFiles} )
-  GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( RecurNext-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl \
${EXECUTABLE_OUTPUT_PATH}/testrecurrence.shell "next" ${file} ) +  \
kcal_run_single_test( RecurNext ${file} testrecurrence "next" )  ENDFOREACH(file)
 
 FOREACH( file ${testFiles} )
-  GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( RecurPrev-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl \
${EXECUTABLE_OUTPUT_PATH}/testrecurprevious.shell "prev" ${file} ) +  \
kcal_run_single_test( RecurPrev ${file} testrecurprevious "prev" )  ENDFOREACH(file)
 
 FOREACH( file ${testFiles} )
-  GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( RecursOn-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl \
${EXECUTABLE_OUTPUT_PATH}/testrecurson.shell "recurson" ${file} ) +  \
kcal_run_single_test( RecursOn ${file} testrecurson "recurson" )  ENDFOREACH(file)
 
 FOREACH( file ${compatFiles} )
-  GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( Compat-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl \
${EXECUTABLE_OUTPUT_PATH}/readandwrite.shell "ical" ${file} ) +  \
kcal_run_single_test( Compat ${file} readandwrite "ical" )  ENDFOREACH(file)
 
 FOREACH( file ${vCalFilesAsIcal} )
-  GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( VCalOut-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl \
${EXECUTABLE_OUTPUT_PATH}/testvcalexport.shell "vcal" ${file} ) +  \
kcal_run_single_test( VCalOut ${file} testvcalexport "vcal" )  ENDFOREACH(file)
 
 FOREACH( file ${vCalFiles} )
-  GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( VCalIn-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl \
${EXECUTABLE_OUTPUT_PATH}/readandwrite.shell "ical" ${file} ) +  \
kcal_run_single_test( VCalIn ${file} readandwrite "ical" )  ENDFOREACH(file)
 
-# ADD_TEST( TestRecurrence  runtestcase.pl testrecurrence    "next" \
                ${CMAKE_CURRENT_SOURCE_DIR} data/RecurrenceRule/ "*.ics" )
-# ADD_TEST( TestRecPrevious runtestcase.pl testrecurprevious "prev" \
                ${CMAKE_CURRENT_SOURCE_DIR} data/RecurrenceRule/ "*.ics" )
-# ADD_TEST( TestRecursOn    runtestcase.pl testrecurson  "recurson" \
                ${CMAKE_CURRENT_SOURCE_DIR} data/RecurrenceRule/ "*.ics" )
-# ADD_TEST( TestCompat      runtestcase.pl readandwrite      "ical" \
                ${CMAKE_CURRENT_SOURCE_DIR} data/Compat/         "*.ics" )
-# ADD_TEST( TestVCal        runtestcase.pl testvcalexport    "vcal" \
                ${CMAKE_CURRENT_SOURCE_DIR} data/vCalendar/      "*.ics" )
-# ADD_TEST( TestFromVCal    runtestcase.pl readandwrite      "ical" \
                ${CMAKE_CURRENT_SOURCE_DIR} data/vCalendar/      "*.vcs" )
-


[prev in list] [next in list] [prev in thread] [next in thread]