create_case is better done as a macro that expands in situ:
#define CREATE_CASE(s, n, f) \
tc_new = tcase_create((n)); \
tcase_set_timeout(tc_new, 0); \
suite_add_tcase ((s), tc_new); \
tcase_add_test (tc_new, (f));
Each routine then becomes:
Suite *s = suite_create("Multisync");
//Suite *s2 = suite_create("Multisync");
TCase *tc_new;
CREATE_CASE(s, "multisync_easy_new", multisync_easy_new);
etc. (note the addition of the tc_new variable).
I'm attaching a patch that allows the package to build but the tests
themselves do not run successfully. The bulk of the patch is just
changing the function call to a macro expansion.
I've prepared an NMU to fix the RC bug #393720 and I can upload later today (22nd).
P.S. please use something like dpatch to make things like this easier in the future. Ta. (the .diff.gz is getting quite large).
-- Neil Williams ============= http://www.data-freedom.org/ http://www.nosoftwarepatents.com/ http://www.linux.codehelp.co.uk/
--- opensync-0.19/debian/changelog
+++ opensync-0.19/debian/changelog
@@ -1,3 +1,12 @@
+opensync (0.19-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * FTBFS: /opensync-0.19/tests/check_ipc.c:2062: warning: passing
+ argument 3 of 'create_case' from incompatible pointer type
+ (Closes: #393720)
+
+ -- Neil Williams <[EMAIL PROTECTED]> Sun, 22 Oct 2006 00:37:28 +0100
+
opensync (0.19-1) unstable; urgency=low
* New upstream release (Closes: #392162).
--- opensync-0.19.orig/tests/check_codes.c
+++ opensync-0.19/tests/check_codes.c
@@ -1848,48 +1848,50 @@
{
Suite *s = suite_create("Error Codes");
//Suite *s2 = suite_create("Error Codes");
- create_case(s, "single_init_error", single_init_error);
- create_case(s, "dual_connect_error", dual_connect_error);
- create_case(s, "one_of_two_connect_error", one_of_two_connect_error);
- create_case(s, "two_of_three_connect_error", two_of_three_connect_error);
- create_case(s, "two_of_three_connect_error2", two_of_three_connect_error2);
- create_case(s, "three_of_three_connect_error", three_of_three_connect_error);
- create_case(s, "one_of_three_connect_error", one_of_three_connect_error);
- create_case(s, "no_connect_error", no_connect_error);
- create_case(s, "single_connect_timeout", single_connect_timeout);
- create_case(s, "dual_connect_timeout", dual_connect_timeout);
- create_case(s, "one_of_three_timeout", one_of_three_timeout);
- create_case(s, "timeout_and_error", timeout_and_error);
- create_case(s, "single_get_changes_error", single_get_changes_error);
- create_case(s, "dual_get_changes_error", dual_get_changes_error);
- create_case(s, "two_of_three_get_changes_error", two_of_three_get_changes_error);
- create_case(s, "one_of_three_get_changes_error", one_of_three_get_changes_error);
- create_case(s, "one_of_three_get_changes_timeout", one_of_three_get_changes_timeout);
- create_case(s, "get_changes_timeout_and_error", get_changes_timeout_and_error);
- create_case(s, "get_changes_timeout_sleep", get_changes_timeout_sleep);
- create_case(s, "single_commit_error", single_commit_error);
- create_case(s, "dual_commit_error", dual_commit_error);
- create_case(s, "single_commit_timeout", single_commit_timeout);
- create_case(s, "dual_commit_timeout", dual_commit_timeout);
- create_case(s, "commit_timeout_and_error", commit_timeout_and_error);
- create_case(s, "commit_timeout_and_error2", commit_timeout_and_error2);
- create_case(s, "commit_error_modify", commit_error_modify);
- create_case(s, "commit_error_delete", commit_error_delete);
- create_case(s, "committed_all_error", committed_all_error);
- create_case(s, "committed_all_batch_error", committed_all_batch_error);
- create_case(s, "single_sync_done_error", single_sync_done_error);
- create_case(s, "dual_sync_done_error", dual_sync_done_error);
- create_case(s, "triple_sync_done_error", triple_sync_done_error);
- create_case(s, "single_sync_done_timeout", single_sync_done_timeout);
- create_case(s, "dual_sync_done_timeout", dual_sync_done_timeout);
- create_case(s, "sync_done_timeout_and_error", sync_done_timeout_and_error);
- create_case(s, "single_disconnect_error", single_disconnect_error);
- create_case(s, "dual_disconnect_error", dual_disconnect_error);
- create_case(s, "triple_disconnect_error", triple_disconnect_error);
- create_case(s, "single_disconnect_timeout", single_disconnect_timeout);
- create_case(s, "dual_disconnect_timeout", dual_disconnect_timeout);
- create_case(s, "disconnect_timeout_and_error", disconnect_timeout_and_error);
- create_case(s, "get_changes_disconnect_error", get_changes_disconnect_error);
+ TCase *tc_new;
+
+ CREATE_CASE(s, "single_init_error", single_init_error);
+ CREATE_CASE(s, "dual_connect_error", dual_connect_error);
+ CREATE_CASE(s, "one_of_two_connect_error", one_of_two_connect_error);
+ CREATE_CASE(s, "two_of_three_connect_error", two_of_three_connect_error);
+ CREATE_CASE(s, "two_of_three_connect_error2", two_of_three_connect_error2);
+ CREATE_CASE(s, "three_of_three_connect_error", three_of_three_connect_error);
+ CREATE_CASE(s, "one_of_three_connect_error", one_of_three_connect_error);
+ CREATE_CASE(s, "no_connect_error", no_connect_error);
+ CREATE_CASE(s, "single_connect_timeout", single_connect_timeout);
+ CREATE_CASE(s, "dual_connect_timeout", dual_connect_timeout);
+ CREATE_CASE(s, "one_of_three_timeout", one_of_three_timeout);
+ CREATE_CASE(s, "timeout_and_error", timeout_and_error);
+ CREATE_CASE(s, "single_get_changes_error", single_get_changes_error);
+ CREATE_CASE(s, "dual_get_changes_error", dual_get_changes_error);
+ CREATE_CASE(s, "two_of_three_get_changes_error", two_of_three_get_changes_error);
+ CREATE_CASE(s, "one_of_three_get_changes_error", one_of_three_get_changes_error);
+ CREATE_CASE(s, "one_of_three_get_changes_timeout", one_of_three_get_changes_timeout);
+ CREATE_CASE(s, "get_changes_timeout_and_error", get_changes_timeout_and_error);
+ CREATE_CASE(s, "get_changes_timeout_sleep", get_changes_timeout_sleep);
+ CREATE_CASE(s, "single_commit_error", single_commit_error);
+ CREATE_CASE(s, "dual_commit_error", dual_commit_error);
+ CREATE_CASE(s, "single_commit_timeout", single_commit_timeout);
+ CREATE_CASE(s, "dual_commit_timeout", dual_commit_timeout);
+ CREATE_CASE(s, "commit_timeout_and_error", commit_timeout_and_error);
+ CREATE_CASE(s, "commit_timeout_and_error2", commit_timeout_and_error2);
+ CREATE_CASE(s, "commit_error_modify", commit_error_modify);
+ CREATE_CASE(s, "commit_error_delete", commit_error_delete);
+ CREATE_CASE(s, "committed_all_error", committed_all_error);
+ CREATE_CASE(s, "committed_all_batch_error", committed_all_batch_error);
+ CREATE_CASE(s, "single_sync_done_error", single_sync_done_error);
+ CREATE_CASE(s, "dual_sync_done_error", dual_sync_done_error);
+ CREATE_CASE(s, "triple_sync_done_error", triple_sync_done_error);
+ CREATE_CASE(s, "single_sync_done_timeout", single_sync_done_timeout);
+ CREATE_CASE(s, "dual_sync_done_timeout", dual_sync_done_timeout);
+ CREATE_CASE(s, "sync_done_timeout_and_error", sync_done_timeout_and_error);
+ CREATE_CASE(s, "single_disconnect_error", single_disconnect_error);
+ CREATE_CASE(s, "dual_disconnect_error", dual_disconnect_error);
+ CREATE_CASE(s, "triple_disconnect_error", triple_disconnect_error);
+ CREATE_CASE(s, "single_disconnect_timeout", single_disconnect_timeout);
+ CREATE_CASE(s, "dual_disconnect_timeout", dual_disconnect_timeout);
+ CREATE_CASE(s, "disconnect_timeout_and_error", disconnect_timeout_and_error);
+ CREATE_CASE(s, "get_changes_disconnect_error", get_changes_disconnect_error);
return s;
}
--- opensync-0.19.orig/tests/check_conv.c
+++ opensync-0.19/tests/check_conv.c
@@ -976,33 +976,34 @@
{
Suite *s = suite_create("Conv");
//Suite *s2 = suite_create("Conv");
+ TCase *tc_new;
- create_case(s, "conv_env_create", conv_env_create);
- create_case(s, "conv_env_add_type", conv_env_add_type);
- create_case(s, "conv_env_add_type_find", conv_env_add_type_find);
- create_case(s, "conv_env_add_type_find_false", conv_env_add_type_find_false);
- create_case(s, "conv_env_type_register2", conv_env_type_register2);
- create_case(s, "conv_env_add_format", conv_env_add_format);
- create_case(s, "conv_env_set_format_string", conv_env_set_format_string);
- create_case(s, "conv_env_add_converters", conv_env_add_converters);
- create_case(s, "conv_env_add_converters_missing", conv_env_add_converters_missing);
- create_case(s, "conv_env_osp_simple", conv_env_osp_simple);
- create_case(s, "conv_env_osp_simple2", conv_env_osp_simple2);
- create_case(s, "conv_env_osp_false", conv_env_osp_false);
- create_case(s, "conv_env_osp_2way", conv_env_osp_2way);
- create_case(s, "conv_env_osp_circular_false", conv_env_osp_circular_false);
- create_case(s, "conv_env_osp_complex", conv_env_osp_complex);
- create_case(s, "conv_env_convert1", conv_env_convert1);
- create_case(s, "conv_env_convert_back", conv_env_convert_back);
- create_case(s, "conv_env_convert_desenc", conv_env_convert_desenc);
- create_case(s, "conv_env_convert_desenc_complex", conv_env_convert_desenc_complex);
- create_case(s, "conv_env_detect_and_convert", conv_env_detect_and_convert);
- create_case(s, "conv_prefer_not_desencap", conv_prefer_not_desencap);
- create_case(s, "conv_prefer_same_objtype", conv_prefer_same_objtype);
- create_case(s, "conv_prefer_not_lossy_objtype_change", conv_prefer_not_lossy_objtype_change);
- create_case(s, "conv_env_detect_false", conv_env_detect_false);
- create_case(s, "conv_env_decap_and_detect", conv_env_decap_and_detect);
- create_case(s, "conv_env_decap_and_detect2", conv_env_decap_and_detect2);
+ CREATE_CASE(s, "conv_env_create", conv_env_create);
+ CREATE_CASE(s, "conv_env_add_type", conv_env_add_type);
+ CREATE_CASE(s, "conv_env_add_type_find", conv_env_add_type_find);
+ CREATE_CASE(s, "conv_env_add_type_find_false", conv_env_add_type_find_false);
+ CREATE_CASE(s, "conv_env_type_register2", conv_env_type_register2);
+ CREATE_CASE(s, "conv_env_add_format", conv_env_add_format);
+ CREATE_CASE(s, "conv_env_set_format_string", conv_env_set_format_string);
+ CREATE_CASE(s, "conv_env_add_converters", conv_env_add_converters);
+ CREATE_CASE(s, "conv_env_add_converters_missing", conv_env_add_converters_missing);
+ CREATE_CASE(s, "conv_env_osp_simple", conv_env_osp_simple);
+ CREATE_CASE(s, "conv_env_osp_simple2", conv_env_osp_simple2);
+ CREATE_CASE(s, "conv_env_osp_false", conv_env_osp_false);
+ CREATE_CASE(s, "conv_env_osp_2way", conv_env_osp_2way);
+ CREATE_CASE(s, "conv_env_osp_circular_false", conv_env_osp_circular_false);
+ CREATE_CASE(s, "conv_env_osp_complex", conv_env_osp_complex);
+ CREATE_CASE(s, "conv_env_convert1", conv_env_convert1);
+ CREATE_CASE(s, "conv_env_convert_back", conv_env_convert_back);
+ CREATE_CASE(s, "conv_env_convert_desenc", conv_env_convert_desenc);
+ CREATE_CASE(s, "conv_env_convert_desenc_complex", conv_env_convert_desenc_complex);
+ CREATE_CASE(s, "conv_env_detect_and_convert", conv_env_detect_and_convert);
+ CREATE_CASE(s, "conv_prefer_not_desencap", conv_prefer_not_desencap);
+ CREATE_CASE(s, "conv_prefer_same_objtype", conv_prefer_same_objtype);
+ CREATE_CASE(s, "conv_prefer_not_lossy_objtype_change", conv_prefer_not_lossy_objtype_change);
+ CREATE_CASE(s, "conv_env_detect_false", conv_env_detect_false);
+ CREATE_CASE(s, "conv_env_decap_and_detect", conv_env_decap_and_detect);
+ CREATE_CASE(s, "conv_env_decap_and_detect2", conv_env_decap_and_detect2);
return s;
}
--- opensync-0.19.orig/tests/check_env.c
+++ opensync-0.19/tests/check_env.c
@@ -175,17 +175,19 @@
{
Suite *s = suite_create("Env");
//Suite *s2 = suite_create("Env");
- create_case(s, "env_create", env_create);
- create_case(s, "env_init", env_init);
- create_case(s, "env_double_init", env_double_init);
- create_case(s, "env_pre_fin", env_pre_fin);
- create_case(s, "env_init_false", env_init_false);
- create_case(s, "env_init_false2", env_init_false2);
- create_case(s, "env_sync_false", env_sync_false);
- create_case(s, "env_check_plugin_true1", env_check_plugin_true1);
- create_case(s, "env_check_plugin_true2", env_check_plugin_true2);
- create_case(s, "env_check_plugin_false", env_check_plugin_false);
- create_case(s, "env_check_plugin_false2", env_check_plugin_false2);
+ TCase *tc_new;
+
+ CREATE_CASE(s, "env_create", env_create);
+ CREATE_CASE(s, "env_init", env_init);
+ CREATE_CASE(s, "env_double_init", env_double_init);
+ CREATE_CASE(s, "env_pre_fin", env_pre_fin);
+ CREATE_CASE(s, "env_init_false", env_init_false);
+ CREATE_CASE(s, "env_init_false2", env_init_false2);
+ CREATE_CASE(s, "env_sync_false", env_sync_false);
+ CREATE_CASE(s, "env_check_plugin_true1", env_check_plugin_true1);
+ CREATE_CASE(s, "env_check_plugin_true2", env_check_plugin_true2);
+ CREATE_CASE(s, "env_check_plugin_false", env_check_plugin_false);
+ CREATE_CASE(s, "env_check_plugin_false2", env_check_plugin_false2);
return s;
}
--- opensync-0.19.orig/tests/check_filter.c
+++ opensync-0.19/tests/check_filter.c
@@ -296,14 +296,15 @@
{
Suite *s = suite_create("Filter");
//Suite *s2 = suite_create("Filter");
+ TCase *tc_new;
- create_case(s, "filter_setup", filter_setup);
- create_case(s, "filter_flush", filter_flush);
- create_case(s, "filter_sync_deny_all", filter_sync_deny_all);
- create_case(s, "filter_sync_custom", filter_sync_custom);
- create_case(s, "filter_save_and_load", filter_save_and_load);
- create_case(s, "filter_sync_vcard_only", filter_sync_vcard_only);
- create_case(s, "filter_destobjtype_delete", filter_destobjtype_delete);
+ CREATE_CASE(s, "filter_setup", filter_setup);
+ CREATE_CASE(s, "filter_flush", filter_flush);
+ CREATE_CASE(s, "filter_sync_deny_all", filter_sync_deny_all);
+ CREATE_CASE(s, "filter_sync_custom", filter_sync_custom);
+ CREATE_CASE(s, "filter_save_and_load", filter_save_and_load);
+ CREATE_CASE(s, "filter_sync_vcard_only", filter_sync_vcard_only);
+ CREATE_CASE(s, "filter_destobjtype_delete", filter_destobjtype_delete);
return s;
}
--- opensync-0.19.orig/tests/check_ipc.c
+++ opensync-0.19/tests/check_ipc.c
@@ -2049,29 +2049,34 @@
{
Suite *s = suite_create("IPC");
//Suite *s2 = suite_create("IPC");
-
- create_case(s, "ipc_new", ipc_new);
- create_case(s, "ipc_create", ipc_create);
- create_case(s, "ipc_connect", ipc_connect);
- create_case(s, "ipc_payload", ipc_payload);
- create_case(s, "ipc_payload_wait", ipc_payload_wait);
- create_case(s, "ipc_payload_stress", ipc_payload_stress);
- create_case(s, "ipc_payload_stress2", ipc_payload_stress2);
- create_case(s, "ipc_large_payload", ipc_large_payload);
-
- create_case(s, "ipc_error_no_pipe", ipc_error_no_pipe);
- create_case(s, "ipc_error_perm", ipc_error_perm);
- create_case(s, "ipc_error_rem", ipc_error_rem);
- create_case(s, "ipc_error_rem2", ipc_error_rem2);
-
- create_case(s, "ipc_loop_payload", ipc_loop_payload);
- create_case(s, "ipc_loop_stress", ipc_loop_stress);
- create_case(s, "ipc_loop_callback", ipc_loop_callback);
- create_case(s, "ipc_callback_break", ipc_callback_break);
-
- create_case(s, "ipc_pipes", ipc_pipes);
- create_case(s, "ipc_pipes_stress", ipc_pipes_stress);
- create_case(s, "ipc_callback_break_pipes", ipc_callback_break_pipes);
+ TCase *tc_new;
+
+ tc_new = tcase_create("ipc_new");
+ tcase_set_timeout(tc_new, 0);
+ suite_add_tcase (s, tc_new);
+ tcase_add_test (tc_new, ipc_new);
+ CREATE_CASE (s, "ipc_new", ipc_new);
+ CREATE_CASE (s, "ipc_create", ipc_create);
+ CREATE_CASE (s, "ipc_connect", ipc_connect);
+ CREATE_CASE (s, "ipc_payload", ipc_payload);
+ CREATE_CASE (s, "ipc_payload_wait", ipc_payload_wait);
+ CREATE_CASE (s, "ipc_payload_stress", ipc_payload_stress);
+ CREATE_CASE (s, "ipc_payload_stress2", ipc_payload_stress2);
+ CREATE_CASE (s, "ipc_large_payload", ipc_large_payload);
+
+ CREATE_CASE (s, "ipc_error_no_pipe", ipc_error_no_pipe);
+ CREATE_CASE (s, "ipc_error_perm", ipc_error_perm);
+ CREATE_CASE (s, "ipc_error_rem", ipc_error_rem);
+ CREATE_CASE (s, "ipc_error_rem2", ipc_error_rem2);
+
+ CREATE_CASE (s, "ipc_loop_payload", ipc_loop_payload);
+ CREATE_CASE (s, "ipc_loop_stress", ipc_loop_stress);
+ CREATE_CASE (s, "ipc_loop_callback", ipc_loop_callback);
+ CREATE_CASE (s, "ipc_callback_break", ipc_callback_break);
+
+ CREATE_CASE (s, "ipc_pipes", ipc_pipes);
+ CREATE_CASE (s, "ipc_pipes_stress", ipc_pipes_stress);
+ CREATE_CASE (s, "ipc_callback_break_pipes", ipc_callback_break_pipes);
return s;
}
--- opensync-0.19.orig/tests/check_lock.c
+++ opensync-0.19/tests/check_lock.c
@@ -242,15 +242,17 @@
{
Suite *s = suite_create("Locks");
//Suite *s2 = suite_create("Locks");
- create_case(s, "simple_lock", simple_lock);
- create_case(s, "simple_lock_stale", simple_lock_stale);
- create_case(s, "simple_seq_lock", simple_seq_lock);
- create_case(s, "simple_seq_stale_lock", simple_seq_stale_lock);
- create_case(s, "dual_lock", dual_lock);
- create_case(s, "dual_lock2", dual_lock2);
- create_case(s, "multi_unlock", multi_unlock);
- create_case(s, "dual_sync_engine_lock", dual_sync_engine_lock);
- create_case(s, "dual_sync_engine_unclean", dual_sync_engine_unclean);
+ TCase *tc_new;
+
+ CREATE_CASE(s, "simple_lock", simple_lock);
+ CREATE_CASE(s, "simple_lock_stale", simple_lock_stale);
+ CREATE_CASE(s, "simple_seq_lock", simple_seq_lock);
+ CREATE_CASE(s, "simple_seq_stale_lock", simple_seq_stale_lock);
+ CREATE_CASE(s, "dual_lock", dual_lock);
+ CREATE_CASE(s, "dual_lock2", dual_lock2);
+ CREATE_CASE(s, "multi_unlock", multi_unlock);
+ CREATE_CASE(s, "dual_sync_engine_lock", dual_sync_engine_lock);
+ CREATE_CASE(s, "dual_sync_engine_unclean", dual_sync_engine_unclean);
return s;
--- opensync-0.19.orig/tests/check_multisync.c
+++ opensync-0.19/tests/check_multisync.c
@@ -2094,7 +2094,7 @@
START_TEST(multisync_easy_new_b)
{
setenv("BATCH_COMMIT", "7", TRUE);
- multisync_easy_new();
+ multisync_easy_new(__LINE__);
unsetenv("BATCH_COMMIT");
}
END_TEST
@@ -2102,7 +2102,7 @@
START_TEST(multisync_triple_del_b)
{
setenv("BATCH_COMMIT", "7", TRUE);
- multisync_triple_del();
+ multisync_triple_del(__LINE__);
unsetenv("BATCH_COMMIT");
}
END_TEST
@@ -2110,7 +2110,7 @@
START_TEST(multisync_conflict_hybrid_choose2_b)
{
setenv("BATCH_COMMIT", "7", TRUE);
- multisync_conflict_hybrid_choose2();
+ multisync_conflict_hybrid_choose2(__LINE__);
unsetenv("BATCH_COMMIT");
}
END_TEST
@@ -2118,7 +2118,7 @@
START_TEST(multisync_delayed_conflict_handler_b)
{
setenv("BATCH_COMMIT", "7", TRUE);
- multisync_delayed_conflict_handler();
+ multisync_delayed_conflict_handler(__LINE__);
unsetenv("BATCH_COMMIT");
}
END_TEST
@@ -2126,7 +2126,7 @@
START_TEST(multisync_delayed_slow_b)
{
setenv("BATCH_COMMIT", "7", TRUE);
- multisync_delayed_slow();
+ multisync_delayed_slow(__LINE__);
unsetenv("BATCH_COMMIT");
}
END_TEST
@@ -2134,7 +2134,7 @@
START_TEST(multisync_conflict_ignore_b)
{
setenv("BATCH_COMMIT", "7", TRUE);
- multisync_conflict_ignore();
+ multisync_conflict_ignore(__LINE__);
unsetenv("BATCH_COMMIT");
}
END_TEST
@@ -2143,7 +2143,7 @@
{
setenv("BATCH_COMMIT", "7", TRUE);
setenv("NO_TIMEOUTS", "7", TRUE);
- multisync_conflict_ignore2();
+ multisync_conflict_ignore2(__LINE__);
unsetenv("BATCH_COMMIT");
unsetenv("NO_TIMEOUTS");
}
@@ -2152,7 +2152,7 @@
START_TEST(multisync_conflict_hybrid_duplicate_b)
{
setenv("BATCH_COMMIT", "7", TRUE);
- multisync_conflict_hybrid_duplicate();
+ multisync_conflict_hybrid_duplicate(__LINE__);
unsetenv("BATCH_COMMIT");
}
END_TEST
@@ -2160,7 +2160,7 @@
START_TEST(multisync_multi_conflict_b)
{
setenv("BATCH_COMMIT", "7", TRUE);
- multisync_multi_conflict();
+ multisync_multi_conflict(__LINE__);
unsetenv("BATCH_COMMIT");
}
END_TEST
@@ -2252,7 +2252,7 @@
START_TEST(multisync_conflict_hybrid_choose2_b2)
{
setenv("BATCH_COMMIT", "2", TRUE);
- multisync_conflict_hybrid_choose2();
+ multisync_conflict_hybrid_choose2(__LINE__);
unsetenv("BATCH_COMMIT");
}
END_TEST
@@ -2260,7 +2260,7 @@
START_TEST(multisync_delayed_conflict_handler_b2)
{
setenv("BATCH_COMMIT", "2", TRUE);
- multisync_delayed_conflict_handler();
+ multisync_delayed_conflict_handler(__LINE__);
unsetenv("BATCH_COMMIT");
}
END_TEST
@@ -2268,7 +2268,7 @@
START_TEST(multisync_conflict_ignore_b2)
{
setenv("BATCH_COMMIT", "2", TRUE);
- multisync_conflict_ignore();
+ multisync_conflict_ignore(__LINE__);
unsetenv("BATCH_COMMIT");
}
END_TEST
@@ -2276,7 +2276,7 @@
START_TEST(multisync_multi_conflict_b2)
{
setenv("BATCH_COMMIT", "2", TRUE);
- multisync_multi_conflict();
+ multisync_multi_conflict(__LINE__);
unsetenv("BATCH_COMMIT");
}
END_TEST
@@ -2285,50 +2285,52 @@
{
Suite *s = suite_create("Multisync");
//Suite *s2 = suite_create("Multisync");
- create_case(s, "multisync_easy_new", multisync_easy_new);
- create_case(s, "multisync_dual_new", multisync_dual_new);
- create_case(s, "multisync_triple_new", multisync_triple_new);
- create_case(s, "multisync_easy_mod", multisync_easy_mod);
- create_case(s, "multisync_dual_mod", multisync_dual_mod);
- create_case(s, "multisync_triple_mod", multisync_triple_mod);
- create_case(s, "multisync_easy_del", multisync_easy_del);
- create_case(s, "multisync_dual_del", multisync_dual_del);
- create_case(s, "multisync_triple_del", multisync_triple_del);
-
- create_case(s, "multisync_conflict_data_choose", multisync_conflict_data_choose);
- create_case(s, "multisync_conflict_data_choose2", multisync_conflict_data_choose2);
- create_case(s, "multisync_conflict_changetype_choose", multisync_conflict_changetype_choose);
- create_case(s, "multisync_conflict_changetype_choose2", multisync_conflict_changetype_choose2);
- create_case(s, "multisync_conflict_hybrid_choose", multisync_conflict_hybrid_choose);
- create_case(s, "multisync_conflict_hybrid_choose2", multisync_conflict_hybrid_choose2);
- create_case(s, "multisync_conflict_data_duplicate", multisync_conflict_data_duplicate);
- create_case(s, "multisync_conflict_data_duplicate2", multisync_conflict_data_duplicate2);
- create_case(s, "multisync_conflict_changetype_duplicate", multisync_conflict_changetype_duplicate);
- create_case(s, "multisync_conflict_changetype_duplicate2", multisync_conflict_changetype_duplicate2);
- create_case(s, "multisync_conflict_hybrid_duplicate", multisync_conflict_hybrid_duplicate);
- create_case(s, "multisync_multi_conflict", multisync_multi_conflict);
-
- create_case(s, "multisync_delayed_conflict_handler", multisync_delayed_conflict_handler);
- create_case(s, "multisync_delayed_slow", multisync_delayed_slow);
-
- create_case(s, "multisync_conflict_ignore", multisync_conflict_ignore);
- create_case(s, "multisync_conflict_ignore2", multisync_conflict_ignore2);
-
- create_case(s, "multisync_easy_new_b", multisync_easy_new_b);
- create_case(s, "multisync_triple_del_b", multisync_triple_del_b);
- create_case(s, "multisync_conflict_hybrid_choose2_b", multisync_conflict_hybrid_choose2_b);
- create_case(s, "multisync_delayed_conflict_handler_b", multisync_delayed_conflict_handler_b);
- create_case(s, "multisync_delayed_slow_b", multisync_delayed_slow_b);
- create_case(s, "multisync_conflict_ignore_b", multisync_conflict_ignore_b);
- create_case(s, "multisync_conflict_ignore2_b", multisync_conflict_ignore2_b);
- create_case(s, "multisync_conflict_hybrid_duplicate_b", multisync_conflict_hybrid_duplicate_b);
- create_case(s, "multisync_multi_conflict_b", multisync_multi_conflict_b);
- create_case(s, "multisync_zero_changes_b", multisync_zero_changes_b);
-
- create_case(s, "multisync_conflict_hybrid_choose2_b2", multisync_conflict_hybrid_choose2_b2);
- create_case(s, "multisync_delayed_conflict_handler_b2", multisync_delayed_conflict_handler_b2);
- create_case(s, "multisync_conflict_ignore_b2", multisync_conflict_ignore_b2);
- create_case(s, "multisync_multi_conflict_b2", multisync_multi_conflict_b2);
+ TCase *tc_new;
+
+ CREATE_CASE(s, "multisync_easy_new", multisync_easy_new);
+ CREATE_CASE(s, "multisync_dual_new", multisync_dual_new);
+ CREATE_CASE(s, "multisync_triple_new", multisync_triple_new);
+ CREATE_CASE(s, "multisync_easy_mod", multisync_easy_mod);
+ CREATE_CASE(s, "multisync_dual_mod", multisync_dual_mod);
+ CREATE_CASE(s, "multisync_triple_mod", multisync_triple_mod);
+ CREATE_CASE(s, "multisync_easy_del", multisync_easy_del);
+ CREATE_CASE(s, "multisync_dual_del", multisync_dual_del);
+ CREATE_CASE(s, "multisync_triple_del", multisync_triple_del);
+
+ CREATE_CASE(s, "multisync_conflict_data_choose", multisync_conflict_data_choose);
+ CREATE_CASE(s, "multisync_conflict_data_choose2", multisync_conflict_data_choose2);
+ CREATE_CASE(s, "multisync_conflict_changetype_choose", multisync_conflict_changetype_choose);
+ CREATE_CASE(s, "multisync_conflict_changetype_choose2", multisync_conflict_changetype_choose2);
+ CREATE_CASE(s, "multisync_conflict_hybrid_choose", multisync_conflict_hybrid_choose);
+ CREATE_CASE(s, "multisync_conflict_hybrid_choose2", multisync_conflict_hybrid_choose2);
+ CREATE_CASE(s, "multisync_conflict_data_duplicate", multisync_conflict_data_duplicate);
+ CREATE_CASE(s, "multisync_conflict_data_duplicate2", multisync_conflict_data_duplicate2);
+ CREATE_CASE(s, "multisync_conflict_changetype_duplicate", multisync_conflict_changetype_duplicate);
+ CREATE_CASE(s, "multisync_conflict_changetype_duplicate2", multisync_conflict_changetype_duplicate2);
+ CREATE_CASE(s, "multisync_conflict_hybrid_duplicate", multisync_conflict_hybrid_duplicate);
+ CREATE_CASE(s, "multisync_multi_conflict", multisync_multi_conflict);
+
+ CREATE_CASE(s, "multisync_delayed_conflict_handler", multisync_delayed_conflict_handler);
+ CREATE_CASE(s, "multisync_delayed_slow", multisync_delayed_slow);
+
+ CREATE_CASE(s, "multisync_conflict_ignore", multisync_conflict_ignore);
+ CREATE_CASE(s, "multisync_conflict_ignore2", multisync_conflict_ignore2);
+
+ CREATE_CASE(s, "multisync_easy_new_b", multisync_easy_new_b);
+ CREATE_CASE(s, "multisync_triple_del_b", multisync_triple_del_b);
+ CREATE_CASE(s, "multisync_conflict_hybrid_choose2_b", multisync_conflict_hybrid_choose2_b);
+ CREATE_CASE(s, "multisync_delayed_conflict_handler_b", multisync_delayed_conflict_handler_b);
+ CREATE_CASE(s, "multisync_delayed_slow_b", multisync_delayed_slow_b);
+ CREATE_CASE(s, "multisync_conflict_ignore_b", multisync_conflict_ignore_b);
+ CREATE_CASE(s, "multisync_conflict_ignore2_b", multisync_conflict_ignore2_b);
+ CREATE_CASE(s, "multisync_conflict_hybrid_duplicate_b", multisync_conflict_hybrid_duplicate_b);
+ CREATE_CASE(s, "multisync_multi_conflict_b", multisync_multi_conflict_b);
+ CREATE_CASE(s, "multisync_zero_changes_b", multisync_zero_changes_b);
+
+ CREATE_CASE(s, "multisync_conflict_hybrid_choose2_b2", multisync_conflict_hybrid_choose2_b2);
+ CREATE_CASE(s, "multisync_delayed_conflict_handler_b2", multisync_delayed_conflict_handler_b2);
+ CREATE_CASE(s, "multisync_conflict_ignore_b2", multisync_conflict_ignore_b2);
+ CREATE_CASE(s, "multisync_multi_conflict_b2", multisync_multi_conflict_b2);
return s;
}
--- opensync-0.19.orig/tests/check_plugins.c
+++ opensync-0.19/tests/check_plugins.c
@@ -55,10 +55,11 @@
{
Suite *s = suite_create("Plugins");
//Suite *s2 = suite_create("Plugins");
+ TCase *tc_new;
- create_case(s, "plugin_create", plugin_create);
- create_case(s, "plugin_no_config", plugin_no_config);
- create_case(s, "plugin_call_custom", plugin_call_custom);
+ CREATE_CASE(s, "plugin_create", plugin_create);
+ CREATE_CASE(s, "plugin_no_config", plugin_no_config);
+ CREATE_CASE(s, "plugin_call_custom", plugin_call_custom);
return s;
}
--- opensync-0.19.orig/tests/check_sync.c
+++ opensync-0.19/tests/check_sync.c
@@ -648,22 +648,23 @@
{
Suite *s = suite_create("Sync");
//Suite *s2 = suite_create("Sync");
+ TCase *tc_new;
- create_case(s, "sync_setup", sync_setup);
- create_case(s, "sync_setup_init", sync_setup_init);
- create_case(s, "sync_init_error", sync_init_error);
- create_case(s, "sync_setup_connect", sync_setup_connect);
- create_case(s, "sync_easy_new", sync_easy_new);
- create_case(s, "sync_easy_new_del", sync_easy_new_del);
- create_case(s, "sync_easy_conflict", sync_easy_conflict);
- create_case(s, "sync_easy_new_mapping", sync_easy_new_mapping);
- create_case(s, "sync_easy_conflict_duplicate", sync_easy_conflict_duplicate);
- create_case(s, "sync_easy_dualdel", sync_easy_dualdel);
- create_case(s, "sync_conflict_duplicate2", sync_conflict_duplicate2);
- create_case(s, "sync_conflict_deldel", sync_conflict_deldel);
- create_case(s, "sync_moddel", sync_moddel);
- create_case(s, "sync_conflict_moddel", sync_conflict_moddel);
- create_case(s, "sync_conflict_duplicate", sync_conflict_duplicate);
+ CREATE_CASE(s, "sync_setup", sync_setup);
+ CREATE_CASE(s, "sync_setup_init", sync_setup_init);
+ CREATE_CASE(s, "sync_init_error", sync_init_error);
+ CREATE_CASE(s, "sync_setup_connect", sync_setup_connect);
+ CREATE_CASE(s, "sync_easy_new", sync_easy_new);
+ CREATE_CASE(s, "sync_easy_new_del", sync_easy_new_del);
+ CREATE_CASE(s, "sync_easy_conflict", sync_easy_conflict);
+ CREATE_CASE(s, "sync_easy_new_mapping", sync_easy_new_mapping);
+ CREATE_CASE(s, "sync_easy_conflict_duplicate", sync_easy_conflict_duplicate);
+ CREATE_CASE(s, "sync_easy_dualdel", sync_easy_dualdel);
+ CREATE_CASE(s, "sync_conflict_duplicate2", sync_conflict_duplicate2);
+ CREATE_CASE(s, "sync_conflict_deldel", sync_conflict_deldel);
+ CREATE_CASE(s, "sync_moddel", sync_moddel);
+ CREATE_CASE(s, "sync_conflict_moddel", sync_conflict_moddel);
+ CREATE_CASE(s, "sync_conflict_duplicate", sync_conflict_duplicate);
return s;
}
--- opensync-0.19.orig/tests/check_vcal.c
+++ opensync-0.19/tests/check_vcal.c
@@ -398,49 +398,50 @@
{
Suite *s = suite_create("VCal");
//Suite *s2 = suite_create("VCal");
+ TCase *tc_new;
- create_case(s, "conv_vevent_evolution2_1hour", conv_vevent_evolution2_1hour);
- create_case(s, "conv_vevent_evolution2_1hour_alarm", conv_vevent_evolution2_1hour_alarm);
- create_case(s, "conv_vevent_evolution2_1hour_alarm2", conv_vevent_evolution2_1hour_alarm2);
- create_case(s, "conv_vevent_evolution2_all_day", conv_vevent_evolution2_all_day);
- create_case(s, "conv_vevent_evolution2_all_day2", conv_vevent_evolution2_all_day2);
- create_case(s, "conv_vevent_evolution2_free_busy", conv_vevent_evolution2_free_busy);
- create_case(s, "conv_vevent_evolution2_full_special", conv_vevent_evolution2_full_special);
- create_case(s, "conv_vevent_evolution2_rec_every_year", conv_vevent_evolution2_rec_every_year);
- create_case(s, "conv_vevent_evolution2_rec_except", conv_vevent_evolution2_rec_except);
- create_case(s, "conv_vevent_evolution2_rec_for", conv_vevent_evolution2_rec_for);
- create_case(s, "conv_vevent_evolution2_rec_forever", conv_vevent_evolution2_rec_forever);
- create_case(s, "conv_vevent_evolution2_rec_until", conv_vevent_evolution2_rec_until);
- create_case(s, "conv_vevent_evolution2_rec_until2", conv_vevent_evolution2_rec_until2);
-
- create_case(s, "conv_vevent_kdepim_1hour_10", conv_vevent_kdepim_1hour_10);
- create_case(s, "conv_vevent_kdepim_1hour_20", conv_vevent_kdepim_1hour_20);
-
- create_case(s, "cmp_vevent_1hour_1", cmp_vevent_1hour_1);
- create_case(s, "cmp_vevent_1hour_2", cmp_vevent_1hour_2);
-
- create_case(s, "event_get_revision1", event_get_revision1);
- create_case(s, "event_get_revision2", event_get_revision2);
- create_case(s, "event_get_revision3", event_get_revision3);
- create_case(s, "event_no_revision", event_no_revision);
+ CREATE_CASE(s, "conv_vevent_evolution2_1hour", conv_vevent_evolution2_1hour);
+ CREATE_CASE(s, "conv_vevent_evolution2_1hour_alarm", conv_vevent_evolution2_1hour_alarm);
+ CREATE_CASE(s, "conv_vevent_evolution2_1hour_alarm2", conv_vevent_evolution2_1hour_alarm2);
+ CREATE_CASE(s, "conv_vevent_evolution2_all_day", conv_vevent_evolution2_all_day);
+ CREATE_CASE(s, "conv_vevent_evolution2_all_day2", conv_vevent_evolution2_all_day2);
+ CREATE_CASE(s, "conv_vevent_evolution2_free_busy", conv_vevent_evolution2_free_busy);
+ CREATE_CASE(s, "conv_vevent_evolution2_full_special", conv_vevent_evolution2_full_special);
+ CREATE_CASE(s, "conv_vevent_evolution2_rec_every_year", conv_vevent_evolution2_rec_every_year);
+ CREATE_CASE(s, "conv_vevent_evolution2_rec_except", conv_vevent_evolution2_rec_except);
+ CREATE_CASE(s, "conv_vevent_evolution2_rec_for", conv_vevent_evolution2_rec_for);
+ CREATE_CASE(s, "conv_vevent_evolution2_rec_forever", conv_vevent_evolution2_rec_forever);
+ CREATE_CASE(s, "conv_vevent_evolution2_rec_until", conv_vevent_evolution2_rec_until);
+ CREATE_CASE(s, "conv_vevent_evolution2_rec_until2", conv_vevent_evolution2_rec_until2);
+
+ CREATE_CASE(s, "conv_vevent_kdepim_1hour_10", conv_vevent_kdepim_1hour_10);
+ CREATE_CASE(s, "conv_vevent_kdepim_1hour_20", conv_vevent_kdepim_1hour_20);
+
+ CREATE_CASE(s, "cmp_vevent_1hour_1", cmp_vevent_1hour_1);
+ CREATE_CASE(s, "cmp_vevent_1hour_2", cmp_vevent_1hour_2);
+
+ CREATE_CASE(s, "event_get_revision1", event_get_revision1);
+ CREATE_CASE(s, "event_get_revision2", event_get_revision2);
+ CREATE_CASE(s, "event_get_revision3", event_get_revision3);
+ CREATE_CASE(s, "event_no_revision", event_no_revision);
- create_case(s, "conv_vtodo_evolution2_simple", conv_vtodo_evolution2_simple);
- create_case(s, "conv_vtodo_evolution2_full1", conv_vtodo_evolution2_full1);
- create_case(s, "conv_vtodo_evolution2_full2", conv_vtodo_evolution2_full2);
- create_case(s, "conv_vtodo_evolution2_full3", conv_vtodo_evolution2_full3);
- create_case(s, "conv_vtodo_evolution2_full4", conv_vtodo_evolution2_full4);
- create_case(s, "conv_vtodo_evolution2_full5", conv_vtodo_evolution2_full5);
- create_case(s, "conv_vtodo_evolution2_full6", conv_vtodo_evolution2_full6);
- create_case(s, "conv_vtodo_evolution2_full7", conv_vtodo_evolution2_full7);
-
- create_case(s, "todo_get_revision1", todo_get_revision1);
- create_case(s, "todo_get_revision2", todo_get_revision2);
- create_case(s, "todo_get_revision3", todo_get_revision3);
- create_case(s, "todo_no_revision", todo_no_revision);
- create_case(s, "conv_test_crash", conv_test_crash);
+ CREATE_CASE(s, "conv_vtodo_evolution2_simple", conv_vtodo_evolution2_simple);
+ CREATE_CASE(s, "conv_vtodo_evolution2_full1", conv_vtodo_evolution2_full1);
+ CREATE_CASE(s, "conv_vtodo_evolution2_full2", conv_vtodo_evolution2_full2);
+ CREATE_CASE(s, "conv_vtodo_evolution2_full3", conv_vtodo_evolution2_full3);
+ CREATE_CASE(s, "conv_vtodo_evolution2_full4", conv_vtodo_evolution2_full4);
+ CREATE_CASE(s, "conv_vtodo_evolution2_full5", conv_vtodo_evolution2_full5);
+ CREATE_CASE(s, "conv_vtodo_evolution2_full6", conv_vtodo_evolution2_full6);
+ CREATE_CASE(s, "conv_vtodo_evolution2_full7", conv_vtodo_evolution2_full7);
+
+ CREATE_CASE(s, "todo_get_revision1", todo_get_revision1);
+ CREATE_CASE(s, "todo_get_revision2", todo_get_revision2);
+ CREATE_CASE(s, "todo_get_revision3", todo_get_revision3);
+ CREATE_CASE(s, "todo_no_revision", todo_no_revision);
+ CREATE_CASE(s, "conv_test_crash", conv_test_crash);
--- opensync-0.19.orig/tests/check_vcard.c
+++ opensync-0.19/tests/check_vcard.c
@@ -391,45 +391,46 @@
{
Suite *s = suite_create("Vcard");
//Suite *s2 = suite_create("Vcard");
+ TCase *tc_new;
- create_case(s, "conv_vcard_evolution2_full1", conv_vcard_evolution2_full1);
- create_case(s, "conv_vcard_evolution2_full2", conv_vcard_evolution2_full2);
- create_case(s, "conv_vcard_evolution2_photo", conv_vcard_evolution2_photo);
- create_case(s, "conv_vcard_evolution2_multiline", conv_vcard_evolution2_multiline);
- create_case(s, "conv_vcard_evolution2_umlaute", conv_vcard_evolution2_umlaute);
- create_case(s, "conv_vcard_evolution2_special", conv_vcard_evolution2_special);
+ CREATE_CASE(s, "conv_vcard_evolution2_full1", conv_vcard_evolution2_full1);
+ CREATE_CASE(s, "conv_vcard_evolution2_full2", conv_vcard_evolution2_full2);
+ CREATE_CASE(s, "conv_vcard_evolution2_photo", conv_vcard_evolution2_photo);
+ CREATE_CASE(s, "conv_vcard_evolution2_multiline", conv_vcard_evolution2_multiline);
+ CREATE_CASE(s, "conv_vcard_evolution2_umlaute", conv_vcard_evolution2_umlaute);
+ CREATE_CASE(s, "conv_vcard_evolution2_special", conv_vcard_evolution2_special);
- create_case(s, "conv_vcard_kde_21_full1", conv_vcard_kde_21_full1);
- create_case(s, "conv_vcard_kde_30_full1", conv_vcard_kde_30_full1);
- create_case(s, "conv_vcard_kde_21_full2", conv_vcard_kde_21_full2);
- create_case(s, "conv_vcard_kde_30_full2", conv_vcard_kde_30_full2);
- create_case(s, "conv_vcard_kde_21_multiline", conv_vcard_kde_21_multiline);
- create_case(s, "conv_vcard_kde_30_multiline", conv_vcard_kde_30_multiline);
- create_case(s, "conv_vcard_kde_21_photo1", conv_vcard_kde_21_photo1);
- create_case(s, "conv_vcard_kde_30_photo1", conv_vcard_kde_30_photo1);
- create_case(s, "conv_vcard_kde_21_photo2", conv_vcard_kde_21_photo2);
- create_case(s, "conv_vcard_kde_30_photo2", conv_vcard_kde_30_photo2);
- create_case(s, "conv_vcard_kde_21_sound1", conv_vcard_kde_21_sound1);
- create_case(s, "conv_vcard_kde_30_sound1", conv_vcard_kde_30_sound1);
- create_case(s, "conv_vcard_kde_21_sound2", conv_vcard_kde_21_sound2);
- create_case(s, "conv_vcard_kde_30_sound2", conv_vcard_kde_30_sound2);
- create_case(s, "conv_vcard_kde_21_special", conv_vcard_kde_21_special);
- create_case(s, "conv_vcard_kde_30_special", conv_vcard_kde_30_special);
- create_case(s, "conv_vcard_kde_21_umlaute", conv_vcard_kde_21_umlaute);
- create_case(s, "conv_vcard_kde_30_umlaute", conv_vcard_kde_30_umlaute);
+ CREATE_CASE(s, "conv_vcard_kde_21_full1", conv_vcard_kde_21_full1);
+ CREATE_CASE(s, "conv_vcard_kde_30_full1", conv_vcard_kde_30_full1);
+ CREATE_CASE(s, "conv_vcard_kde_21_full2", conv_vcard_kde_21_full2);
+ CREATE_CASE(s, "conv_vcard_kde_30_full2", conv_vcard_kde_30_full2);
+ CREATE_CASE(s, "conv_vcard_kde_21_multiline", conv_vcard_kde_21_multiline);
+ CREATE_CASE(s, "conv_vcard_kde_30_multiline", conv_vcard_kde_30_multiline);
+ CREATE_CASE(s, "conv_vcard_kde_21_photo1", conv_vcard_kde_21_photo1);
+ CREATE_CASE(s, "conv_vcard_kde_30_photo1", conv_vcard_kde_30_photo1);
+ CREATE_CASE(s, "conv_vcard_kde_21_photo2", conv_vcard_kde_21_photo2);
+ CREATE_CASE(s, "conv_vcard_kde_30_photo2", conv_vcard_kde_30_photo2);
+ CREATE_CASE(s, "conv_vcard_kde_21_sound1", conv_vcard_kde_21_sound1);
+ CREATE_CASE(s, "conv_vcard_kde_30_sound1", conv_vcard_kde_30_sound1);
+ CREATE_CASE(s, "conv_vcard_kde_21_sound2", conv_vcard_kde_21_sound2);
+ CREATE_CASE(s, "conv_vcard_kde_30_sound2", conv_vcard_kde_30_sound2);
+ CREATE_CASE(s, "conv_vcard_kde_21_special", conv_vcard_kde_21_special);
+ CREATE_CASE(s, "conv_vcard_kde_30_special", conv_vcard_kde_30_special);
+ CREATE_CASE(s, "conv_vcard_kde_21_umlaute", conv_vcard_kde_21_umlaute);
+ CREATE_CASE(s, "conv_vcard_kde_30_umlaute", conv_vcard_kde_30_umlaute);
- create_case(s, "compare_vformat_mismatch1", compare_vformat_mismatch1);
- create_case(s, "compare_vformat_mismatch2", compare_vformat_mismatch2);
- create_case(s, "compare_vformat_similar1", compare_vformat_similar1);
- create_case(s, "compare_vformat_similar2", compare_vformat_similar2);
- create_case(s, "compare_vformat_same1", compare_vformat_same1);
- create_case(s, "compare_vformat_same2", compare_vformat_same2);
+ CREATE_CASE(s, "compare_vformat_mismatch1", compare_vformat_mismatch1);
+ CREATE_CASE(s, "compare_vformat_mismatch2", compare_vformat_mismatch2);
+ CREATE_CASE(s, "compare_vformat_similar1", compare_vformat_similar1);
+ CREATE_CASE(s, "compare_vformat_similar2", compare_vformat_similar2);
+ CREATE_CASE(s, "compare_vformat_same1", compare_vformat_same1);
+ CREATE_CASE(s, "compare_vformat_same2", compare_vformat_same2);
- create_case(s, "get_revision1", get_revision1);
- create_case(s, "get_revision2", get_revision2);
- create_case(s, "get_revision3", get_revision3);
- create_case(s, "get_revision4", get_revision4);
- create_case(s, "get_no_revision", get_no_revision);
+ CREATE_CASE(s, "get_revision1", get_revision1);
+ CREATE_CASE(s, "get_revision2", get_revision2);
+ CREATE_CASE(s, "get_revision3", get_revision3);
+ CREATE_CASE(s, "get_revision4", get_revision4);
+ CREATE_CASE(s, "get_no_revision", get_no_revision);
return s;
}
--- opensync-0.19.orig/tests/check_vnote.c
+++ opensync-0.19/tests/check_vnote.c
@@ -247,22 +247,23 @@
{
Suite *s = suite_create("VNote");
//Suite *s2 = suite_create("VNote");
+ TCase *tc_new;
- create_case(s, "conv_vnote1", conv_vnote1);
- create_case(s, "conv_vnote2", conv_vnote2);
- create_case(s, "conv_vnote3", conv_vnote3);
- create_case(s, "conv_vnote_minimal", conv_vnote_minimal);
+ CREATE_CASE(s, "conv_vnote1", conv_vnote1);
+ CREATE_CASE(s, "conv_vnote2", conv_vnote2);
+ CREATE_CASE(s, "conv_vnote3", conv_vnote3);
+ CREATE_CASE(s, "conv_vnote_minimal", conv_vnote_minimal);
- create_case(s, "get_revision1", get_revision1);
- create_case(s, "get_revision2", get_revision2);
- create_case(s, "get_revision3", get_revision3);
- create_case(s, "get_revision4", get_revision4);
+ CREATE_CASE(s, "get_revision1", get_revision1);
+ CREATE_CASE(s, "get_revision2", get_revision2);
+ CREATE_CASE(s, "get_revision3", get_revision3);
+ CREATE_CASE(s, "get_revision4", get_revision4);
- create_case(s, "compare_vnote_same1", compare_vnote_same1);
- create_case(s, "compare_vnote_same2", compare_vnote_same2);
- create_case(s, "compare_vnote_similar1", compare_vnote_similar1);
- create_case(s, "compare_vnote_mismatch1", compare_vnote_mismatch1);
- create_case(s, "compare_vnote_mismatch2", compare_vnote_mismatch2);
+ CREATE_CASE(s, "compare_vnote_same1", compare_vnote_same1);
+ CREATE_CASE(s, "compare_vnote_same2", compare_vnote_same2);
+ CREATE_CASE(s, "compare_vnote_similar1", compare_vnote_similar1);
+ CREATE_CASE(s, "compare_vnote_mismatch1", compare_vnote_mismatch1);
+ CREATE_CASE(s, "compare_vnote_mismatch2", compare_vnote_mismatch2);
return s;
}
--- opensync-0.19.orig/tests/support.c
+++ opensync-0.19/tests/support.c
@@ -369,13 +369,14 @@
return osengine_sync_and_block(engine, error);
}
-void create_case(Suite *s, const char *name, void (*function)(void))
+/*
+void create_case(Suite *s, const char *name, tcase_test_function function)
{
TCase *tc_new = tcase_create(name);
tcase_set_timeout(tc_new, 0);
suite_add_tcase (s, tc_new);
tcase_add_test(tc_new, function);
-}
+}*/
OSyncMappingTable *mappingtable_load(OSyncGroup *group, int num_mappings, int num_unmapped)
{
--- opensync-0.19.orig/tests/support.h
+++ opensync-0.19/tests/support.h
@@ -50,7 +50,11 @@
OSyncEngine *init_engine(OSyncGroup *group);
void conflict_handler_random(OSyncEngine *engine, OSyncMapping *mapping, void *user_data);
osync_bool synchronize_once(OSyncEngine *engine, OSyncError **error);
-void create_case(Suite *s, const char *name, void (*function)(void));
+#define CREATE_CASE(s, n, f) \
+ tc_new = tcase_create((n)); \
+ tcase_set_timeout(tc_new, 0); \
+ suite_add_tcase ((s), tc_new); \
+ tcase_add_test (tc_new, (f));
OSyncMappingTable *mappingtable_load(OSyncGroup *group, int num_mappings, int num_unmapped);
void mappingtable_close(OSyncMappingTable *maptable);
pgpcyKjZmRd2x.pgp
Description: PGP signature
