* [PATCH net] selftests/net/forwarding: define libs as TEST_PROGS_EXTENDED
@ 2020-03-25 8:41 Hangbin Liu
2020-03-25 10:26 ` Vadym Kochan
2020-03-25 19:01 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Hangbin Liu @ 2020-03-25 8:41 UTC (permalink / raw)
To: netdev
Cc: Vadym Kochan, Shuah Khan, linux-kselftest, David Miller, Hangbin Liu
The lib files should not be defined as TEST_PROGS, or we will run them
in run_kselftest.sh.
Also remove ethtool_lib.sh exec permission.
Fixes: 81573b18f26d ("selftests/net/forwarding: add Makefile to install tests")
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
---
.../testing/selftests/net/forwarding/Makefile | 31 ++++++++++---------
.../selftests/net/forwarding/ethtool_lib.sh | 0
2 files changed, 16 insertions(+), 15 deletions(-)
mode change 100755 => 100644 tools/testing/selftests/net/forwarding/ethtool_lib.sh
diff --git a/tools/testing/selftests/net/forwarding/Makefile b/tools/testing/selftests/net/forwarding/Makefile
index 44616103508b..250fbb2d1625 100644
--- a/tools/testing/selftests/net/forwarding/Makefile
+++ b/tools/testing/selftests/net/forwarding/Makefile
@@ -5,11 +5,7 @@ TEST_PROGS = bridge_igmp.sh \
bridge_sticky_fdb.sh \
bridge_vlan_aware.sh \
bridge_vlan_unaware.sh \
- devlink_lib.sh \
- ethtool_lib.sh \
ethtool.sh \
- fib_offload_lib.sh \
- forwarding.config.sample \
gre_inner_v4_multipath.sh \
gre_inner_v6_multipath.sh \
gre_multipath.sh \
@@ -21,8 +17,6 @@ TEST_PROGS = bridge_igmp.sh \
ipip_hier_gre_key.sh \
ipip_hier_gre_keys.sh \
ipip_hier_gre.sh \
- ipip_lib.sh \
- lib.sh \
loopback.sh \
mirror_gre_bound.sh \
mirror_gre_bridge_1d.sh \
@@ -32,15 +26,11 @@ TEST_PROGS = bridge_igmp.sh \
mirror_gre_changes.sh \
mirror_gre_flower.sh \
mirror_gre_lag_lacp.sh \
- mirror_gre_lib.sh \
mirror_gre_neigh.sh \
mirror_gre_nh.sh \
mirror_gre.sh \
- mirror_gre_topo_lib.sh \
mirror_gre_vlan_bridge_1q.sh \
mirror_gre_vlan.sh \
- mirror_lib.sh \
- mirror_topo_lib.sh \
mirror_vlan.sh \
router_bridge.sh \
router_bridge_vlan.sh \
@@ -50,17 +40,12 @@ TEST_PROGS = bridge_igmp.sh \
router_multipath.sh \
router.sh \
router_vid_1.sh \
- sch_ets_core.sh \
sch_ets.sh \
- sch_ets_tests.sh \
- sch_tbf_core.sh \
- sch_tbf_etsprio.sh \
sch_tbf_ets.sh \
sch_tbf_prio.sh \
sch_tbf_root.sh \
tc_actions.sh \
tc_chains.sh \
- tc_common.sh \
tc_flower_router.sh \
tc_flower.sh \
tc_shblocks.sh \
@@ -72,4 +57,20 @@ TEST_PROGS = bridge_igmp.sh \
vxlan_bridge_1q.sh \
vxlan_symmetric.sh
+TEST_PROGS_EXTENDED := devlink_lib.sh \
+ ethtool_lib.sh \
+ fib_offload_lib.sh \
+ forwarding.config.sample \
+ ipip_lib.sh \
+ lib.sh \
+ mirror_gre_lib.sh \
+ mirror_gre_topo_lib.sh \
+ mirror_lib.sh \
+ mirror_topo_lib.sh \
+ sch_ets_core.sh \
+ sch_ets_tests.sh \
+ sch_tbf_core.sh \
+ sch_tbf_etsprio.sh \
+ tc_common.sh
+
include ../../lib.mk
diff --git a/tools/testing/selftests/net/forwarding/ethtool_lib.sh b/tools/testing/selftests/net/forwarding/ethtool_lib.sh
old mode 100755
new mode 100644
--
2.19.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net] selftests/net/forwarding: define libs as TEST_PROGS_EXTENDED
2020-03-25 8:41 [PATCH net] selftests/net/forwarding: define libs as TEST_PROGS_EXTENDED Hangbin Liu
@ 2020-03-25 10:26 ` Vadym Kochan
2020-03-25 13:37 ` Hangbin Liu
2020-03-25 19:01 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Vadym Kochan @ 2020-03-25 10:26 UTC (permalink / raw)
To: Hangbin Liu; +Cc: netdev, Shuah Khan, linux-kselftest, David Miller
Hi Hangbin Liu,
On Wed, Mar 25, 2020 at 04:41:01PM +0800, Hangbin Liu wrote:
> The lib files should not be defined as TEST_PROGS, or we will run them
> in run_kselftest.sh.
>
> Also remove ethtool_lib.sh exec permission.
>
> Fixes: 81573b18f26d ("selftests/net/forwarding: add Makefile to install tests")
> Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Thanks for fixing it, sorry for my mistake. Actually forwarding tests
requires interfaces list as runtime parameter or if it is defined in
forwarding.config file, so may be they should not run by run_kselftest
at all and only added via TEST_PROGS_EXTENDED ?
> ---
> .../testing/selftests/net/forwarding/Makefile | 31 ++++++++++---------
> .../selftests/net/forwarding/ethtool_lib.sh | 0
> 2 files changed, 16 insertions(+), 15 deletions(-)
> mode change 100755 => 100644 tools/testing/selftests/net/forwarding/ethtool_lib.sh
>
> diff --git a/tools/testing/selftests/net/forwarding/Makefile b/tools/testing/selftests/net/forwarding/Makefile
> index 44616103508b..250fbb2d1625 100644
> --- a/tools/testing/selftests/net/forwarding/Makefile
> +++ b/tools/testing/selftests/net/forwarding/Makefile
> @@ -5,11 +5,7 @@ TEST_PROGS = bridge_igmp.sh \
> bridge_sticky_fdb.sh \
> bridge_vlan_aware.sh \
> bridge_vlan_unaware.sh \
> - devlink_lib.sh \
> - ethtool_lib.sh \
> ethtool.sh \
> - fib_offload_lib.sh \
> - forwarding.config.sample \
> gre_inner_v4_multipath.sh \
> gre_inner_v6_multipath.sh \
> gre_multipath.sh \
> @@ -21,8 +17,6 @@ TEST_PROGS = bridge_igmp.sh \
> ipip_hier_gre_key.sh \
> ipip_hier_gre_keys.sh \
> ipip_hier_gre.sh \
> - ipip_lib.sh \
> - lib.sh \
> loopback.sh \
> mirror_gre_bound.sh \
> mirror_gre_bridge_1d.sh \
> @@ -32,15 +26,11 @@ TEST_PROGS = bridge_igmp.sh \
> mirror_gre_changes.sh \
> mirror_gre_flower.sh \
> mirror_gre_lag_lacp.sh \
> - mirror_gre_lib.sh \
> mirror_gre_neigh.sh \
> mirror_gre_nh.sh \
> mirror_gre.sh \
> - mirror_gre_topo_lib.sh \
> mirror_gre_vlan_bridge_1q.sh \
> mirror_gre_vlan.sh \
> - mirror_lib.sh \
> - mirror_topo_lib.sh \
> mirror_vlan.sh \
> router_bridge.sh \
> router_bridge_vlan.sh \
> @@ -50,17 +40,12 @@ TEST_PROGS = bridge_igmp.sh \
> router_multipath.sh \
> router.sh \
> router_vid_1.sh \
> - sch_ets_core.sh \
> sch_ets.sh \
> - sch_ets_tests.sh \
> - sch_tbf_core.sh \
> - sch_tbf_etsprio.sh \
> sch_tbf_ets.sh \
> sch_tbf_prio.sh \
> sch_tbf_root.sh \
> tc_actions.sh \
> tc_chains.sh \
> - tc_common.sh \
> tc_flower_router.sh \
> tc_flower.sh \
> tc_shblocks.sh \
> @@ -72,4 +57,20 @@ TEST_PROGS = bridge_igmp.sh \
> vxlan_bridge_1q.sh \
> vxlan_symmetric.sh
>
> +TEST_PROGS_EXTENDED := devlink_lib.sh \
> + ethtool_lib.sh \
> + fib_offload_lib.sh \
> + forwarding.config.sample \
> + ipip_lib.sh \
> + lib.sh \
> + mirror_gre_lib.sh \
> + mirror_gre_topo_lib.sh \
> + mirror_lib.sh \
> + mirror_topo_lib.sh \
> + sch_ets_core.sh \
> + sch_ets_tests.sh \
> + sch_tbf_core.sh \
> + sch_tbf_etsprio.sh \
> + tc_common.sh
> +
> include ../../lib.mk
> diff --git a/tools/testing/selftests/net/forwarding/ethtool_lib.sh b/tools/testing/selftests/net/forwarding/ethtool_lib.sh
> old mode 100755
> new mode 100644
> --
> 2.19.2
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net] selftests/net/forwarding: define libs as TEST_PROGS_EXTENDED
2020-03-25 10:26 ` Vadym Kochan
@ 2020-03-25 13:37 ` Hangbin Liu
0 siblings, 0 replies; 4+ messages in thread
From: Hangbin Liu @ 2020-03-25 13:37 UTC (permalink / raw)
To: Vadym Kochan; +Cc: netdev, Shuah Khan, linux-kselftest, David Miller
On Wed, Mar 25, 2020 at 12:26:33PM +0200, Vadym Kochan wrote:
> Hi Hangbin Liu,
>
> On Wed, Mar 25, 2020 at 04:41:01PM +0800, Hangbin Liu wrote:
> > The lib files should not be defined as TEST_PROGS, or we will run them
> > in run_kselftest.sh.
> >
> > Also remove ethtool_lib.sh exec permission.
> >
> > Fixes: 81573b18f26d ("selftests/net/forwarding: add Makefile to install tests")
> > Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
> Thanks for fixing it, sorry for my mistake. Actually forwarding tests
> requires interfaces list as runtime parameter or if it is defined in
> forwarding.config file, so may be they should not run by run_kselftest
> at all and only added via TEST_PROGS_EXTENDED ?
Before I run forwarding test, I usually do
`cp forwarding.config.sample forwarding.config` first. I think the runner
should aware of this.
Thanks
Hangbin
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net] selftests/net/forwarding: define libs as TEST_PROGS_EXTENDED
2020-03-25 8:41 [PATCH net] selftests/net/forwarding: define libs as TEST_PROGS_EXTENDED Hangbin Liu
2020-03-25 10:26 ` Vadym Kochan
@ 2020-03-25 19:01 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2020-03-25 19:01 UTC (permalink / raw)
To: liuhangbin; +Cc: netdev, vadym.kochan, shuah, linux-kselftest
From: Hangbin Liu <liuhangbin@gmail.com>
Date: Wed, 25 Mar 2020 16:41:01 +0800
> The lib files should not be defined as TEST_PROGS, or we will run them
> in run_kselftest.sh.
>
> Also remove ethtool_lib.sh exec permission.
>
> Fixes: 81573b18f26d ("selftests/net/forwarding: add Makefile to install tests")
> Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-03-25 19:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-25 8:41 [PATCH net] selftests/net/forwarding: define libs as TEST_PROGS_EXTENDED Hangbin Liu
2020-03-25 10:26 ` Vadym Kochan
2020-03-25 13:37 ` Hangbin Liu
2020-03-25 19:01 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.