[CRIU] [PATCH 2/2] test/rpc: don't use shell-job

[Andrew Vagin]

We want to execute this test in Jenkins.

Signed-off-by: Andrew Vagin <avagin at openvz.org>
---
 test/rpc/ps_test.py | 1 -
 test/rpc/run.sh     | 8 ++++----
 test/rpc/test.c     | 2 --
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/test/rpc/ps_test.py b/test/rpc/ps_test.py
index b8e57cf..4ce44c3 100755
--- a/test/rpc/ps_test.py
+++ b/test/rpc/ps_test.py
@@ -53,7 +53,6 @@ print 'Dumping myself using page-server'
 req.type		= rpc.DUMP
 req.opts.ps.port	= resp.ps.port
 req.opts.log_file	= 'dump.log'
-req.opts.shell_job	= True
 req.opts.leave_running	= True
 
 s.close()
diff --git a/test/rpc/run.sh b/test/rpc/run.sh
index 49145d8..8279063 100755
--- a/test/rpc/run.sh
+++ b/test/rpc/run.sh
@@ -30,7 +30,7 @@ function test_c {
 	mkdir -p build/imgs_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"
 	${CRIU} restore -v4 -o restore-c.log -D build/imgs_c --shell-job
@@ -40,7 +40,7 @@ function test_py {
 	mkdir -p build/imgs_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"
 	${CRIU} restore -v4 -o restore-py.log -D build/imgs_py --shell-job
@@ -66,14 +66,14 @@ function test_ps {
 	mkdir -p build/imgs_ps
 
 	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 {
 	mkdir -p build/imgs_errno
 
 	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
diff --git a/test/rpc/test.c b/test/rpc/test.c
index 90d2455..a407ef2 100644
--- a/test/rpc/test.c
+++ b/test/rpc/test.c
@@ -99,8 +99,6 @@ int main(int argc, char *argv[])
 	req.opts->has_leave_running	= true;
 	req.opts->leave_running		= true;
 	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->log_level		= 4;
 
-- 
2.1.0