[CRIU] [PATCH] 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/errno.py |  1 -
 test/rpc/run.sh   | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/test/rpc/errno.py b/test/rpc/errno.py
index 4560b47..666dfff 100755
--- a/test/rpc/errno.py
+++ b/test/rpc/errno.py
@@ -78,7 +78,6 @@ class test:
 		# Perform self-dump
 		req = self.get_base_req()
 		req.type		= rpc.DUMP
-		req.opts.shell_job	= True
 		req.opts.leave_running	= True
 
 		self.send_req(req)
diff --git a/test/rpc/run.sh b/test/rpc/run.sh
index 8279063..671fa65 100755
--- a/test/rpc/run.sh
+++ b/test/rpc/run.sh
@@ -30,20 +30,20 @@ function test_c {
 	mkdir -p build/imgs_c
 
 	title_print "Run test-c"
-	setsid ./test-c build/criu_service.socket build/imgs_c < /dev/null &>> build/output
+	setsid ./test-c build/criu_service.socket build/imgs_c < /dev/null &>> build/output_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
 }
 
 function test_py {
 	mkdir -p build/imgs_py
 
 	title_print "Run test-py"
-	setsid ./test.py build/criu_service.socket build/imgs_py < /dev/null &>> build/output
+	setsid ./test.py build/criu_service.socket build/imgs_py < /dev/null &>> build/output_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
 }
 
 function test_restore_loop {
@@ -66,14 +66,14 @@ function test_ps {
 	mkdir -p build/imgs_ps
 
 	title_print "Run ps_test"
-	setsid ./ps_test.py build/criu_service.socket build/imgs_ps < /dev/null &>> output 
+	setsid ./ps_test.py build/criu_service.socket build/imgs_ps < /dev/null &>> output_ps
 }
 
 function test_errno {
 	mkdir -p build/imgs_errno
 
 	title_print "Run cr_errno test"
-	setsid ./errno.py build/criu_service.socket build/imgs_errno < /dev/null &>> output
+	setsid ./errno.py build/criu_service.socket build/imgs_errno < /dev/null &>> output_errno
 }
 
 trap 'echo "FAIL"; stop_server' EXIT
-- 
2.1.0