diff options
| author | Petr Vorel <pvorel@suse.cz> | 2018-07-24 16:23:04 +0200 |
|---|---|---|
| committer | Petr Vorel <pvorel@suse.cz> | 2018-07-24 16:30:40 +0200 |
| commit | 0567a8958a44e666736753486c6c0258c5d8b731 (patch) | |
| tree | 6d9fb581942d5030341b7c61da770509990dbad2 /testcases/lib | |
| parent | bf17885fee7e0c40402f3c8c057b8b301a95b96c (diff) | |
shell: Rename s/tst_check_cmds/tst_test_cmds/
This has been discussed on ML [1] [2] as tst_check_cmds() will be used
for different function.
[1] http://lists.linux.it/pipermail/ltp/2018-July/008801.html
[2] http://lists.linux.it/pipermail/ltp/2018-July/008808.html
Signed-off-by: Petr Vorel <pvorel@suse.cz>
Acked-by: Cyril Hrubis <chrubis@suse.cz>
Diffstat (limited to 'testcases/lib')
| -rw-r--r-- | testcases/lib/test.sh | 2 | ||||
| -rw-r--r-- | testcases/lib/tst_net.sh | 10 | ||||
| -rw-r--r-- | testcases/lib/tst_test.sh | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/testcases/lib/test.sh b/testcases/lib/test.sh index 509d25a77..954f2a22a 100644 --- a/testcases/lib/test.sh +++ b/testcases/lib/test.sh @@ -143,7 +143,7 @@ tst_rmdir() # # Checks if commands passed as arguments exists # -tst_check_cmds() +tst_test_cmds() { local cmd for cmd in $*; do diff --git a/testcases/lib/tst_net.sh b/testcases/lib/tst_net.sh index 65fbe2c28..a4467da7c 100644 --- a/testcases/lib/tst_net.sh +++ b/testcases/lib/tst_net.sh @@ -96,7 +96,7 @@ tst_require_root_() init_ltp_netspace() { - tst_check_cmds ip + tst_test_cmds ip tst_require_root_ local pid= @@ -253,7 +253,7 @@ tst_get_hwaddrs() # LINK: link number starting from 0. Default value is '0'. tst_hwaddr() { - tst_check_cmds awk + tst_test_cmds awk local type="${1:-lhost}" local link_num="${2:-0}" @@ -269,7 +269,7 @@ tst_hwaddr() # LINK: link number starting from 0. Default value is '0'. tst_iface() { - tst_check_cmds awk + tst_test_cmds awk local type="${1:-lhost}" local link_num="${2:-0}" @@ -416,7 +416,7 @@ tst_add_ipaddr() # LINK: link number starting from 0. Default value is '0'. tst_restore_ipaddr() { - tst_check_cmds ip + tst_test_cmds ip tst_require_root_ local type="${1:-lhost}" @@ -573,7 +573,7 @@ tst_ping() local cmd="ping$TST_IPV6" local ret=0 - tst_check_cmds $cmd + tst_test_cmds $cmd # ping cmd use 56 as default message size for size in ${msg_sizes:-"56"}; do diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh index c2460762d..6214fd851 100644 --- a/testcases/lib/tst_test.sh +++ b/testcases/lib/tst_test.sh @@ -246,7 +246,7 @@ tst_mkfs() ROD_SILENT mkfs.$fs_type $fs_opts $device } -tst_check_cmds() +tst_test_cmds() { local cmd for cmd in $*; do @@ -339,7 +339,7 @@ tst_run() fi fi - tst_check_cmds $TST_NEEDS_CMDS + tst_test_cmds $TST_NEEDS_CMDS if [ -n "$TST_MIN_KVER" ]; then tst_kvcmp -lt "$TST_MIN_KVER" && \ @@ -400,7 +400,7 @@ tst_run() #TODO check that test reports some results for each test function call while [ $TST_ITERATIONS -gt 0 ]; do if [ -n "$TST_TEST_DATA" ]; then - tst_check_cmds cut tr wc + tst_test_cmds cut tr wc _tst_max=$(( $(echo $TST_TEST_DATA | tr -cd "$TST_TEST_DATA_IFS" | wc -c) +1)) for _tst_i in $(seq $_tst_max); do _tst_data="$(echo "$TST_TEST_DATA" | cut -d"$TST_TEST_DATA_IFS" -f$_tst_i)" |