Skip to content

Commit

Permalink
selftests: forwarding: ethtool: Move different_speeds_get() to ethtoo…
Browse files Browse the repository at this point in the history
…l_lib

Currently different_speeds_get() is used only by ethtool.sh tests.
The function can be useful for another tests that check ethtool
configurations.

Move the function to ethtool_lib in order to allow other tests to use
it.

Signed-off-by: Amit Cohen <[email protected]>
Reviewed-by: Petr Machata <[email protected]>
Reviewed-by: Florian Fainelli <[email protected]>
Signed-off-by: Ido Schimmel <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
amitcohen1 authored and davem330 committed Jun 30, 2020
1 parent 60f30cd commit dd9e67f
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
17 changes: 0 additions & 17 deletions tools/testing/selftests/net/forwarding/ethtool.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,23 +50,6 @@ cleanup()
h1_destroy
}

different_speeds_get()
{
local dev1=$1; shift
local dev2=$1; shift
local with_mode=$1; shift
local adver=$1; shift

local -a speeds_arr

speeds_arr=($(common_speeds_get $dev1 $dev2 $with_mode $adver))
if [[ ${#speeds_arr[@]} < 2 ]]; then
check_err 1 "cannot check different speeds. There are not enough speeds"
fi

echo ${speeds_arr[0]} ${speeds_arr[1]}
}

same_speeds_autoneg_off()
{
# Check that when each of the reported speeds is forced, the links come
Expand Down
17 changes: 17 additions & 0 deletions tools/testing/selftests/net/forwarding/ethtool_lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,20 @@ common_speeds_get()
<(printf '%s\n' "${dev1_speeds[@]}" | sort -u) \
<(printf '%s\n' "${dev2_speeds[@]}" | sort -u)
}

different_speeds_get()
{
local dev1=$1; shift
local dev2=$1; shift
local with_mode=$1; shift
local adver=$1; shift

local -a speeds_arr

speeds_arr=($(common_speeds_get $dev1 $dev2 $with_mode $adver))
if [[ ${#speeds_arr[@]} < 2 ]]; then
check_err 1 "cannot check different speeds. There are not enough speeds"
fi

echo ${speeds_arr[0]} ${speeds_arr[1]}
}

0 comments on commit dd9e67f

Please sign in to comment.