Commit a0497682 authored by Andrew Vagin's avatar Andrew Vagin Committed by Pavel Emelyanov

test: Fix random jenkins-other tests failures

- ext pipe test should build binar
- criu no longer accepts "extra" empty arguments
- adduser doesn't add more than one same user

All this came unnoticed due to error in tests failure detection
(36a13cbd test: don't ignore errors other other tests)
Signed-off-by: 's avatarAndrew Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 80d913dc
......@@ -2,7 +2,7 @@ CFLAGS += -Wall
pipe: pipe.c
clean:
rm -f pipe
run:
run: pipe
./pipe - && \
./pipe -c && \
./pipe -cl && \
......
......@@ -456,8 +456,13 @@ void restore_child(int *new_pipefd, char *old_pipe_name)
"%s", INHERIT_FD_OPTION);
snprintf(inh_file_arg, sizeof inh_file_arg,
"fd[%d]:%s", filefd, OLD_LOG_FILE + 1);
}
}
restore_argv[13] = inh_file_opt;
} else
restore_argv[13] = NULL;
restore_argv[11] = inh_pipe_opt;
} else
restore_argv[11] = NULL;
snprintf(buf, sizeof buf, "%s/%s", IMG_DIR, RESTORE_PID_FILE);
unlink_safe(buf);
......
......@@ -22,6 +22,8 @@ testdir: ../../criu
chmod 777 $(DIR)
users:
-userdel -f $(USR1)
-userdel -f $(USR2)
useradd -M -U $(USR1)
useradd -M -U $(USR2)
usermod -a -G $(USR2) $(USR1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment