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

test/rpc: don't use shell-job

We want to execute this test in Jenkins.
Signed-off-by: 's avatarAndrew Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent fe0afaa7
...@@ -53,7 +53,6 @@ print 'Dumping myself using page-server' ...@@ -53,7 +53,6 @@ print 'Dumping myself using page-server'
req.type = rpc.DUMP req.type = rpc.DUMP
req.opts.ps.port = resp.ps.port req.opts.ps.port = resp.ps.port
req.opts.log_file = 'dump.log' req.opts.log_file = 'dump.log'
req.opts.shell_job = True
req.opts.leave_running = True req.opts.leave_running = True
s.close() s.close()
......
...@@ -30,7 +30,7 @@ function test_c { ...@@ -30,7 +30,7 @@ function test_c {
mkdir -p build/imgs_c mkdir -p build/imgs_c
title_print "Run test-c" title_print "Run test-c"
./test-c build/criu_service.socket build/imgs_c setsid ./test-c build/criu_service.socket build/imgs_c < /dev/null &>> build/output
title_print "Restore test-c" title_print "Restore test-c"
${CRIU} restore -v4 -o restore-c.log -D build/imgs_c --shell-job ${CRIU} restore -v4 -o restore-c.log -D build/imgs_c --shell-job
...@@ -40,7 +40,7 @@ function test_py { ...@@ -40,7 +40,7 @@ function test_py {
mkdir -p build/imgs_py mkdir -p build/imgs_py
title_print "Run test-py" title_print "Run test-py"
./test.py build/criu_service.socket build/imgs_py setsid ./test.py build/criu_service.socket build/imgs_py < /dev/null &>> build/output
title_print "Restore test-py" title_print "Restore test-py"
${CRIU} restore -v4 -o restore-py.log -D build/imgs_py --shell-job ${CRIU} restore -v4 -o restore-py.log -D build/imgs_py --shell-job
...@@ -66,14 +66,14 @@ function test_ps { ...@@ -66,14 +66,14 @@ function test_ps {
mkdir -p build/imgs_ps mkdir -p build/imgs_ps
title_print "Run ps_test" title_print "Run ps_test"
./ps_test.py build/criu_service.socket build/imgs_ps setsid ./ps_test.py build/criu_service.socket build/imgs_ps < /dev/null &>> output
} }
function test_errno { function test_errno {
mkdir -p build/imgs_errno mkdir -p build/imgs_errno
title_print "Run cr_errno test" title_print "Run cr_errno test"
./errno.py build/criu_service.socket build/imgs_errno setsid ./errno.py build/criu_service.socket build/imgs_errno < /dev/null &>> output
} }
trap 'echo "FAIL"; stop_server' EXIT trap 'echo "FAIL"; stop_server' EXIT
......
...@@ -97,8 +97,6 @@ int main(int argc, char *argv[]) ...@@ -97,8 +97,6 @@ int main(int argc, char *argv[])
req.opts->has_leave_running = true; req.opts->has_leave_running = true;
req.opts->leave_running = true; req.opts->leave_running = true;
req.opts->images_dir_fd = dir_fd; req.opts->images_dir_fd = dir_fd;
req.opts->has_shell_job = true;
req.opts->shell_job = true;
req.opts->has_log_level = true; req.opts->has_log_level = true;
req.opts->log_level = 4; req.opts->log_level = 4;
......
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