[CRIU] [PATCH 2/4] test/other/rpc: resurrect the RPC test cases

[Adrian Reber]

From: Adrian Reber <areber at redhat.com>

In this directory there are various test cases using CRIU in RPC mode
(or SWRK mode).

This fixes the broken tests by moving the start of 'criu service' from
run.sh to the Makefile as the test cases is running using "sudo -g
'#1000' -u '#1000'" and the PID file created by CRIU can only be read by
the root user. If starting the 'criu service' before run.sh the PID file
still can be changed to 0666 and fixing the test script.

This also adds version.py to the test cases that are executed.

Signed-off-by: Adrian Reber <areber at redhat.com>
---
 test/others/rpc/Makefile | 4 ++++
 test/others/rpc/run.sh   | 7 -------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/test/others/rpc/Makefile b/test/others/rpc/Makefile
index bf2a2d2..5b383cf 100644
--- a/test/others/rpc/Makefile
+++ b/test/others/rpc/Makefile
@@ -7,7 +7,11 @@ LDLIBS +=  -lprotobuf-c
 run: all
 	mkdir -p build
 	chmod a+rwx build
+	@# need to start the criu daemon here to access the pidfile
+	sudo -g '#1000' -u '#1000' ./criu service -v4 -W build -o service.log --address criu_service.socket -d --pidfile pidfile
+	chmod a+rw build/pidfile
 	sudo -g '#1000' -u '#1000' ./run.sh
+	sudo -g '#1000' -u '#1000' ./version.py
 
 criu: ../../../criu/criu
 	cp ../../../criu/criu $@
diff --git a/test/others/rpc/run.sh b/test/others/rpc/run.sh
index ed99add..aaf48f4 100755
--- a/test/others/rpc/run.sh
+++ b/test/others/rpc/run.sh
@@ -15,11 +15,6 @@ function title_print {
 
 }
 
-function start_server {
-	title_print "Start service server"
-	${CRIU} service -v4 -W build -o service.log --address criu_service.socket -d --pidfile pidfile
-}
-
 function stop_server {
 	title_print "Shutdown service server"
 	kill -SIGTERM $(cat build/pidfile)
@@ -78,8 +73,6 @@ function test_errno {
 
 trap 'echo "FAIL"; stop_server' EXIT
 
-start_server
-
 test_c
 test_py
 test_restore_loop
-- 
1.8.3.1