Skip to contentSkip to conversation

runltp: change the default cmdfile to exec when exec runltp -N

PATCH New Xiao Yang 2 participants 5 messages Sep 3, 2018 – Sep 24, 2018

lore
Share & tools
lore

Xiao Yang

author
#0 lore raw

PATCH 1/1 runltp: change the default cmdfile to exec when exec runltp -N

From: Sun Lianwen <[email protected]>

when exec "runltp -N" and no command files were provided, the command file of "$LTPROOT/scenario_groups/network" should execute, not the "$LTPROOT/scenario_groups/default".

---
 runltp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
runltp +1 -1
index 24ea94fe5..1810c9384 100755
@@ -609,7 +609,7 @@ main()
 
 	SCENARIO_LISTS="$LTPROOT/scenario_groups/default"
         if [ "$RUN_NETEST" -eq 1 ]; then
-            SCENARIO_LISTS="$SCENARIO_LISTS $LTPROOT/scenario_groups/network"
+            SCENARIO_LISTS="$LTPROOT/scenario_groups/network"
         fi
 
     # DO NOT INDENT/DEDENT!
Signature · 1 line
2.18.0
author
#1 lore raw

PATCH 1/1 change the default command file of network

From: Sun Lianwen <[email protected]>

The options -N of runltp means "Run all the networking tests", and when exec runltp -N and no command files were provied, the cmmand file of "$LTPROOT/scenario_groups/network" should execute, so the the "$LTPROOT/ scenario_groups/network" should include the all the networking tests.

---
 scenario_groups/network | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
scenario_groups/network +18 -0
index bf857b09e..d447daf88 100644
@@ -1,4 +1,22 @@
+can
+net.features
+net.ipv6
+net.ipv6_lib
 net.tcp_cmds
 net.multicast
 net.rpc
 net.nfs
+net.rpc_tests
+net.tirpc_tests
+net.sctp
+network_commands
+net_stress.appl
+net_stress.broken_ip
+net_stress.interface
+net_stress.ipsec_dccp
+net_stress.ipsec_icmp
+net_stress.ipsec_sctp
+net_stress.ipsec_tcp
+net_stress.ipsec_udp
+net_stress.multicast
+net_stress.route
Signature · 1 line
2.18.0
#2 lore raw

PATCH 1/1 change the default command file of network

Hi Sun,

Quoted 8 lines

From: Sun Lianwen <[email protected]>

The options -N of runltp means "Run all the networking tests", and when exec runltp -N and no command files were provied, the cmmand file of "$LTPROOT/scenario_groups/network" should execute, so the the "$LTPROOT/ scenario_groups/network" should include the all the networking tests.

Quoted 21 lines
---
 scenario_groups/network | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
scenario_groups/network +8 -0
index bf857b09e..d447daf88 100644
@@ -1,4 +1,22 @@
+can
+net.features
+net.ipv6
+net.ipv6_lib
 net.tcp_cmds
 net.multicast
 net.rpc
 net.nfs
+net.rpc_tests
+net.tirpc_tests
+net.sctp
+network_commands

scenario_groups/network line 22

Quoted 10 lines
scenario_groups/network +10 -0
+net_stress.appl
+net_stress.broken_ip
+net_stress.interface
+net_stress.ipsec_dccp
+net_stress.ipsec_icmp
+net_stress.ipsec_sctp
+net_stress.ipsec_tcp
+net_stress.ipsec_udp
+net_stress.multicast
+net_stress.route

Although, network.sh is preferred way to run network tests.

+ net_stress.multicast and net_stress.route needs remove dependency on rsh, so it's a question whether add them now.

Kind regards,
Petr

#3 lore raw

PATCH 1/1 change the default command file of network

Hi Sun,

Quoted 14 lines
Quoted 8 lines

From: Sun Lianwen <[email protected]>

The options -N of runltp means "Run all the networking tests", and when exec runltp -N and no command files were provied, the cmmand file of "$LTPROOT/scenario_groups/network" should execute, so the the "$LTPROOT/ scenario_groups/network" should include the all the networking tests.

Quoted 3 lines
---
 scenario_groups/network | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

...

Quoted 4 lines

Although, network.sh is preferred way to run network tests.

+ net_stress.multicast and net_stress.route needs remove dependency on rsh, so it's a question whether add them now.

Pushed (with net_stress.multicast and net_stress.route).

Kind regards,
Petr

Applied
#4 lore raw

PATCH 1/1 runltp: change the default cmdfile to exec when exec runltp -N

In reply to Xiao Yang

Hi Sun,

Quoted 16 lines

From: Sun Lianwen <[email protected]>

when exec "runltp -N" and no command files were provided, the command file of "$LTPROOT/scenario_groups/network" should execute, not the "$LTPROOT/scenario_groups/default".

---
 runltp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
runltp +0 -0
index 24ea94fe5..1810c9384 100755

runltp main() · line 615

Quoted 8 lines
runltp +1 -1
@@ -609,7 +609,7 @@ main()
 
 	SCENARIO_LISTS="$LTPROOT/scenario_groups/default"
         if [ "$RUN_NETEST" -eq 1 ]; then
-            SCENARIO_LISTS="$SCENARIO_LISTS $LTPROOT/scenario_groups/network"
+            SCENARIO_LISTS="$LTPROOT/scenario_groups/network"
         fi
 
     # DO NOT INDENT/DEDENT!

Applied, thanks!

Using network.sh is the preferred way for running networking tests. FYI runltp is somehow broken, we have long term goal to replace it with some modern tool.

Kind regards,
Petr