[CRIU] [PATCH 5/6] test: Rename libcriu run_sub.sh -> run.sh

[Pavel Emelyanov]

Now it gets launched from make target.

Signed-off-by: Pavel Emelyanov <xemul at parallels.com>
---
 test/libcriu/run.sh     | 44 ++++++++++++++++++++++++++++++++++++++++++++
 test/libcriu/run_sub.sh | 44 --------------------------------------------
 2 files changed, 44 insertions(+), 44 deletions(-)
 create mode 100755 test/libcriu/run.sh
 delete mode 100644 test/libcriu/run_sub.sh

diff --git a/test/libcriu/run.sh b/test/libcriu/run.sh
new file mode 100755
index 0000000..d96a2c6
--- /dev/null
+++ b/test/libcriu/run.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+source ../env.sh || exit 1
+
+echo "== Clean"
+make clean
+rm -rf wdir
+rm -f ./libcriu.so.1
+
+echo "== Prepare"
+make test_sub || { echo "FAIL build sub"; exit 1; }
+make test_self || { echo "FAIL build self"; exit 1; }
+
+mkdir -p wdir/s/
+echo "== Start service"
+${CRIU} service -v4 -o service.log --address cs.sk -d --pidfile pidfile -W wdir/s/ || { echo "FAIL service start"; exit 1; }
+
+echo "== Run tests"
+ln -s ../../lib/libcriu.so libcriu.so.1
+export LD_LIBRARY_PATH=.
+export PATH="`dirname ${BASH_SOURCE[0]}`/../../:$PATH"
+
+RESULT=0
+
+# C/R of child process
+echo "== Test SUB"
+mkdir -p wdir/i/sub/
+if ! ./test_sub wdir/s/cs.sk wdir/i/sub/; then
+	echo "test_sub: FAIL"
+	RESULT=1
+fi
+
+# C/R of self
+echo "== Test SELF"
+mkdir -p wdir/i/self/
+if ! ./test_self wdir/s/cs.sk wdir/i/self/; then
+	echo "test_self: FAIL"
+	RESULT=1
+fi
+
+echo "== Stopping service"
+kill -TERM $(cat wdir/s/pidfile)
+[ $RESULT ] && echo "Success" || echo "FAIL"
+exit $RESULT
diff --git a/test/libcriu/run_sub.sh b/test/libcriu/run_sub.sh
deleted file mode 100644
index d96a2c6..0000000
--- a/test/libcriu/run_sub.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-source ../env.sh || exit 1
-
-echo "== Clean"
-make clean
-rm -rf wdir
-rm -f ./libcriu.so.1
-
-echo "== Prepare"
-make test_sub || { echo "FAIL build sub"; exit 1; }
-make test_self || { echo "FAIL build self"; exit 1; }
-
-mkdir -p wdir/s/
-echo "== Start service"
-${CRIU} service -v4 -o service.log --address cs.sk -d --pidfile pidfile -W wdir/s/ || { echo "FAIL service start"; exit 1; }
-
-echo "== Run tests"
-ln -s ../../lib/libcriu.so libcriu.so.1
-export LD_LIBRARY_PATH=.
-export PATH="`dirname ${BASH_SOURCE[0]}`/../../:$PATH"
-
-RESULT=0
-
-# C/R of child process
-echo "== Test SUB"
-mkdir -p wdir/i/sub/
-if ! ./test_sub wdir/s/cs.sk wdir/i/sub/; then
-	echo "test_sub: FAIL"
-	RESULT=1
-fi
-
-# C/R of self
-echo "== Test SELF"
-mkdir -p wdir/i/self/
-if ! ./test_self wdir/s/cs.sk wdir/i/self/; then
-	echo "test_self: FAIL"
-	RESULT=1
-fi
-
-echo "== Stopping service"
-kill -TERM $(cat wdir/s/pidfile)
-[ $RESULT ] && echo "Success" || echo "FAIL"
-exit $RESULT
-- 
1.8.4.2