[Opensync-commits] r5539 - in plugins/ldap-sync: . tests

[<svn...@op...>]

Author: scriptor
Date: Sun Apr  5 16:14:22 2009
New Revision: 5539
URL: http://www.opensync.org/changeset/5539

Log:
Adding PATH_SEPARATOR for the new handling of trace files in the test suite:
Each test will have its own subdirectory.  And even each call to 
osyncplugin/osynctool will have its own sub-subdirectory.  Otherwise
debugging is almost impossible when there are hundreds of trace files
in one directory.

Still struggling with setting a timeout with ctest:
cmake and ctest are rather buggy if it comes to setting a timeout.

New insight: 

When you first run cmake there does not seem to be any way to avoid the
1500 seconds timeout defined in DART_TESTING_TIMEOUT (well, -D...,
possibly does).

But running cmake for a second time does seem to consider the settings 
in CMakeLists.txt.  So we must run cmake twice to set DART_TESTING_TIMEOUT
as we want.

Modified:
   plugins/ldap-sync/CTestConfig.cmake
   plugins/ldap-sync/tests/test.conf

Modified: plugins/ldap-sync/CTestConfig.cmake
==============================================================================
--- plugins/ldap-sync/CTestConfig.cmake	Sun Apr  5 16:14:05 2009	(r5538)
+++ plugins/ldap-sync/CTestConfig.cmake	Sun Apr  5 16:14:22 2009	(r5539)
@@ -11,3 +11,9 @@
 set(CTEST_DROP_SITE "opensync.org")
 set(CTEST_DROP_LOCATION "/testing/submit.php?project=ldap-sync")
 set(CTEST_DROP_SITE_CDASH TRUE)
+
+set (CTEST_TEST_TIMEOUT 300)
+set (CMAKE_LONG_TEST_TIMEOUT 300)
+set (DART_TESTING_TIMEOUT 300)
+set (CTEST_TIME_LIMIT 300)
+set (TIMEOUT 300)

Modified: plugins/ldap-sync/tests/test.conf
==============================================================================
--- plugins/ldap-sync/tests/test.conf	Sun Apr  5 16:14:05 2009	(r5538)
+++ plugins/ldap-sync/tests/test.conf	Sun Apr  5 16:14:22 2009	(r5539)
@@ -43,11 +43,13 @@
 #          If the variable is empty, tracing is disabled.
 TRACE_FILES="/tmp/trace"
 #TRACE_FILES=""
+PATH_SEPARATOR="/"
+
 
 
 ########## Set a more realistic timeout in seconds for each test:
 # Default would be 1500 s (= 25 minutes!)
-export TIMEOUT=1500
+export TIMEOUT=300
 export CTEST_TEST_TIMEOUT=${TIMEOUT}
 export DART_TESTING_TIMEOUT=${TIMEOUT}
 export CMAKE_LONG_TEST_TIMEOUT=${TIMEOUT}