X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3507930c130404d05f982cf9fe960fb95f7eb4b..b2a2674e284ac6996b531ff7c8d45a065751b2fb:/src/simgrid_units_main.c diff --git a/src/simgrid_units_main.c b/src/simgrid_units_main.c index 7e5de8d0f4..60d81b8b8f 100644 --- a/src/simgrid_units_main.c +++ b/src/simgrid_units_main.c @@ -20,6 +20,19 @@ extern xbt_test_unit_t _xbt_current_unit; void test_cleanup(void); /* SGU: END FILE */ + /* SGU: BEGIN FILE xbt/xbt_str.c */ + void test_split_quoted(void); + void test_split_str(void); + /* SGU: END FILE */ + + /* SGU: BEGIN FILE xbt/xbt_strbuff.c */ + void test_strbuff_substitute(void); + /* SGU: END FILE */ + + /* SGU: BEGIN FILE xbt/xbt_sha.c */ + void test_crypto_sha(void); + /* SGU: END FILE */ + /* SGU: BEGIN FILE xbt/dynar.c */ void test_dynar_int(void); void test_dynar_double(void); @@ -46,21 +59,12 @@ extern xbt_test_unit_t _xbt_current_unit; void test_swag_basic(void); /* SGU: END FILE */ - /* SGU: BEGIN FILE xbt/xbt_str.c */ - void test_split_quoted(void); - void test_split_str(void); - /* SGU: END FILE */ - /* SGU: BEGIN FILE xbt/config.c */ void test_config_memuse(void); void test_config_validation(void); void test_config_use(void); /* SGU: END FILE */ - /* SGU: BEGIN FILE ./xbt/cunit.c */ - void test_expected_failure(void); - /* SGU: END FILE */ - /*******************************/ /* GENERATED FILE, DO NOT EDIT */ @@ -71,6 +75,8 @@ int main(int argc, char *argv[]) { char selection[1024]; int i; + int res; + /* SGU: BEGIN SUITES DECLARATION */ /* SGU: BEGIN FILE xbt/cunit.c */ suite = xbt_test_suite_by_name("cunit","Testsuite mechanism autotest"); @@ -85,6 +91,22 @@ int main(int argc, char *argv[]) { xbt_test_suite_push(suite, "cleanup", test_cleanup, "cleanup handling"); /* SGU: END FILE */ + /* SGU: BEGIN FILE xbt/xbt_str.c */ + suite = xbt_test_suite_by_name("xbt_str","String Handling"); + xbt_test_suite_push(suite, "xbt_str_split_quoted", test_split_quoted, "test the function xbt_str_split_quoted"); + xbt_test_suite_push(suite, "xbt_str_split_str", test_split_str, "test the function xbt_str_split_str"); + /* SGU: END FILE */ + + /* SGU: BEGIN FILE xbt/xbt_strbuff.c */ + suite = xbt_test_suite_by_name("xbt_strbuff","String Buffers"); + xbt_test_suite_push(suite, "xbt_strbuff_substitute", test_strbuff_substitute, "test the function xbt_strbuff_substitute"); + /* SGU: END FILE */ + + /* SGU: BEGIN FILE xbt/xbt_sha.c */ + suite = xbt_test_suite_by_name("hash","Various hash functions"); + xbt_test_suite_push(suite, "sha", test_crypto_sha, "Test of the sha algorithm"); + /* SGU: END FILE */ + /* SGU: BEGIN FILE xbt/dynar.c */ suite = xbt_test_suite_by_name("dynar","Dynar data container"); xbt_test_suite_push(suite, "int", test_dynar_int, "Dynars of integers"); @@ -115,12 +137,6 @@ int main(int argc, char *argv[]) { xbt_test_suite_push(suite, "basic", test_swag_basic, "Basic usage"); /* SGU: END FILE */ - /* SGU: BEGIN FILE xbt/xbt_str.c */ - suite = xbt_test_suite_by_name("xbt_str","String Handling"); - xbt_test_suite_push(suite, "xbt_str_split_quoted", test_split_quoted, "test the function xbt_str_split_quoted"); - xbt_test_suite_push(suite, "xbt_str_split_str", test_split_str, "test the function xbt_str_split_str"); - /* SGU: END FILE */ - /* SGU: BEGIN FILE xbt/config.c */ suite = xbt_test_suite_by_name("config","Configuration support"); xbt_test_suite_push(suite, "memuse", test_config_memuse, "Alloc and free a config set"); @@ -128,11 +144,6 @@ int main(int argc, char *argv[]) { xbt_test_suite_push(suite, "use", test_config_use, "Data retrieving tests"); /* SGU: END FILE */ - /* SGU: BEGIN FILE ./xbt/cunit.c */ - suite = xbt_test_suite_by_name("cunit","Testsuite mechanism autotest"); - xbt_test_suite_push(suite, "expect", test_expected_failure, "expected failures"); - /* SGU: END FILE */ - /* SGU: END SUITES DECLARATION */ xbt_init(&argc,argv); @@ -180,7 +191,10 @@ int main(int argc, char *argv[]) { } /* Got all my tests to do */ - return xbt_test_run(selection); + res = xbt_test_run(selection); + xbt_test_exit(); + xbt_exit(); + return res; } /*******************************/ /* GENERATED FILE, DO NOT EDIT */