File _service:tar_scm:bugfix-iproute2-cancel-some-te... of Package iproute

File _service:tar_scm:bugfix-iproute2-cancel-some-test-cases.patch of Package iproute (Revision f4e126f0309af6bf496e71ced60cdb80)

Currently displaying revision f4e126f0309af6bf496e71ced60cdb80 , Show latest

From a24381ebd69218778c07c5d37c2a748109dd56c5 Mon Sep 17 00:00:00 2001
From: gaoxingwang <gaoxingwang1@huawei.com>
Date: Tue, 31 Jan 2023 16:51:53 +0800
Subject: [PATCH] cancel some test cases that failed due to host configure

---
 Makefile                                   |  6 --
 testsuite/tests/ip/link/add_type_bareudp.t | 86 ----------------------
 testsuite/tests/ip/link/add_type_xfrm.t    | 17 -----
 testsuite/tests/tc/flower_mpls.t           | 82 ---------------------
 testsuite/tests/tc/mpls.t                  | 69 -----------------
 testsuite/tests/tc/vlan.t                  | 85 ---------------------
 6 files changed, 345 deletions(-)
 delete mode 100755 testsuite/tests/ip/link/add_type_bareudp.t
 delete mode 100755 testsuite/tests/ip/link/add_type_xfrm.t
 delete mode 100755 testsuite/tests/tc/flower_mpls.t
 delete mode 100755 testsuite/tests/tc/mpls.t
 delete mode 100755 testsuite/tests/tc/vlan.t

diff --git a/Makefile b/Makefile
index 8a17d61..29be241 100644
--- a/Makefile
+++ b/Makefile
@@ -128,12 +128,6 @@ distclean: clobber
 check: all
 	$(MAKE) -C testsuite
 	$(MAKE) -C testsuite alltests
-	@if command -v man >/dev/null 2>&1; then \
-		echo "Checking manpages for syntax errors..."; \
-		$(MAKE) -C man check; \
-	else \
-		echo "man not installed, skipping checks for syntax errors."; \
-	fi
 
 cscope:
 	cscope -b -q -R -Iinclude -sip -slib -smisc -snetem -stc
diff --git a/testsuite/tests/ip/link/add_type_bareudp.t b/testsuite/tests/ip/link/add_type_bareudp.t
deleted file mode 100755
index 8a2a1ed..0000000
--- a/testsuite/tests/ip/link/add_type_bareudp.t
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-. lib/generic.sh
-
-ts_log "[Testing Add BareUDP interface (unicast MPLS)]"
-NEW_DEV="$(rand_dev)"
-
-ts_ip "$0" "Add $NEW_DEV BareUDP interface (unicast MPLS)" link add dev $NEW_DEV type bareudp dstport 6635 ethertype mpls_uc
-
-ts_ip "$0" "Show $NEW_DEV BareUDP interface (unicast MPLS)" -d link show dev $NEW_DEV
-test_on "$NEW_DEV"
-test_on "dstport 6635"
-test_on "ethertype mpls_uc"
-test_on "nomultiproto"
-
-ts_ip "$0" "Del $NEW_DEV BareUDP interface (unicast MPLS)" link del dev $NEW_DEV
-
-
-ts_log "[Testing Add BareUDP interface (multicast MPLS)]"
-NEW_DEV="$(rand_dev)"
-
-ts_ip "$0" "Add $NEW_DEV BareUDP interface (multicast MPLS)" link add dev $NEW_DEV type bareudp dstport 6635 ethertype mpls_mc
-
-ts_ip "$0" "Show $NEW_DEV BareUDP interface (multicast MPLS)" -d link show dev $NEW_DEV
-test_on "$NEW_DEV"
-test_on "dstport 6635"
-test_on "ethertype mpls_mc"
-test_on "nomultiproto"
-
-ts_ip "$0" "Del $NEW_DEV BareUDP interface (multicast MPLS)" link del dev $NEW_DEV
-
-
-ts_log "[Testing Add BareUDP interface (unicast and multicast MPLS)]"
-NEW_DEV="$(rand_dev)"
-
-ts_ip "$0" "Add $NEW_DEV BareUDP interface (unicast and multicast MPLS)" link add dev $NEW_DEV type bareudp dstport 6635 ethertype mpls_uc multiproto
-
-ts_ip "$0" "Show $NEW_DEV BareUDP interface (unicast and multicast MPLS)" -d link show dev $NEW_DEV
-test_on "$NEW_DEV"
-test_on "dstport 6635"
-test_on "ethertype mpls_uc"
-test_on "multiproto"
-
-ts_ip "$0" "Del $NEW_DEV BareUDP interface (unicast and multicast MPLS)" link del dev $NEW_DEV
-
-
-ts_log "[Testing Add BareUDP interface (IPv4)]"
-NEW_DEV="$(rand_dev)"
-
-ts_ip "$0" "Add $NEW_DEV BareUDP interface (IPv4)" link add dev $NEW_DEV type bareudp dstport 6635 ethertype ipv4
-
-ts_ip "$0" "Show $NEW_DEV BareUDP interface (IPv4)" -d link show dev $NEW_DEV
-test_on "$NEW_DEV"
-test_on "dstport 6635"
-test_on "ethertype ip"
-test_on "nomultiproto"
-
-ts_ip "$0" "Del $NEW_DEV BareUDP interface (IPv4)" link del dev $NEW_DEV
-
-
-ts_log "[Testing Add BareUDP interface (IPv6)]"
-NEW_DEV="$(rand_dev)"
-
-ts_ip "$0" "Add $NEW_DEV BareUDP interface (IPv6)" link add dev $NEW_DEV type bareudp dstport 6635 ethertype ipv6
-
-ts_ip "$0" "Show $NEW_DEV BareUDP interface (IPv6)" -d link show dev $NEW_DEV
-test_on "$NEW_DEV"
-test_on "dstport 6635"
-test_on "ethertype ipv6"
-test_on "nomultiproto"
-
-ts_ip "$0" "Del $NEW_DEV BareUDP interface (IPv6)" link del dev $NEW_DEV
-
-
-ts_log "[Testing Add BareUDP interface (IPv4 and IPv6)]"
-NEW_DEV="$(rand_dev)"
-
-ts_ip "$0" "Add $NEW_DEV BareUDP interface (IPv4 and IPv6)" link add dev $NEW_DEV type bareudp dstport 6635 ethertype ipv4 multiproto
-
-ts_ip "$0" "Show $NEW_DEV BareUDP interface (IPv4 and IPv6)" -d link show dev $NEW_DEV
-test_on "$NEW_DEV"
-test_on "dstport 6635"
-test_on "ethertype ip"
-test_on "multiproto"
-
-ts_ip "$0" "Del $NEW_DEV BareUDP interface (IPv4 and IPv6)" link del dev $NEW_DEV
diff --git a/testsuite/tests/ip/link/add_type_xfrm.t b/testsuite/tests/ip/link/add_type_xfrm.t
deleted file mode 100755
index caba0e4..0000000
--- a/testsuite/tests/ip/link/add_type_xfrm.t
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-. lib/generic.sh
-
-ts_log "[Testing Add XFRM Interface, With IF-ID]"
-
-PHYS_DEV="lo"
-NEW_DEV="$(rand_dev)"
-IF_ID="0xf"
-
-ts_ip "$0" "Add $NEW_DEV xfrm interface"    link add dev $NEW_DEV type xfrm dev $PHYS_DEV if_id $IF_ID
-
-ts_ip "$0" "Show $NEW_DEV xfrm interface"   -d link show dev $NEW_DEV
-test_on "$NEW_DEV"
-test_on "if_id $IF_ID"
-
-ts_ip "$0" "Del $NEW_DEV xfrm interface"   link del dev $NEW_DEV
diff --git a/testsuite/tests/tc/flower_mpls.t b/testsuite/tests/tc/flower_mpls.t
deleted file mode 100755
index 430ed13..0000000
--- a/testsuite/tests/tc/flower_mpls.t
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-
-. lib/generic.sh
-
-DEV="$(rand_dev)"
-ts_ip "$0" "Add $DEV dummy interface" link add dev $DEV up type dummy
-ts_tc "$0" "Add ingress qdisc" qdisc add dev $DEV ingress
-
-reset_qdisc()
-{
-	ts_tc "$0" "Remove ingress qdisc" qdisc del dev $DEV ingress
-	ts_tc "$0" "Add ingress qdisc" qdisc add dev $DEV ingress
-}
-
-ts_tc "$0" "Add MPLS filter matching first LSE with minimal values" \
-	filter add dev $DEV ingress protocol mpls_uc flower         \
-	mpls_label 0 mpls_tc 0 mpls_bos 0 mpls_ttl 0                \
-	action drop
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
-test_on "mpls_label 0"
-test_on "mpls_tc 0"
-test_on "mpls_bos 0"
-test_on "mpls_ttl 0"
-
-reset_qdisc
-ts_tc "$0" "Add MPLS filter matching first LSE with maximal values" \
-	filter add dev $DEV ingress protocol mpls_uc flower         \
-	mpls_label 1048575 mpls_tc 7 mpls_bos 1 mpls_ttl 255        \
-	action drop
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
-test_on "mpls_label 1048575"
-test_on "mpls_tc 7"
-test_on "mpls_bos 1"
-test_on "mpls_ttl 255"
-
-reset_qdisc
-ts_tc "$0" "Add MPLS filter matching second LSE with minimal values" \
-	filter add dev $DEV ingress protocol mpls_uc flower          \
-	mpls lse depth 2 label 0 tc 0 bos 0 ttl 0                    \
-	action drop
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
-test_on "mpls"
-test_on "lse"
-test_on "depth 2"
-test_on "label 0"
-test_on "tc 0"
-test_on "bos 0"
-test_on "ttl 0"
-
-reset_qdisc
-ts_tc "$0" "Add MPLS filter matching second LSE with maximal values" \
-	filter add dev $DEV ingress protocol mpls_uc flower          \
-	mpls lse depth 2 label 1048575 tc 7 bos 1 ttl 255            \
-	action drop
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
-test_on "mpls"
-test_on "lse"
-test_on "depth 2"
-test_on "label 1048575"
-test_on "tc 7"
-test_on "bos 1"
-test_on "ttl 255"
-
-reset_qdisc
-ts_tc "$0" "Add MPLS filter matching two LSEs"                   \
-	filter add dev $DEV ingress protocol mpls_uc flower mpls \
-	lse depth 1 label 0 tc 0 bos 0 ttl 0                     \
-	lse depth 2 label 1048575 tc 7 bos 1 ttl 255             \
-	action drop
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
-test_on "mpls"
-test_on "lse"
-test_on "depth 1"
-test_on "label 0"
-test_on "tc 0"
-test_on "bos 0"
-test_on "ttl 0"
-test_on "depth 2"
-test_on "label 1048575"
-test_on "tc 7"
-test_on "bos 1"
-test_on "ttl 255"
diff --git a/testsuite/tests/tc/mpls.t b/testsuite/tests/tc/mpls.t
deleted file mode 100755
index cb25f36..0000000
--- a/testsuite/tests/tc/mpls.t
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-. lib/generic.sh
-
-DEV="$(rand_dev)"
-ts_ip "$0" "Add $DEV dummy interface" link add dev $DEV up type dummy
-ts_tc "$0" "Add ingress qdisc" qdisc add dev $DEV ingress
-
-reset_qdisc()
-{
-	ts_tc "$0" "Remove ingress qdisc" qdisc del dev $DEV ingress
-	ts_tc "$0" "Add ingress qdisc" qdisc add dev $DEV ingress
-}
-
-ts_tc "$0" "Add mpls action pop"                              \
-	filter add dev $DEV ingress protocol mpls_uc matchall \
-	action mpls pop protocol ip
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
-test_on "mpls"
-test_on "pop protocol ip pipe"
-
-reset_qdisc
-ts_tc "$0" "Add mpls action push"                        \
-	filter add dev $DEV ingress protocol ip matchall \
-	action mpls push protocol mpls_uc label 20 tc 3 bos 1 ttl 64
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
-test_on "mpls"
-test_on "push"
-test_on "protocol mpls_uc"
-test_on "label 20"
-test_on "tc 3"
-test_on "bos 1"
-test_on "ttl 64"
-test_on "pipe"
-
-reset_qdisc
-ts_tc "$0" "Add mpls action mac_push"        \
-	filter add dev $DEV ingress matchall \
-	action mpls mac_push protocol mpls_uc label 20 tc 3 bos 1 ttl 64
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
-test_on "mpls"
-test_on "mac_push"
-test_on "protocol mpls_uc"
-test_on "label 20"
-test_on "tc 3"
-test_on "bos 1"
-test_on "ttl 64"
-test_on "pipe"
-
-reset_qdisc
-ts_tc "$0" "Add mpls action modify"                           \
-	filter add dev $DEV ingress protocol mpls_uc matchall \
-	action mpls modify label 20 tc 3 ttl 64
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
-test_on "mpls"
-test_on "modify"
-test_on "label 20"
-test_on "tc 3"
-test_on "ttl 64"
-test_on "pipe"
-
-reset_qdisc
-ts_tc "$0" "Add mpls action dec_ttl"                          \
-	filter add dev $DEV ingress protocol mpls_uc matchall \
-	action mpls dec_ttl
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
-test_on "mpls"
-test_on "dec_ttl"
-test_on "pipe"
diff --git a/testsuite/tests/tc/vlan.t b/testsuite/tests/tc/vlan.t
deleted file mode 100755
index 51529b2..0000000
--- a/testsuite/tests/tc/vlan.t
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-. lib/generic.sh
-
-DEV="$(rand_dev)"
-ts_ip "$0" "Add $DEV dummy interface" link add dev $DEV up type dummy
-ts_tc "$0" "Add ingress qdisc" qdisc add dev $DEV ingress
-
-reset_qdisc()
-{
-	ts_tc "$0" "Remove ingress qdisc" qdisc del dev $DEV ingress
-	ts_tc "$0" "Add ingress qdisc" qdisc add dev $DEV ingress
-}
-
-ts_tc "$0" "Add vlan action pop" \
-	filter add dev $DEV ingress matchall action vlan pop
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
-test_on "vlan"
-test_on "pop"
-test_on "pipe"
-
-reset_qdisc
-ts_tc "$0" "Add vlan action push (default parameters)" \
-	filter add dev $DEV ingress matchall action vlan push id 5
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
-test_on "vlan"
-test_on "push"
-test_on "id 5"
-test_on "protocol 802.1Q"
-test_on "priority 0"
-test_on "pipe"
-
-reset_qdisc
-ts_tc "$0" "Add vlan action push (explicit parameters)" \
-	filter add dev $DEV ingress matchall            \
-	action vlan push id 5 protocol 802.1ad priority 2
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
-test_on "vlan"
-test_on "push"
-test_on "id 5"
-test_on "protocol 802.1ad"
-test_on "priority 2"
-test_on "pipe"
-
-reset_qdisc
-ts_tc "$0" "Add vlan action modify (default parameters)" \
-	filter add dev $DEV ingress matchall action vlan modify id 5
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
-test_on "vlan"
-test_on "modify"
-test_on "id 5"
-test_on "protocol 802.1Q"
-test_on "pipe"
-
-reset_qdisc
-ts_tc "$0" "Add vlan action modify (explicit parameters)" \
-	filter add dev $DEV ingress matchall              \
-	action vlan modify id 5 protocol 802.1ad priority 2
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
-test_on "vlan"
-test_on "modify"
-test_on "id 5"
-test_on "protocol 802.1ad"
-test_on "priority 2"
-test_on "pipe"
-
-reset_qdisc
-ts_tc "$0" "Add vlan action pop_eth" \
-	filter add dev $DEV ingress matchall action vlan pop_eth
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
-test_on "vlan"
-test_on "pop_eth"
-test_on "pipe"
-
-reset_qdisc
-ts_tc "$0" "Add vlan action push_eth"                  \
-	filter add dev $DEV ingress matchall           \
-	action vlan push_eth dst_mac 02:00:00:00:00:02 \
-	src_mac 02:00:00:00:00:01
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
-test_on "vlan"
-test_on "push_eth"
-test_on "dst_mac 02:00:00:00:00:02"
-test_on "src_mac 02:00:00:00:00:01"
-test_on "pipe"
-- 
2.27.0