shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-28 03:25:27 +03:00
Code

Merge pull request #3564 from evverx/valgrind-tests-fixes

Browse Source 
tests: fix memory leak, don't run test_get_process_cmdline_harder under valgrind
This commit is contained in:
Ronny Chevalier 2016-06-20 08:41:06 +01:00 committed by GitHub
commit fbd9ec188a
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/locale/test-keymap-util.c
View File

@ -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) {

11
src/test/test-process-util.c
View File

@ -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;