[CRIU] [PATCH] test: fix shell script tests (conntracks & route_rules)

Vitaly Ostrosablin vostrosablin at virtuozzo.com
Wed Dec 21 03:20:54 PST 2016


Test seem to assume that zdtm lib directory is on PATH, but if it's not
- calling for parseargs.sh would fail (if cwd is static). Therefore,
this patch changes this to ../lib/parseargs.sh which should be fine both
for zdtm and vzt-cpt.

Signed-off-by: Vitaly Ostrosablin <vostrosablin at virtuozzo.com>
---
 test/zdtm/static/conntracks  | 3 +--
 test/zdtm/static/route_rules | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/zdtm/static/conntracks b/test/zdtm/static/conntracks
index 54898c7..a30e0e2 100755
--- a/test/zdtm/static/conntracks
+++ b/test/zdtm/static/conntracks
@@ -45,8 +45,7 @@ do_stop()
 	echo "PASS" > $outfile
 }
 
-
-tmpargs="$(parseargs.sh --name=$0 \
+tmpargs="$(../lib/parseargs.sh --name=$0 \
 		--flags-req=statefile,outfile \
 		--flags-opt="start,stop" -- "$@")" ||
 	die "can't parse command line"
diff --git a/test/zdtm/static/route_rules b/test/zdtm/static/route_rules
index ea44537..9a735c6 100755
--- a/test/zdtm/static/route_rules
+++ b/test/zdtm/static/route_rules
@@ -60,8 +60,7 @@ do_stop()
 	echo "PASS" > $outfile
 }
 
-
-tmpargs="$(parseargs.sh --name=$0 \
+tmpargs="$(../lib/parseargs.sh --name=$0 \
 		--flags-req=statefile,outfile \
 		-- "$@")" ||
 	die "can't parse command line"
-- 
2.10.2



More information about the CRIU mailing list