test: fix shell script tests (conntracks & route_rules)

Submitted by Vitaly Ostrosablin on Dec. 21, 2016, 11:20 a.m.

Details

Message ID 20161221112054.9878-1-vostrosablin@virtuozzo.com
State Accepted
Series "test: fix shell script tests (conntracks & route_rules)"
Commit 67aeb547d2ef02fa82e66a78d813c416c1715e3e
Headers show

Commit Message

Vitaly Ostrosablin Dec. 21, 2016, 11:20 a.m.
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@virtuozzo.com>
---
 test/zdtm/static/conntracks  | 3 +--
 test/zdtm/static/route_rules | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox

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"

Comments

Cyrill Gorcunov Dec. 21, 2016, 7:14 p.m.
On Wed, Dec 21, 2016 at 02:20:54PM +0300, Vitaly Ostrosablin wrote:
> 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@virtuozzo.com>
Reviewed-by: Cyrill Gorcunov <gorcunov@openvz.org>
Pavel Emelianov Dec. 29, 2016, 12:34 p.m.
Applied