[RFC,3/3] rpc: Move rest of RPC tests to runtest/net.rpc_tests

Commit Message

Petr Vorel April 28, 2022, 2:43 p.m. UTC

It does not make much sense to keep just 2 tests in separate
runtest file.

Signed-off-by: Petr Vorel <[e-mail]>
---
 runtest/net.rpc         | 6 ------
 runtest/net.rpc_tests   | 3 +++
 scenario_groups/network | 1 -
 testscripts/network.sh  | 4 +---
 4 files changed, 4 insertions(+), 10 deletions(-)
 delete mode 100644 runtest/net.rpc

Patch

diff --git a/runtest/net.rpc b/runtest/net.rpc
deleted file mode 100644
index d2cec5b93..000000000
--- a/runtest/net.rpc
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#DESCRIPTION:Remote Procedure Call
-#
-# PLEASE READ THE README FILE IN /rpc BEFORE RUNNING THESE.
-#
-rpc01 rpc01.sh
-rpcinfo rpcinfo01.sh
diff --git a/runtest/net.rpc_tests b/runtest/net.rpc_tests
index 84c296027..25d219dce 100644
--- a/runtest/net.rpc_tests
+++ b/runtest/net.rpc_tests
@@ -1,3 +1,6 @@ 
+rpc01 rpc01.sh
+rpcinfo rpcinfo01.sh
+
 rpc_pmap_set rpc_test.sh -c rpc_pmap_set
 rpc_pmap_unset rpc_test.sh -c rpc_pmap_unset
 rpc_pmap_getport rpc_test.sh -s rpc_svc_1 -c rpc_pmap_getport
diff --git a/scenario_groups/network b/scenario_groups/network
index 46829501f..974b9fc58 100644
--- a/scenario_groups/network
+++ b/scenario_groups/network
@@ -4,7 +4,6 @@  net.ipv6
 net.ipv6_lib
 net.tcp_cmds
 net.multicast
-net.rpc
 net.nfs
 net.rpc_tests
 net.tirpc_tests
diff --git a/testscripts/network.sh b/testscripts/network.sh
index 5cfeee844..15a4cc1c7 100755
--- a/testscripts/network.sh
+++ b/testscripts/network.sh
@@ -26,10 +26,9 @@  usage()
 	echo "  -6    IPv6 tests"
 	echo "  -m    multicast tests"
 	echo "  -n    NFS tests"
-	echo "  -r    RPC tests"
 	echo "  -s    SCTP tests"
 	echo "  -t    TCP/IP command tests"
-	echo "  -c    TI-RPC tests"
+	echo "  -c    RPC and TI-RPC tests"
 	echo "  -d    TS-RPC tests"
 	echo "  -a    Application stress tests (HTTP, SSH, DNS)"
 	echo "  -e    Interface stress tests"
@@ -56,7 +55,6 @@  do
 	6) TEST_CASES="$TEST_CASES net.ipv6 net.ipv6_lib";;
 	m) TEST_CASES="$TEST_CASES net.multicast";;
 	n) TEST_CASES="$TEST_CASES net.nfs";;
-	r) TEST_CASES="$TEST_CASES net.rpc";;
 	s) TEST_CASES="$TEST_CASES net.sctp";;
 	t) TEST_CASES="$TEST_CASES net.tcp_cmds";;
 	c) TEST_CASES="$TEST_CASES net.rpc_tests";;