From: Michael Tremer Date: Wed, 1 Nov 2023 14:32:15 +0000 (+0000) Subject: tests: Allow to configure whether Pakfire is needed X-Git-Tag: 0.9.30~1345 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f96ed3ac3e7e2026499516219fd535df6a4e89a7;p=pakfire.git tests: Allow to configure whether Pakfire is needed Signed-off-by: Michael Tremer --- diff --git a/tests/libpakfire/archive.c b/tests/libpakfire/archive.c index 32f6d7f80..94a1d3ecd 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, 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); + testsuite_add_test(test_open, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_open_directory, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_read, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_copy, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_filelist, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_extract, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_import, TEST_WANTS_PAKFIRE); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/build.c b/tests/libpakfire/build.c index a310e1b6e..7d656202d 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, 0); - testsuite_add_test(test_create_with_invalid_ids, 0); + testsuite_add_test(test_create_and_free, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_create_with_invalid_ids, TEST_WANTS_PAKFIRE); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/cgroup.c b/tests/libpakfire/cgroup.c index a73e53ce3..afa211c33 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, 0); - testsuite_add_test(test_stats, 0); + testsuite_add_test(test_create_and_destroy, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_stats, TEST_WANTS_PAKFIRE); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/db.c b/tests/libpakfire/db.c index d2b1e4056..bc2cf819a 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, 0); - testsuite_add_test(test_open_rw, 0); - testsuite_add_test(test_check, 0); - testsuite_add_test(test_add_package, 0); + testsuite_add_test(test_open_ro, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_open_rw, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_check, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_add_package, TEST_WANTS_PAKFIRE); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/dependencies.c b/tests/libpakfire/dependencies.c index fcbf80db5..cc472e6e9 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, 0); - testsuite_add_test(test_dep_match, 0); + testsuite_add_test(test_dependencies, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_dep_match, TEST_WANTS_PAKFIRE); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/file.c b/tests/libpakfire/file.c index f26432bb9..443aae9e6 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, 0); - testsuite_add_test(test_create_invalid, 0); + testsuite_add_test(test_create, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_create_invalid, TEST_WANTS_PAKFIRE); - testsuite_add_test(test_create_filelist, 0); + testsuite_add_test(test_create_filelist, TEST_WANTS_PAKFIRE); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/jail.c b/tests/libpakfire/jail.c index 40b9bd8ef..283d50f79 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, 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); + testsuite_add_test(test_create, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_exit_code, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_segv, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_env, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_exec, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_launch_into_cgroup, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_nice, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_memory_limit, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_pid_limit, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_file_ownership, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_bind, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_communicate, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_send_signal, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_timeout, TEST_WANTS_PAKFIRE); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/key.c b/tests/libpakfire/key.c index b3079cf18..54b309c83 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, 0); - testsuite_add_test(test_sign_and_verify, 0); - testsuite_add_test(test_import_public, 0); - testsuite_add_test(test_import_secret, 0); + testsuite_add_test(test_generate, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_sign_and_verify, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_import_public, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_import_secret, TEST_WANTS_PAKFIRE); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/main.c b/tests/libpakfire/main.c index ea5a9657c..af0059bd4 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, 0); - testsuite_add_test(test_path, 0); + testsuite_add_test(test_init, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_path, TEST_WANTS_PAKFIRE); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/makefile.c b/tests/libpakfire/makefile.c index 99d433c65..f5adc6bfc 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, 0); - testsuite_add_test(test_parse, 0); - testsuite_add_test(test_packages, 0); - testsuite_add_test(test_dist_dummy, 0); + testsuite_add_test(test_macros, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_parse, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_packages, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_dist_dummy, TEST_WANTS_PAKFIRE); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/package.c b/tests/libpakfire/package.c index 10d13a92e..769281be7 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, 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); + testsuite_add_test(test_create, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_invalid_inputs, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_uuid, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_deps, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_filelist, TEST_WANTS_PAKFIRE); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/packager.c b/tests/libpakfire/packager.c index 60cfa8e93..b008f75ce 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, 0); - testsuite_add_test(test_compare_metadata, 0); + testsuite_add_test(test_create, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_compare_metadata, TEST_WANTS_PAKFIRE); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/parser.c b/tests/libpakfire/parser.c index f19f072be..ff27fe647 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, 0); - testsuite_add_test(test_parser_files, 0); - testsuite_add_test(test_append, 0); + testsuite_add_test(test_parser, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_parser_files, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_append, TEST_WANTS_PAKFIRE); #if 0 - testsuite_add_test(test_parser_command, 0); + testsuite_add_test(test_parser_command, TEST_WANTS_PAKFIRE); #endif return testsuite_run(argc, argv); diff --git a/tests/libpakfire/repo.c b/tests/libpakfire/repo.c index b608efe75..93f2edbcc 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, 0); - testsuite_add_test(test_compose, 0); + testsuite_add_test(test_scan, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_compose, TEST_WANTS_PAKFIRE); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/snapshot.c b/tests/libpakfire/snapshot.c index 77d6ea418..8eed8235b 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, 0); - testsuite_add_test(test_invalid_inputs, 0); + testsuite_add_test(test_create_and_restore, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_invalid_inputs, TEST_WANTS_PAKFIRE); return testsuite_run(argc, argv); } diff --git a/tests/libpakfire/util.c b/tests/libpakfire/util.c index 4fcf146bb..3ee6492a5 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, 0); - testsuite_add_test(test_path_match, 0); - testsuite_add_test(test_base64, 0); + testsuite_add_test(test_mkdir, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_path_match, TEST_WANTS_PAKFIRE); + testsuite_add_test(test_base64, TEST_WANTS_PAKFIRE); return testsuite_run(argc, argv); } diff --git a/tests/testsuite.c b/tests/testsuite.c index 1d478cc74..30ae9cd32 100644 --- a/tests/testsuite.c +++ b/tests/testsuite.c @@ -71,24 +71,26 @@ static int test_run(int i, struct test* t) { goto ERROR; } - // Create a pakfire instance - r = pakfire_create(&t->pakfire, t->ctx, root, NULL, c, 0); - if (r) { - LOG("ERROR: Could not initialize pakfire: %m\n"); - goto ERROR; - } + // Create a pakfire instance (if requested) + if (t->flags & TEST_WANTS_PAKFIRE) { + r = pakfire_create(&t->pakfire, t->ctx, root, NULL, c, 0); + if (r) { + LOG("ERROR: Could not initialize pakfire: %m\n"); + goto ERROR; + } - // Check if the instance was created properly - if (r == 0 && !t->pakfire) { - LOG("ERROR: Pakfire was not initialized, but no error was raised: %m\n"); - goto ERROR; - } + // Check if the instance was created properly + if (r == 0 && !t->pakfire) { + LOG("ERROR: Pakfire was not initialized, but no error was raised: %m\n"); + goto ERROR; + } - // Copy command into environment - r = pakfire_bind(t->pakfire, TEST_STUB_COMMAND, "/command", 0); - if (r) { - LOG("ERROR: Could not copy command: %m\n"); - goto ERROR; + // Copy command into environment + r = pakfire_bind(t->pakfire, TEST_STUB_COMMAND, "/command", 0); + if (r) { + LOG("ERROR: Could not copy command: %m\n"); + goto ERROR; + } } // Run test diff --git a/tests/testsuite.h b/tests/testsuite.h index 5f0d47e77..459e639fe 100644 --- a/tests/testsuite.h +++ b/tests/testsuite.h @@ -33,6 +33,10 @@ #define TEST_SRC_PATH ABS_TOP_SRCDIR "/tests/" +enum test_flags { + TEST_WANTS_PAKFIRE = (1 << 0), +}; + struct test { const char* name; int (*func)(const struct test* t);