From: Michael Tremer Date: Wed, 1 Nov 2023 14:23:39 +0000 (+0000) Subject: tests: Introduce flags X-Git-Tag: 0.9.30~1346 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c296431ff550b29b219d283da4c68ad8296e2b9c;p=pakfire.git tests: Introduce flags Signed-off-by: Michael Tremer --- diff --git a/tests/libpakfire/arch.c b/tests/libpakfire/arch.c index 83f964a15..bd2cfaf15 100644 --- a/tests/libpakfire/arch.c +++ b/tests/libpakfire/arch.c @@ -78,9 +78,9 @@ FAIL: } int main(int argc, const char* argv[]) { - testsuite_add_test(test_native); - testsuite_add_test(test_supported); - testsuite_add_test(test_machine); + testsuite_add_test(test_native, 0); + testsuite_add_test(test_supported, 0); + testsuite_add_test(test_machine, 0); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/archive.c b/tests/libpakfire/archive.c index cedaf4978..32f6d7f80 100644 --- a/tests/libpakfire/archive.c +++ b/tests/libpakfire/archive.c @@ -244,13 +244,13 @@ FAIL: } int main(int argc, const char* argv[]) { - testsuite_add_test(test_open); - testsuite_add_test(test_open_directory); - testsuite_add_test(test_read); - testsuite_add_test(test_copy); - testsuite_add_test(test_filelist); - testsuite_add_test(test_extract); - testsuite_add_test(test_import); + testsuite_add_test(test_open, 0); + testsuite_add_test(test_open_directory, 0); + testsuite_add_test(test_read, 0); + testsuite_add_test(test_copy, 0); + testsuite_add_test(test_filelist, 0); + testsuite_add_test(test_extract, 0); + testsuite_add_test(test_import, 0); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/build.c b/tests/libpakfire/build.c index eebfeb718..a310e1b6e 100644 --- a/tests/libpakfire/build.c +++ b/tests/libpakfire/build.c @@ -58,8 +58,8 @@ FAIL: } int main(int argc, const char* argv[]) { - testsuite_add_test(test_create_and_free); - testsuite_add_test(test_create_with_invalid_ids); + testsuite_add_test(test_create_and_free, 0); + testsuite_add_test(test_create_with_invalid_ids, 0); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/cgroup.c b/tests/libpakfire/cgroup.c index d48b4f475..a73e53ce3 100644 --- a/tests/libpakfire/cgroup.c +++ b/tests/libpakfire/cgroup.c @@ -101,8 +101,8 @@ FAIL: } int main(int argc, const char* argv[]) { - testsuite_add_test(test_create_and_destroy); - testsuite_add_test(test_stats); + testsuite_add_test(test_create_and_destroy, 0); + testsuite_add_test(test_stats, 0); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/compress.c b/tests/libpakfire/compress.c index 3504628d1..7823e5860 100644 --- a/tests/libpakfire/compress.c +++ b/tests/libpakfire/compress.c @@ -121,14 +121,14 @@ FAIL: int main(int argc, const char* argv[]) { // XZ - testsuite_add_test(test_xzfopen_read); - testsuite_add_test(test_xzfopen_write); + testsuite_add_test(test_xzfopen_read, 0); + testsuite_add_test(test_xzfopen_write, 0); // ZSTD - testsuite_add_test(test_zstdfopen_read); - testsuite_add_test(test_zstdfopen_write); + testsuite_add_test(test_zstdfopen_read, 0); + testsuite_add_test(test_zstdfopen_write, 0); - testsuite_add_test(test_xfopen); + testsuite_add_test(test_xfopen, 0); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/config.c b/tests/libpakfire/config.c index de2493e25..baa6e5723 100644 --- a/tests/libpakfire/config.c +++ b/tests/libpakfire/config.c @@ -188,9 +188,9 @@ FAIL: } int main(int argc, const char* argv[]) { - testsuite_add_test(test_get_and_set); - testsuite_add_test(test_parse); - testsuite_add_test(test_parse_multiline); + testsuite_add_test(test_get_and_set, 0); + testsuite_add_test(test_parse, 0); + testsuite_add_test(test_parse_multiline, 0); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/db.c b/tests/libpakfire/db.c index 80095f509..d2b1e4056 100644 --- a/tests/libpakfire/db.c +++ b/tests/libpakfire/db.c @@ -132,10 +132,10 @@ FAIL: } int main(int argc, const char* argv[]) { - testsuite_add_test(test_open_ro); - testsuite_add_test(test_open_rw); - testsuite_add_test(test_check); - testsuite_add_test(test_add_package); + testsuite_add_test(test_open_ro, 0); + testsuite_add_test(test_open_rw, 0); + testsuite_add_test(test_check, 0); + testsuite_add_test(test_add_package, 0); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/dependencies.c b/tests/libpakfire/dependencies.c index cad448ba5..fcbf80db5 100644 --- a/tests/libpakfire/dependencies.c +++ b/tests/libpakfire/dependencies.c @@ -209,8 +209,8 @@ FAIL: } int main(int argc, const char* argv[]) { - testsuite_add_test(test_dependencies); - testsuite_add_test(test_dep_match); + testsuite_add_test(test_dependencies, 0); + testsuite_add_test(test_dep_match, 0); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/digest.c b/tests/libpakfire/digest.c index 1652d9207..050b268c0 100644 --- a/tests/libpakfire/digest.c +++ b/tests/libpakfire/digest.c @@ -105,9 +105,9 @@ FAIL: } int main(int argc, const char* argv[]) { - testsuite_add_test(test_init); - testsuite_add_test(test_random); - testsuite_add_test(test_get_by_name); + testsuite_add_test(test_init, 0); + testsuite_add_test(test_random, 0); + testsuite_add_test(test_get_by_name, 0); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/downloader.c b/tests/libpakfire/downloader.c index db14fe424..cf9c58591 100644 --- a/tests/libpakfire/downloader.c +++ b/tests/libpakfire/downloader.c @@ -211,14 +211,14 @@ FAIL: int main(int argc, const char* argv[]) { #if 0 - testsuite_add_test(test_simple); - testsuite_add_test(test_retrieve_with_pending_transfers); - testsuite_add_test(test_retrieve_with_mirrors); + testsuite_add_test(test_create, 0); + testsuite_add_test(test_retrieve_with_pending_transfers, 0); + testsuite_add_test(test_retrieve_with_mirrors, 0); #ifdef ENABLE_ONLINE_TESTS - testsuite_add_test(test_retrieve_online); - testsuite_add_test(test_retrieve_online_with_digest); - testsuite_add_test(test_retrieve_online_with_incorrect_digest); + testsuite_add_test(test_retrieve_online, 0); + testsuite_add_test(test_retrieve_online_with_digest, 0); + testsuite_add_test(test_retrieve_online_with_incorrect_digest, 0); #endif /* ENABLE_ONLINE_TESTS */ #endif diff --git a/tests/libpakfire/file.c b/tests/libpakfire/file.c index c3f7ba1bf..f26432bb9 100644 --- a/tests/libpakfire/file.c +++ b/tests/libpakfire/file.c @@ -111,10 +111,10 @@ FAIL: int main(int argc, const char* argv[]) { - testsuite_add_test(test_create); - testsuite_add_test(test_create_invalid); + testsuite_add_test(test_create, 0); + testsuite_add_test(test_create_invalid, 0); - testsuite_add_test(test_create_filelist); + testsuite_add_test(test_create_filelist, 0); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/jail.c b/tests/libpakfire/jail.c index 4f499ec47..40b9bd8ef 100644 --- a/tests/libpakfire/jail.c +++ b/tests/libpakfire/jail.c @@ -453,20 +453,20 @@ FAIL: } int main(int argc, const char* argv[]) { - testsuite_add_test(test_create); - testsuite_add_test(test_exit_code); - testsuite_add_test(test_segv); - testsuite_add_test(test_env); - testsuite_add_test(test_exec); - testsuite_add_test(test_launch_into_cgroup); - testsuite_add_test(test_nice); - testsuite_add_test(test_memory_limit); - testsuite_add_test(test_pid_limit); - testsuite_add_test(test_file_ownership); - testsuite_add_test(test_bind); - testsuite_add_test(test_communicate); - testsuite_add_test(test_send_signal); - testsuite_add_test(test_timeout); + testsuite_add_test(test_create, 0); + testsuite_add_test(test_exit_code, 0); + testsuite_add_test(test_segv, 0); + testsuite_add_test(test_env, 0); + testsuite_add_test(test_exec, 0); + testsuite_add_test(test_launch_into_cgroup, 0); + testsuite_add_test(test_nice, 0); + testsuite_add_test(test_memory_limit, 0); + testsuite_add_test(test_pid_limit, 0); + testsuite_add_test(test_file_ownership, 0); + testsuite_add_test(test_bind, 0); + testsuite_add_test(test_communicate, 0); + testsuite_add_test(test_send_signal, 0); + testsuite_add_test(test_timeout, 0); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/key.c b/tests/libpakfire/key.c index d0f5f30e8..b3079cf18 100644 --- a/tests/libpakfire/key.c +++ b/tests/libpakfire/key.c @@ -152,10 +152,10 @@ FAIL: } int main(int argc, const char* argv[]) { - testsuite_add_test(test_generate); - testsuite_add_test(test_sign_and_verify); - testsuite_add_test(test_import_public); - testsuite_add_test(test_import_secret); + testsuite_add_test(test_generate, 0); + testsuite_add_test(test_sign_and_verify, 0); + testsuite_add_test(test_import_public, 0); + testsuite_add_test(test_import_secret, 0); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/main.c b/tests/libpakfire/main.c index d99fee1f1..ea5a9657c 100644 --- a/tests/libpakfire/main.c +++ b/tests/libpakfire/main.c @@ -39,8 +39,8 @@ FAIL: } int main(int argc, const char* argv[]) { - testsuite_add_test(test_init); - testsuite_add_test(test_path); + testsuite_add_test(test_init, 0); + testsuite_add_test(test_path, 0); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/makefile.c b/tests/libpakfire/makefile.c index 36564f3fb..99d433c65 100644 --- a/tests/libpakfire/makefile.c +++ b/tests/libpakfire/makefile.c @@ -266,10 +266,10 @@ FAIL: } int main(int argc, const char* argv[]) { - testsuite_add_test(test_macros); - testsuite_add_test(test_parse); - testsuite_add_test(test_packages); - testsuite_add_test(test_dist_dummy); + testsuite_add_test(test_macros, 0); + testsuite_add_test(test_parse, 0); + testsuite_add_test(test_packages, 0); + testsuite_add_test(test_dist_dummy, 0); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/os.c b/tests/libpakfire/os.c index 3d1aa15ec..af770bf3f 100644 --- a/tests/libpakfire/os.c +++ b/tests/libpakfire/os.c @@ -118,11 +118,11 @@ FAIL: } int main(int argc, const char* argv[]) { - testsuite_add_test(test_cpuinfo); - testsuite_add_test(test_cpustat); - testsuite_add_test(test_loadavg); - testsuite_add_test(test_meminfo); - testsuite_add_test(test_distro); + testsuite_add_test(test_cpuinfo, 0); + testsuite_add_test(test_cpustat, 0); + testsuite_add_test(test_loadavg, 0); + testsuite_add_test(test_meminfo, 0); + testsuite_add_test(test_distro, 0); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/package.c b/tests/libpakfire/package.c index ca345c49b..10d13a92e 100644 --- a/tests/libpakfire/package.c +++ b/tests/libpakfire/package.c @@ -310,11 +310,11 @@ FAIL: } int main(int argc, const char* argv[]) { - testsuite_add_test(test_create); - testsuite_add_test(test_invalid_inputs); - testsuite_add_test(test_uuid); - testsuite_add_test(test_deps); - testsuite_add_test(test_filelist); + testsuite_add_test(test_create, 0); + testsuite_add_test(test_invalid_inputs, 0); + testsuite_add_test(test_uuid, 0); + testsuite_add_test(test_deps, 0); + testsuite_add_test(test_filelist, 0); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/packager.c b/tests/libpakfire/packager.c index 0ffa8bbc7..60cfa8e93 100644 --- a/tests/libpakfire/packager.c +++ b/tests/libpakfire/packager.c @@ -151,8 +151,8 @@ FAIL: } int main(int argc, const char* argv[]) { - testsuite_add_test(test_create); - testsuite_add_test(test_compare_metadata); + testsuite_add_test(test_create, 0); + testsuite_add_test(test_compare_metadata, 0); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/parser.c b/tests/libpakfire/parser.c index 179aae877..f19f072be 100644 --- a/tests/libpakfire/parser.c +++ b/tests/libpakfire/parser.c @@ -225,11 +225,11 @@ FAIL: #endif int main(int argc, const char* argv[]) { - testsuite_add_test(test_parser); - testsuite_add_test(test_parser_files); - testsuite_add_test(test_append); + testsuite_add_test(test_parser, 0); + testsuite_add_test(test_parser_files, 0); + testsuite_add_test(test_append, 0); #if 0 - testsuite_add_test(test_parser_command); + testsuite_add_test(test_parser_command, 0); #endif return testsuite_run(argc, argv); diff --git a/tests/libpakfire/path.c b/tests/libpakfire/path.c index 6014fd0cc..ffc0d51d2 100644 --- a/tests/libpakfire/path.c +++ b/tests/libpakfire/path.c @@ -119,11 +119,11 @@ FAIL: } int main(int argc, const char* argv[]) { - testsuite_add_test(test_path_normalize); - testsuite_add_test(test_path_append); - testsuite_add_test(test_path_merge); - testsuite_add_test(test_path_basename); - testsuite_add_test(test_path_dirname); + testsuite_add_test(test_path_normalize, 0); + testsuite_add_test(test_path_append, 0); + testsuite_add_test(test_path_merge, 0); + testsuite_add_test(test_path_basename, 0); + testsuite_add_test(test_path_dirname, 0); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/repo.c b/tests/libpakfire/repo.c index 1b6928076..b608efe75 100644 --- a/tests/libpakfire/repo.c +++ b/tests/libpakfire/repo.c @@ -104,8 +104,8 @@ FAIL: } int main(int argc, const char* argv[]) { - testsuite_add_test(test_scan); - testsuite_add_test(test_compose); + testsuite_add_test(test_scan, 0); + testsuite_add_test(test_compose, 0); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/snapshot.c b/tests/libpakfire/snapshot.c index 7bb3c86d4..77d6ea418 100644 --- a/tests/libpakfire/snapshot.c +++ b/tests/libpakfire/snapshot.c @@ -75,8 +75,8 @@ FAIL: } int main(int argc, const char* argv[]) { - testsuite_add_test(test_create_and_restore); - testsuite_add_test(test_invalid_inputs); + testsuite_add_test(test_create_and_restore, 0); + testsuite_add_test(test_invalid_inputs, 0); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/string.c b/tests/libpakfire/string.c index bcf8e1357..4bab17327 100644 --- a/tests/libpakfire/string.c +++ b/tests/libpakfire/string.c @@ -331,16 +331,16 @@ FAIL: } int main(int argc, const char* argv[]) { - testsuite_add_test(test_string_set); - testsuite_add_test(test_string_startswith); - testsuite_add_test(test_string_endswith); - testsuite_add_test(test_string_matches); - testsuite_add_test(test_string_partition); - testsuite_add_test(test_string_replace); - testsuite_add_test(test_string_join); - testsuite_add_test(test_format_size); - testsuite_add_test(test_parse_bytes); - testsuite_add_test(test_intervals); + testsuite_add_test(test_string_set, 0); + testsuite_add_test(test_string_startswith, 0); + testsuite_add_test(test_string_endswith, 0); + testsuite_add_test(test_string_matches, 0); + testsuite_add_test(test_string_partition, 0); + testsuite_add_test(test_string_replace, 0); + testsuite_add_test(test_string_join, 0); + testsuite_add_test(test_format_size, 0); + testsuite_add_test(test_parse_bytes, 0); + testsuite_add_test(test_intervals, 0); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/util.c b/tests/libpakfire/util.c index 63fd49640..4fcf146bb 100644 --- a/tests/libpakfire/util.c +++ b/tests/libpakfire/util.c @@ -123,9 +123,9 @@ FAIL: } int main(int argc, const char* argv[]) { - testsuite_add_test(test_mkdir); - testsuite_add_test(test_path_match); - testsuite_add_test(test_base64); + testsuite_add_test(test_mkdir, 0); + testsuite_add_test(test_path_match, 0); + testsuite_add_test(test_base64, 0); return testsuite_run(argc, argv); } diff --git a/tests/testsuite.c b/tests/testsuite.c index a5a2605c2..1d478cc74 100644 --- a/tests/testsuite.c +++ b/tests/testsuite.c @@ -135,7 +135,7 @@ ERROR: return r; } -int __testsuite_add_test(const char* name, int (*func)(const struct test* t)) { +int __testsuite_add_test(const char* name, int (*func)(const struct test* t), int flags) { // Check if any space is left if (ts.num >= MAX_TESTS) { LOG("ERROR: We are out of space for tests\n"); @@ -147,6 +147,7 @@ int __testsuite_add_test(const char* name, int (*func)(const struct test* t)) { // Set parameters test->name = name; test->func = func; + test->flags = flags; return 0; } diff --git a/tests/testsuite.h b/tests/testsuite.h index 7581bd0cc..5f0d47e77 100644 --- a/tests/testsuite.h +++ b/tests/testsuite.h @@ -36,6 +36,7 @@ struct test { const char* name; int (*func)(const struct test* t); + int flags; // Pakfire Context struct pakfire_ctx* ctx; @@ -51,7 +52,7 @@ struct testsuite { extern struct testsuite ts; -int __testsuite_add_test(const char* name, int (*func)(const struct test* t)); +int __testsuite_add_test(const char* name, int (*func)(const struct test* t), int flags); int testsuite_run(int argc, const char* argv[]); #define _LOG(prefix, fmt, ...) fprintf(stderr, "TESTS: " prefix fmt, ## __VA_ARGS__); @@ -59,7 +60,7 @@ int testsuite_run(int argc, const char* argv[]); #define LOG_WARN(fmt, ...) _LOG("WARN: ", fmt, ## __VA_ARGS__); #define LOG_ERROR(fmt, ...) _LOG("ERROR: ", fmt, ## __VA_ARGS__); -#define testsuite_add_test(func) __testsuite_add_test(#func, func) +#define testsuite_add_test(func, flags) __testsuite_add_test(#func, func, flags) static inline size_t testsuite_array_length(char* array[]) { size_t length = 0;