mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-10-28 03:25:27 +03:00
Merge pull request #3564 from evverx/valgrind-tests-fixes
tests: fix memory leak, don't run test_get_process_cmdline_harder under valgrind
This commit is contained in:
commit
fbd9ec188a
@ -58,8 +58,8 @@ static void test_find_converted_keymap(void) {
|
||||
assert_se(r == 1);
|
||||
assert_se(streq(ans, "pl"));
|
||||
|
||||
assert_se(find_converted_keymap("pl", "dvorak", &ans) == 1);
|
||||
assert_se(streq(ans, "pl-dvorak"));
|
||||
assert_se(find_converted_keymap("pl", "dvorak", &ans2) == 1);
|
||||
assert_se(streq(ans2, "pl-dvorak"));
|
||||
}
|
||||
|
||||
static void test_find_legacy_keymap(void) {
|
||||
|
@ -26,6 +26,9 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
#ifdef HAVE_VALGRIND_VALGRIND_H
|
||||
#include <valgrind/valgrind.h>
|
||||
#endif
|
||||
|
||||
#include "alloc-util.h"
|
||||
#include "architecture.h"
|
||||
@ -164,6 +167,14 @@ static void test_get_process_cmdline_harder(void) {
|
||||
if (geteuid() != 0)
|
||||
return;
|
||||
|
||||
#ifdef HAVE_VALGRIND_VALGRIND_H
|
||||
/* valgrind patches open(/proc//cmdline)
|
||||
* so, test_get_process_cmdline_harder fails always
|
||||
* See https://github.com/systemd/systemd/pull/3555#issuecomment-226564908 */
|
||||
if (RUNNING_ON_VALGRIND)
|
||||
return;
|
||||
#endif
|
||||
|
||||
pid = fork();
|
||||
if (pid > 0) {
|
||||
siginfo_t si;
|
||||
|
Loading…
Reference in New Issue
Block a user