From 1b55a8bf0a7688549af4fbb287404b1eaf67ccc7 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 24 Mar 2023 16:09:08 +0000 Subject: [PATCH] tests: Make the testsuite compile again Signed-off-by: Michael Tremer --- tests/libpakfire/cgroup.c | 4 ++-- tests/libpakfire/jail.c | 50 +++++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/tests/libpakfire/cgroup.c b/tests/libpakfire/cgroup.c index e90a8f4b..d48b4f47 100644 --- a/tests/libpakfire/cgroup.c +++ b/tests/libpakfire/cgroup.c @@ -67,14 +67,14 @@ static int test_stats(const struct test* t) { #endif // Create a new jail - ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire, 0)); + ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire)); // Connect jail to the cgroup ASSERT_SUCCESS(pakfire_jail_set_cgroup(jail, cgroup)); // Run a few things for (unsigned int i = 0; i < 3; i++) { - ASSERT_SUCCESS(pakfire_jail_exec(jail, argv, NULL, NULL, NULL)); + ASSERT_SUCCESS(pakfire_jail_exec(jail, argv, NULL, NULL, NULL, 0)); } // Try reading the stats into some invalid space diff --git a/tests/libpakfire/jail.c b/tests/libpakfire/jail.c index 94f362d9..4f499ec4 100644 --- a/tests/libpakfire/jail.c +++ b/tests/libpakfire/jail.c @@ -45,7 +45,7 @@ static int test_create(const struct test* t) { struct pakfire_jail* jail = NULL; // Create a new jail - ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire, 0)); + ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire)); // Destroy it ASSERT_NULL(pakfire_jail_unref(jail)); @@ -65,10 +65,10 @@ static int test_exit_code(const struct test* t) { }; // Create a new jail - ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire, 0)); + ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire)); // Check if we receive the correct exit code - ASSERT(pakfire_jail_exec(jail, argv, NULL, NULL, NULL) == 123); + ASSERT(pakfire_jail_exec(jail, argv, NULL, NULL, NULL, 0) == 123); // Success r = EXIT_SUCCESS; @@ -89,10 +89,10 @@ static int test_segv(const struct test* t) { }; // Create a new jail - ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire, 0)); + ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire)); // Check if we receive the correct exit code - ASSERT(pakfire_jail_exec(jail, argv, NULL, NULL, NULL) == 139); + ASSERT(pakfire_jail_exec(jail, argv, NULL, NULL, NULL, 0) == 139); // Success r = EXIT_SUCCESS; @@ -108,7 +108,7 @@ static int test_env(const struct test* t) { struct pakfire_jail* jail = NULL; // Create a new jail - ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire, 0)); + ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire)); // Check if the default variables are set ASSERT(pakfire_jail_get_env(jail, "LANG")); @@ -136,10 +136,10 @@ static int test_exec(const struct test* t) { struct pakfire_jail* jail = NULL; // Create a new jail - ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire, 0)); + ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire)); // Try to execute something - ASSERT_SUCCESS(pakfire_jail_exec(jail, cmd_hello_world, NULL, NULL, NULL)); + ASSERT_SUCCESS(pakfire_jail_exec(jail, cmd_hello_world, NULL, NULL, NULL, 0)); // Destroy it ASSERT_NULL(pakfire_jail_unref(jail)); @@ -159,13 +159,13 @@ static int test_launch_into_cgroup(const struct test* t) { ASSERT_SUCCESS(pakfire_cgroup_open(&cgroup, t->pakfire, "pakfire-test", 0)); // Create a new jail - ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire, 0)); + ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire)); // Connect jail to the cgroup ASSERT_SUCCESS(pakfire_jail_set_cgroup(jail, cgroup)); // Run command - ASSERT(pakfire_jail_exec(jail, cmd_hello_world, NULL, NULL, NULL) == 0); + ASSERT(pakfire_jail_exec(jail, cmd_hello_world, NULL, NULL, NULL, 0) == 0); r = EXIT_SUCCESS; @@ -190,7 +190,7 @@ static int test_nice(const struct test* t) { }; // Create a new jail - ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire, 0)); + ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire)); // Set invalid nice levels ASSERT_ERRNO(pakfire_jail_nice(jail, 100), EINVAL); @@ -201,7 +201,7 @@ static int test_nice(const struct test* t) { // Check if the nice level has been set ASSERT_SUCCESS(pakfire_jail_exec(jail, argv, - NULL, pakfire_jail_capture_stdout, &output)); + NULL, pakfire_jail_capture_stdout, &output, 0)); ASSERT_STRING_EQUALS(output, "5\n"); // Success @@ -226,7 +226,7 @@ static int test_memory_limit(const struct test* t) { ASSERT_SUCCESS(pakfire_cgroup_open(&cgroup, t->pakfire, "pakfire-test", 0)); // Create jail - ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire, 0)); + ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire)); // Connect jail to the cgroup ASSERT_SUCCESS(pakfire_jail_set_cgroup(jail, cgroup)); @@ -235,10 +235,10 @@ static int test_memory_limit(const struct test* t) { ASSERT_SUCCESS(pakfire_cgroup_set_memory_limit(cgroup, 100 * 1024 * 1024)); // Try to exhaust all memory - ASSERT_FAILURE(pakfire_jail_exec(jail, cmd_exhaust_memory, NULL, NULL, NULL)); + ASSERT_FAILURE(pakfire_jail_exec(jail, cmd_exhaust_memory, NULL, NULL, NULL, 0)); // A fork bomb should also exhaust all memory - ASSERT_FAILURE(pakfire_jail_exec(jail, cmd_fork_bomb, NULL, NULL, NULL)); + ASSERT_FAILURE(pakfire_jail_exec(jail, cmd_fork_bomb, NULL, NULL, NULL, 0)); // Success r = EXIT_SUCCESS; @@ -263,7 +263,7 @@ static int test_pid_limit(const struct test* t) { ASSERT_SUCCESS(pakfire_cgroup_open(&cgroup, t->pakfire, "pakfire-test", 0)); // Create jail - ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire, 0)); + ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire)); // Connect jail to the cgroup ASSERT_SUCCESS(pakfire_jail_set_cgroup(jail, cgroup)); @@ -272,7 +272,7 @@ static int test_pid_limit(const struct test* t) { ASSERT_SUCCESS(pakfire_cgroup_set_pid_limit(cgroup, 100)); // Try to fork as many processes as possible - ASSERT_FAILURE(pakfire_jail_exec(jail, cmd_fork_bomb, NULL, NULL, NULL)); + ASSERT_FAILURE(pakfire_jail_exec(jail, cmd_fork_bomb, NULL, NULL, NULL, 0)); // Success r = EXIT_SUCCESS; @@ -321,7 +321,7 @@ static int test_bind(const struct test* t) { }; // Create a new jail - ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire, 0)); + ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire)); // Bind-mount nonsense ASSERT_ERRNO(pakfire_jail_bind(jail, NULL, target, 0), EINVAL); @@ -331,7 +331,7 @@ static int test_bind(const struct test* t) { ASSERT_SUCCESS(pakfire_jail_bind(jail, source, target, MS_RDONLY)); // Check if the mount actually works - ASSERT_SUCCESS(pakfire_jail_exec(jail, argv, NULL, NULL, NULL)); + ASSERT_SUCCESS(pakfire_jail_exec(jail, argv, NULL, NULL, NULL, 0)); // Success r = EXIT_SUCCESS; @@ -374,10 +374,10 @@ static int test_communicate(const struct test* t) { }; // Create a new jail - ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire, 0)); + ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire)); // Check if the mount actually works - ASSERT_SUCCESS(pakfire_jail_exec(jail, argv, callback_stdin, NULL, &lines)); + ASSERT_SUCCESS(pakfire_jail_exec(jail, argv, callback_stdin, NULL, &lines, 0)); // Success r = EXIT_SUCCESS; @@ -396,7 +396,7 @@ static int test_send_one_signal(const struct test* t, }; // Perform the command - return pakfire_jail_exec(jail, argv, NULL, NULL, NULL); + return pakfire_jail_exec(jail, argv, NULL, NULL, NULL, 0); } static int test_send_signal(const struct test* t) { @@ -404,7 +404,7 @@ static int test_send_signal(const struct test* t) { int r = EXIT_FAILURE; // Create a new jail - ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire, 0)); + ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire)); // Sending SIGTERM to ourselves ASSERT(test_send_one_signal(t, jail, "15") == 0); @@ -434,13 +434,13 @@ static int test_timeout(const struct test* t) { }; // Create a new jail - ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire, 0)); + ASSERT_SUCCESS(pakfire_jail_create(&jail, t->pakfire)); // Set a timeout of one second ASSERT_SUCCESS(pakfire_jail_set_timeout(jail, 1)); // Check if we receive the correct exit code - ASSERT(pakfire_jail_exec(jail, argv, NULL, NULL, NULL) == 139); + ASSERT(pakfire_jail_exec(jail, argv, NULL, NULL, NULL, 0) == 139); // Success r = EXIT_SUCCESS; -- 2.47.2