ldb: Prepare ldb tests for subunit output

These tests now print subunit rather than the default output
as this is what the Samba selftest system needs.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/lib/ldb/tests/ldb_filter_attrs_in_place_test.c b/lib/ldb/tests/ldb_filter_attrs_in_place_test.c
index bf370164191544af2d5766eb304b0e8b41fe136e..d3da29f4e9f36f92dbc2e775a2b04b33bc3e3797 100644 (file)
--- a/lib/ldb/tests/ldb_filter_attrs_in_place_test.c
+++ b/lib/ldb/tests/ldb_filter_attrs_in_place_test.c
@@ -936,5 +936,7 @@ int main(int argc, const char **argv)
                        teardown),
        };
 
+       cmocka_set_message_output(CM_OUTPUT_SUBUNIT);
+
        return cmocka_run_group_tests(tests, NULL, NULL);
 }

diff --git a/lib/ldb/tests/ldb_filter_attrs_test.c b/lib/ldb/tests/ldb_filter_attrs_test.c
index 291350afa6ede0d499d305805c2f2573142569a3..da3acd3fb5eaae3eeb5bf227594d4d2ee1f2b81e 100644 (file)
--- a/lib/ldb/tests/ldb_filter_attrs_test.c
+++ b/lib/ldb/tests/ldb_filter_attrs_test.c
@@ -985,5 +985,7 @@ int main(int argc, const char **argv)
                        teardown),
        };
 
+       cmocka_set_message_output(CM_OUTPUT_SUBUNIT);
+
        return cmocka_run_group_tests(tests, NULL, NULL);
 }

diff --git a/lib/ldb/tests/ldb_key_value_sub_txn_test.c b/lib/ldb/tests/ldb_key_value_sub_txn_test.c
index 1eafd2d79e94533728389dd7b795487d40cfd2dc..0b7c0240ec973f9bd3fe4e99a6f4f2de308f5ecf 100644 (file)
--- a/lib/ldb/tests/ldb_key_value_sub_txn_test.c
+++ b/lib/ldb/tests/ldb_key_value_sub_txn_test.c
@@ -840,5 +840,7 @@ int main(int argc, const char **argv)
                        teardown),
        };
 
+       cmocka_set_message_output(CM_OUTPUT_SUBUNIT);
+
        return cmocka_run_group_tests(tests, NULL, NULL);
 }

diff --git a/lib/ldb/tests/ldb_key_value_test.c b/lib/ldb/tests/ldb_key_value_test.c
index 97f717b5ee077083d4ba501ca348d974f0c70d18..7bbfc7925bf631bf6cb838dde33c0f3113cb3850 100644 (file)
--- a/lib/ldb/tests/ldb_key_value_test.c
+++ b/lib/ldb/tests/ldb_key_value_test.c
@@ -384,5 +384,7 @@ int main(int argc, const char **argv)
                        teardown),
        };
 
+       cmocka_set_message_output(CM_OUTPUT_SUBUNIT);
+
        return cmocka_run_group_tests(tests, NULL, NULL);
 }

diff --git a/lib/ldb/tests/ldb_kv_ops_test.c b/lib/ldb/tests/ldb_kv_ops_test.c
index b84ed0c146f9ca39364b695c2e5a6351a141e92a..6badff98cfb6f95b0af32a5b4ced31878ee620f6 100644 (file)
--- a/lib/ldb/tests/ldb_kv_ops_test.c
+++ b/lib/ldb/tests/ldb_kv_ops_test.c
@@ -1815,5 +1815,7 @@ int main(int argc, const char **argv)
                        teardown),
        };
 
+       cmocka_set_message_output(CM_OUTPUT_SUBUNIT);
+
        return cmocka_run_group_tests(tests, NULL, NULL);
 }

diff --git a/lib/ldb/tests/ldb_lmdb_free_list_test.c b/lib/ldb/tests/ldb_lmdb_free_list_test.c
index 246fdc71e6b713291f327f39c519372fcb880332..99505ce7b5577d9651dac50548e35db85255f25b 100644 (file)
--- a/lib/ldb/tests/ldb_lmdb_free_list_test.c
+++ b/lib/ldb/tests/ldb_lmdb_free_list_test.c
@@ -657,5 +657,7 @@ int main(int argc, const char **argv)
                test_free_list_stale_reader, setup, teardown),
        };
 
+       cmocka_set_message_output(CM_OUTPUT_SUBUNIT);
+
        return cmocka_run_group_tests(tests, NULL, NULL);
 }

diff --git a/lib/ldb/tests/ldb_lmdb_test.c b/lib/ldb/tests/ldb_lmdb_test.c
index 798a1916281f05c4209fbbacd4258c2b7a0234be..5fa4fbb558736094b82468f616a3e557ff2c79ae 100644 (file)
--- a/lib/ldb/tests/ldb_lmdb_test.c
+++ b/lib/ldb/tests/ldb_lmdb_test.c
@@ -586,5 +586,7 @@ int main(int argc, const char **argv)
                        ldbtest_teardown),
        };
 
+       cmocka_set_message_output(CM_OUTPUT_SUBUNIT);
+
        return cmocka_run_group_tests(tests, NULL, NULL);
 }

diff --git a/lib/ldb/tests/ldb_match_test.c b/lib/ldb/tests/ldb_match_test.c
index 1bb56d072d916eb84e2f9dfd4307f3b3da903819..ad00457aa65d09d29aef2c63805334f301c70ed4 100644 (file)
--- a/lib/ldb/tests/ldb_match_test.c
+++ b/lib/ldb/tests/ldb_match_test.c
@@ -309,5 +309,7 @@ int main(int argc, const char **argv)
                        teardown),
        };
 
+       cmocka_set_message_output(CM_OUTPUT_SUBUNIT);
+
        return cmocka_run_group_tests(tests, NULL, NULL);
 }

diff --git a/lib/ldb/tests/ldb_mod_op_test.c b/lib/ldb/tests/ldb_mod_op_test.c
index f620fc1357bcd92066a372ad2b9a15900bc402c4..be4f458d27f5e6ae6be15eaa9c4e4a1ecfbd7bd6 100644 (file)
--- a/lib/ldb/tests/ldb_mod_op_test.c
+++ b/lib/ldb/tests/ldb_mod_op_test.c
@@ -4720,5 +4720,7 @@ int main(int argc, const char **argv)
                cmocka_set_test_filter(argv[1]);
        }
 
+       cmocka_set_message_output(CM_OUTPUT_SUBUNIT);
+
        return cmocka_run_group_tests(tests, NULL, NULL);
 }

diff --git a/lib/ldb/tests/ldb_msg.c b/lib/ldb/tests/ldb_msg.c
index 31786a9a31885c46d9909249f4f0ebdea6ae6815..207c01a3051254d941360522630306a796a754cd 100644 (file)
--- a/lib/ldb/tests/ldb_msg.c
+++ b/lib/ldb/tests/ldb_msg.c
@@ -376,5 +376,7 @@ int main(int argc, const char **argv)
                        ldb_msg_teardown),
        };
 
+       cmocka_set_message_output(CM_OUTPUT_SUBUNIT);
+
        return cmocka_run_group_tests(tests, NULL, NULL);
 }

diff --git a/lib/ldb/tests/ldb_no_lmdb_test.c b/lib/ldb/tests/ldb_no_lmdb_test.c
index be23d7440045bf4e5c2190d81d82b460e0255cb8..4fca6634d598f09e38414d3a05f75d077c5475f5 100644 (file)
--- a/lib/ldb/tests/ldb_no_lmdb_test.c
+++ b/lib/ldb/tests/ldb_no_lmdb_test.c
@@ -155,5 +155,7 @@ int main(int argc, const char **argv)
                        ldbtest_teardown),
        };
 
+       cmocka_set_message_output(CM_OUTPUT_SUBUNIT);
+
        return cmocka_run_group_tests(tests, NULL, NULL);
 }

diff --git a/lib/ldb/tests/ldb_tdb_test.c b/lib/ldb/tests/ldb_tdb_test.c
index 64e5983e2be7d4949a5966df106f2bfa11933f2e..c7968e50e2e085a941c53094d21a5646ecbf41e2 100644 (file)
--- a/lib/ldb/tests/ldb_tdb_test.c
+++ b/lib/ldb/tests/ldb_tdb_test.c
@@ -385,5 +385,7 @@ int main(int argc, const char **argv)
                        ldbtest_teardown),
        };
 
+       cmocka_set_message_output(CM_OUTPUT_SUBUNIT);
+
        return cmocka_run_group_tests(tests, NULL, NULL);
 }

diff --git a/lib/ldb/tests/lldb_ldap.c b/lib/ldb/tests/lldb_ldap.c
index eea9f22f6b9e811f5e00a2bf25be706919643b73..c5404f189b381ef6c7160de1c2a6c0b5bb35d88a 100644 (file)
--- a/lib/ldb/tests/lldb_ldap.c
+++ b/lib/ldb/tests/lldb_ldap.c
@@ -101,5 +101,7 @@ int main(int argc, const char **argv)
                                                lldb_msg_teardown),
        };
 
+       cmocka_set_message_output(CM_OUTPUT_SUBUNIT);
+
        return cmocka_run_group_tests(tests, NULL, NULL);
 }

diff --git a/lib/ldb/tests/test_ldb_dn.c b/lib/ldb/tests/test_ldb_dn.c
index 6bf621a1d450c925b9aefea8fd4fed75da897aa4..61c0e8253907952a3a5775e84b5a6c8a09c43692 100644 (file)
--- a/lib/ldb/tests/test_ldb_dn.c
+++ b/lib/ldb/tests/test_ldb_dn.c
@@ -208,7 +208,7 @@ static void test_ldb_dn_explode(void **state)
 
                /* comp nums are set by explode */
                result = ldb_dn_validate(dn);
-               print_error("test %zu «%s»: res %i lin «%s» ext «%s»\n",
+               print_error("string under test (%zu) «%s»: res %i lin «%s» ext «%s»\n",
                            i, tests[i].strdn, result, linear, ext_linear);
                
                assert_true(result == tests[i].explode_result);
@@ -228,5 +228,7 @@ int main(void) {
                cmocka_unit_test(test_ldb_dn_explode),
        };
 
+       cmocka_set_message_output(CM_OUTPUT_SUBUNIT);
+
        return cmocka_run_group_tests(tests, NULL, NULL);
 }

diff --git a/lib/ldb/tests/test_ldb_qsort.c b/lib/ldb/tests/test_ldb_qsort.c
index 663cf0e7564db81062a12d90318f8469e4ae8adb..baaad7afe927bdae29606573a988c7b3968e8fb8 100644 (file)
--- a/lib/ldb/tests/test_ldb_qsort.c
+++ b/lib/ldb/tests/test_ldb_qsort.c
@@ -61,5 +61,6 @@ int main(void) {
                cmocka_unit_test(test_ldb_qsort),
        };
 
+       cmocka_set_message_output(CM_OUTPUT_SUBUNIT);
        return cmocka_run_group_tests(tests, NULL, NULL);
 }