[Opensync-commits] r5096 - in trunk/tests: . engine-tests

[<dg...@su...>]

Author: dgollub
Date: Sun Jan 11 06:42:43 2009
New Revision: 5096
URL: http://www.opensync.org/changeset/5096

Log:
Register each engine testcase as one test. This allows more detailed
regression tracking with ctest and cdash. Especallily this allows
perforamnce tracking of single performance testcases.

Modified:
   trunk/tests/CMakeLists.txt
   trunk/tests/engine-tests/check_engine.c
   trunk/tests/support.c
   trunk/tests/support.h

Modified: trunk/tests/CMakeLists.txt
==============================================================================
--- trunk/tests/CMakeLists.txt	Sun Jan 11 06:40:56 2009	(r5095)
+++ trunk/tests/CMakeLists.txt	Sun Jan 11 06:42:43 2009	(r5096)
@@ -21,7 +21,19 @@
 ADD_CHECK_TEST( converter format-tests/check_converter.c ${TEST_TARGET_LIBRARIES} )
 ADD_CHECK_TEST( datatest data-tests/check_data.c ${TEST_TARGET_LIBRARIES} )
 ADD_CHECK_TEST( detect format-tests/check_detect.c ${TEST_TARGET_LIBRARIES} ) 
-ADD_CHECK_TEST( engine engine-tests/check_engine.c ${TEST_TARGET_LIBRARIES} )
+
+BUILD_CHECK_TEST( engine engine-tests/check_engine.c ${TEST_TARGET_LIBRARIES} )
+OSYNC_TESTCASE( engine engine_new )
+OSYNC_TESTCASE( engine engine_init )
+OSYNC_TESTCASE( engine engine_sync )
+OSYNC_TESTCASE( engine engine_sync_multi_obj )
+OSYNC_TESTCASE( engine engine_sync_out_of_order )
+OSYNC_TESTCASE( engine engine_sync_reuse )
+OSYNC_TESTCASE( engine engine_sync_stress )
+OSYNC_TESTCASE( engine engine_sync_read_write )
+OSYNC_TESTCASE( engine engine_sync_read_write_stress )
+OSYNC_TESTCASE( engine engine_sync_read_write_stress2 )
+
 ADD_CHECK_TEST( engine-error engine-tests/check_engine_error.c ${TEST_TARGET_LIBRARIES} )
 ADD_CHECK_TEST( formatenv format-tests/check_format_env.c ${TEST_TARGET_LIBRARIES} )
 ADD_CHECK_TEST( group group-tests/check_group.c ${TEST_TARGET_LIBRARIES} )

Modified: trunk/tests/engine-tests/check_engine.c
==============================================================================
--- trunk/tests/engine-tests/check_engine.c	Sun Jan 11 06:40:56 2009	(r5095)
+++ trunk/tests/engine-tests/check_engine.c	Sun Jan 11 06:42:43 2009	(r5096)
@@ -2013,11 +2013,12 @@
 OSYNC_TESTCASE_ADD(engine_sync_reuse)
 OSYNC_TESTCASE_ADD(engine_sync_stress)
 
+OSYNC_TESTCASE_ADD(engine_sync_read_write)
 /* Disabled due to randomly failing - #994
-OSYNC_TESTCASE_ADD(engine_sync_read_write_stress)
+ *
 */
+OSYNC_TESTCASE_DISABLED(engine_sync_read_write_stress)
 
-OSYNC_TESTCASE_ADD(engine_sync_read_write)
 OSYNC_TESTCASE_ADD(engine_sync_read_write_stress2)
 
 //batch commit

Modified: trunk/tests/support.c
==============================================================================
--- trunk/tests/support.c	Sun Jan 11 06:40:56 2009	(r5095)
+++ trunk/tests/support.c	Sun Jan 11 06:42:43 2009	(r5096)
@@ -22,9 +22,17 @@
 	/* Also argv[0]! for symlink-ed calls */
 	for (i=0; argc > i; i++) {
 		for (j=0; tc[j].name; j++) {
-			if (strcmp(argv[i], tc[j].name))
+			if (strcmp(g_basename(argv[i]), tc[j].name))
 					continue;
 
+			if (!tc[j].func) {
+				fprintf(stderr, "Testcase \"%s\" disabled!", tc[j].name);
+				/* TODO: Return whatever needs to be returned that
+				 * CTest/CDash list this as NOTRUN
+				 */
+				exit(127);
+			}
+
 			create_case(s, tc[j].name, tc[j].func);
 			n++;
 		}

Modified: trunk/tests/support.h
==============================================================================
--- trunk/tests/support.h	Sun Jan 11 06:40:56 2009	(r5095)
+++ trunk/tests/support.h	Sun Jan 11 06:42:43 2009	(r5096)
@@ -22,6 +22,8 @@
 
 #define OSYNC_TESTCASE_ADD(x) { (#x), x },
 
+#define OSYNC_TESTCASE_DISABLED(x) { (#x), NULL },
+
 #define OSYNC_TESTCASE_END			\
 	{ NULL, NULL }				\
 	};					\