tests: Allow to configure whether Pakfire is needed

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/tests/libpakfire/archive.c b/tests/libpakfire/archive.c
index 32f6d7f80e75a6a964474ff6767f62901f28fa17..94a1d3ecd041e6b908b859e8f94ea75a29f33df1 100644 (file)
--- 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 a310e1b6e241dd8917b2f5ac77d7a960a31f089e..7d656202dc5ad9c04d19b7508d105e95d07c483c 100644 (file)
--- 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 a73e53ce3b2c869b8f7152a5fffc4f95967469b0..afa211c334491cba0695f63e5724e58120ec420d 100644 (file)
--- 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 d2b1e40562a9dee857194f3e935302b52ddc4b7e..bc2cf819a920f2dd33d694d9115007c92c821a8f 100644 (file)
--- 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 fcbf80db5ab5d485841c08c83fed45f1b1e63e45..cc472e6e9978c9624b41feda914714027be28976 100644 (file)
--- 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 f26432bb9f03242fafaa1abcc831c397a115f601..443aae9e6cbd3490fbf492f51b1504f6c0f66129 100644 (file)
--- 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 40b9bd8ef4a6df630961f64f721e3639630f78e7..283d50f79e0159d2cbd45263a2a2b052881834f1 100644 (file)
--- 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 b3079cf189b14d3fe569a54d20b465d31aabc077..54b309c83305b507ad2775c22e0c8e46093797a2 100644 (file)
--- 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 ea5a9657c4e556de148d0d0151af64436283bd18..af0059bd46046c903a6715e44d4808a3c79aa59b 100644 (file)
--- 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 99d433c65bff8e0fd14f93c16a98111a644979a9..f5adc6bfcb3efe363f6832b23de140f77fd00d53 100644 (file)
--- 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 10d13a92e7a3f8ee05e384166c03f65942b1a5f7..769281be797e1ddafbac6b32396ef2654cbef633 100644 (file)
--- 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 60cfa8e931dbabaeaa9bfcad5425767319316d41..b008f75cef2ce287b8e9f733f9ff8a6645e52055 100644 (file)
--- 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 f19f072bed5415fdf96efb77fce138f48619462a..ff27fe6472b13f53c8d66bec3f42a078d7a81273 100644 (file)
--- 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 b608efe75d707eb7dfec7e8db8b4b26f7825dd67..93f2edbcc03ba260f403376e1370f4d09a01e96f 100644 (file)
--- 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 77d6ea418344289db643ee548d1a7c8be46c99e1..8eed8235bcd1f3ef41e040822ccbb7bcdfd4a759 100644 (file)
--- 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 4fcf146bb84516b7a74d297642edf0026a990ab3..3ee6492a58ec6c9505ce8a2bd1448a57ae75dded 100644 (file)
--- 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 1d478cc74935188d8027f28037dc917030140246..30ae9cd32c5186e60582e925454b68fafeff640f 100644 (file)
--- 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 5f0d47e77673da44ccfcc904b27c9bc6ba6280e0..459e639fe00b45a582f469da0609afa124ea4194 100644 (file)
--- 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);