| Message ID | 20230809124343.12957-11-magnus.karlsson@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | BPF |
| Headers | show |
| Series | seltests/xsk: various improvements to xskxceiver | expand |
On 8/9/23 14:43, Magnus Karlsson wrote: > From: Magnus Karlsson <magnus.karlsson@intel.com> > > Add the -h option to display all available command line options > available for test_xsk.sh and xskxceiver. > > Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com> > --- > tools/testing/selftests/bpf/test_xsk.sh | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/bpf/test_xsk.sh b/tools/testing/selftests/bpf/test_xsk.sh > index 94b4b86d5239..baaeb016d699 100755 > --- a/tools/testing/selftests/bpf/test_xsk.sh > +++ b/tools/testing/selftests/bpf/test_xsk.sh > @@ -79,12 +79,15 @@ > # > # Run a specific test from the test suite > # sudo ./test_xsk.sh -t TEST_NAME > +# > +# Display the available command line options > +# sudo ./test_xsk.sh -h any "help" / "list" commands (that do nothing but print) should be (able ot) execute/d without `sudo`. Removing `sudo` part from the doc here would make it clear to reader too. > > . xsk_prereqs.sh > > ETH="" > > -while getopts "vi:dm:lt:" flag > +while getopts "vi:dm:lt:h" flag > do > case "${flag}" in > v) verbose=1;; > @@ -93,6 +96,7 @@ do > m) MODE=${OPTARG};; > l) list=1;; > t) TEST=${OPTARG};; > + h) help=1;; > esac > done > > @@ -140,6 +144,11 @@ setup_vethPairs() { > ip link set ${VETH0} up > } > > +if [[ $help -eq 1 ]]; then > + ./${XSKOBJ} > + exit > +fi > + > if [ ! -z $ETH ]; then > VETH0=${ETH} > VETH1=${ETH}
On Thu, 10 Aug 2023 at 14:19, Przemek Kitszel <przemyslaw.kitszel@intel.com> wrote: > > On 8/9/23 14:43, Magnus Karlsson wrote: > > From: Magnus Karlsson <magnus.karlsson@intel.com> > > > > Add the -h option to display all available command line options > > available for test_xsk.sh and xskxceiver. > > > > Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com> > > --- > > tools/testing/selftests/bpf/test_xsk.sh | 11 ++++++++++- > > 1 file changed, 10 insertions(+), 1 deletion(-) > > > > diff --git a/tools/testing/selftests/bpf/test_xsk.sh b/tools/testing/selftests/bpf/test_xsk.sh > > index 94b4b86d5239..baaeb016d699 100755 > > --- a/tools/testing/selftests/bpf/test_xsk.sh > > +++ b/tools/testing/selftests/bpf/test_xsk.sh > > @@ -79,12 +79,15 @@ > > # > > # Run a specific test from the test suite > > # sudo ./test_xsk.sh -t TEST_NAME > > +# > > +# Display the available command line options > > +# sudo ./test_xsk.sh -h > > any "help" / "list" commands (that do nothing but print) should be (able > ot) execute/d without `sudo`. > Removing `sudo` part from the doc here would make it clear to reader too. You are correct. Will remove the "sudo" here as it is not needed. Would be nice if we could execute the list option (-l) without sudo rights too since it does not involve creating any xsk sockets. Will fix that in patch 6. > > > > . xsk_prereqs.sh > > > > ETH="" > > > > -while getopts "vi:dm:lt:" flag > > +while getopts "vi:dm:lt:h" flag > > do > > case "${flag}" in > > v) verbose=1;; > > @@ -93,6 +96,7 @@ do > > m) MODE=${OPTARG};; > > l) list=1;; > > t) TEST=${OPTARG};; > > + h) help=1;; > > esac > > done > > > > @@ -140,6 +144,11 @@ setup_vethPairs() { > > ip link set ${VETH0} up > > } > > > > +if [[ $help -eq 1 ]]; then > > + ./${XSKOBJ} > > + exit > > +fi > > + > > if [ ! -z $ETH ]; then > > VETH0=${ETH} > > VETH1=${ETH} >
On Wed, Aug 09, 2023 at 02:43:43PM +0200, Magnus Karlsson wrote: > From: Magnus Karlsson <magnus.karlsson@intel.com> > > Add the -h option to display all available command line options > available for test_xsk.sh and xskxceiver. > > Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com> > --- > tools/testing/selftests/bpf/test_xsk.sh | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/bpf/test_xsk.sh b/tools/testing/selftests/bpf/test_xsk.sh > index 94b4b86d5239..baaeb016d699 100755 > --- a/tools/testing/selftests/bpf/test_xsk.sh > +++ b/tools/testing/selftests/bpf/test_xsk.sh > @@ -79,12 +79,15 @@ > # > # Run a specific test from the test suite > # sudo ./test_xsk.sh -t TEST_NAME > +# > +# Display the available command line options > +# sudo ./test_xsk.sh -h > > . xsk_prereqs.sh > > ETH="" > > -while getopts "vi:dm:lt:" flag > +while getopts "vi:dm:lt:h" flag > do > case "${flag}" in > v) verbose=1;; > @@ -93,6 +96,7 @@ do > m) MODE=${OPTARG};; > l) list=1;; > t) TEST=${OPTARG};; > + h) help=1;; > esac > done > > @@ -140,6 +144,11 @@ setup_vethPairs() { > ip link set ${VETH0} up > } > > +if [[ $help -eq 1 ]]; then > + ./${XSKOBJ} > + exit > +fi is there anything that stops from having the list of test output before all of the validation below (check that we are root, veth support etc) ? I would like us to have a case 'h' within parse_command_line() though. > + > if [ ! -z $ETH ]; then > VETH0=${ETH} > VETH1=${ETH} > -- > 2.34.1 >
diff --git a/tools/testing/selftests/bpf/test_xsk.sh b/tools/testing/selftests/bpf/test_xsk.sh index 94b4b86d5239..baaeb016d699 100755 --- a/tools/testing/selftests/bpf/test_xsk.sh +++ b/tools/testing/selftests/bpf/test_xsk.sh @@ -79,12 +79,15 @@ # # Run a specific test from the test suite # sudo ./test_xsk.sh -t TEST_NAME +# +# Display the available command line options +# sudo ./test_xsk.sh -h . xsk_prereqs.sh ETH="" -while getopts "vi:dm:lt:" flag +while getopts "vi:dm:lt:h" flag do case "${flag}" in v) verbose=1;; @@ -93,6 +96,7 @@ do m) MODE=${OPTARG};; l) list=1;; t) TEST=${OPTARG};; + h) help=1;; esac done @@ -140,6 +144,11 @@ setup_vethPairs() { ip link set ${VETH0} up } +if [[ $help -eq 1 ]]; then + ./${XSKOBJ} + exit +fi + if [ ! -z $ETH ]; then VETH0=${ETH} VETH1=${ETH}