165 lines
4.5 KiB
Diff
165 lines
4.5 KiB
Diff
From 6295c753ea657f99ebe2fa58b3185003727ed272 Mon Sep 17 00:00:00 2001
|
|
From: rpm-build <rpm-build>
|
|
Date: Sat, 27 May 2023 08:59:47 +0800
|
|
Subject: [PATCH] cancel some test cases that failed due to host configure
|
|
|
|
---
|
|
Makefile | 6 -----
|
|
testsuite/tests/ip/link/add_type_xfrm.t | 32 -----------------------
|
|
testsuite/tests/ip/netns/set_nsid.t | 22 ----------------
|
|
testsuite/tests/ip/netns/set_nsid_batch.t | 18 -------------
|
|
testsuite/tests/tc/dsmark.t | 31 ----------------------
|
|
5 files changed, 109 deletions(-)
|
|
delete mode 100755 testsuite/tests/ip/link/add_type_xfrm.t
|
|
delete mode 100755 testsuite/tests/ip/netns/set_nsid.t
|
|
delete mode 100755 testsuite/tests/ip/netns/set_nsid_batch.t
|
|
delete mode 100755 testsuite/tests/tc/dsmark.t
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 0b79b1f..67b4a2c 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -110,12 +110,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_xfrm.t b/testsuite/tests/ip/link/add_type_xfrm.t
|
|
deleted file mode 100755
|
|
index 78ce28e..0000000
|
|
--- a/testsuite/tests/ip/link/add_type_xfrm.t
|
|
+++ /dev/null
|
|
@@ -1,32 +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
|
|
-
|
|
-
|
|
-ts_log "[Testing Add XFRM Interface, No 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
|
|
-
|
|
-ts_ip "$0" "Show $NEW_DEV xfrm interface" -d link show dev $NEW_DEV
|
|
-test_on "$NEW_DEV"
|
|
-test_on_not "if_id $IF_ID"
|
|
-
|
|
-ts_ip "$0" "Del $NEW_DEV xfrm interface" link del dev $NEW_DEV
|
|
diff --git a/testsuite/tests/ip/netns/set_nsid.t b/testsuite/tests/ip/netns/set_nsid.t
|
|
deleted file mode 100755
|
|
index 8f8c779..0000000
|
|
--- a/testsuite/tests/ip/netns/set_nsid.t
|
|
+++ /dev/null
|
|
@@ -1,22 +0,0 @@
|
|
-#!/bin/sh
|
|
-
|
|
-. lib/generic.sh
|
|
-
|
|
-ts_log "[Testing netns nsid]"
|
|
-
|
|
-NS=testnsid
|
|
-NSID=99
|
|
-
|
|
-ts_ip "$0" "Add new netns $NS" netns add $NS
|
|
-ts_ip "$0" "Set $NS nsid to $NSID" netns set $NS $NSID
|
|
-
|
|
-ts_ip "$0" "List netns" netns list
|
|
-test_on "$NS \(id: $NSID\)"
|
|
-
|
|
-ts_ip "$0" "List netns without explicit list or show" netns
|
|
-test_on "$NS \(id: $NSID\)"
|
|
-
|
|
-ts_ip "$0" "List nsid" netns list-id
|
|
-test_on "$NSID \(iproute2 netns name: $NS\)"
|
|
-
|
|
-ts_ip "$0" "Delete netns $NS" netns del $NS
|
|
diff --git a/testsuite/tests/ip/netns/set_nsid_batch.t b/testsuite/tests/ip/netns/set_nsid_batch.t
|
|
deleted file mode 100755
|
|
index 196fd4b..0000000
|
|
--- a/testsuite/tests/ip/netns/set_nsid_batch.t
|
|
+++ /dev/null
|
|
@@ -1,18 +0,0 @@
|
|
-#!/bin/sh
|
|
-
|
|
-. lib/generic.sh
|
|
-
|
|
-ts_log "[Testing netns nsid in batch mode]"
|
|
-
|
|
-NS=testnsid
|
|
-NSID=99
|
|
-BATCHFILE=`mktemp`
|
|
-
|
|
-echo "netns add $NS" >> $BATCHFILE
|
|
-echo "netns set $NS $NSID" >> $BATCHFILE
|
|
-echo "netns list-id" >> $BATCHFILE
|
|
-ts_ip "$0" "Add ns, set nsid and list in batch mode" -b $BATCHFILE
|
|
-test_on "nsid $NSID \(iproute2 netns name: $NS\)"
|
|
-rm -f $BATCHFILE
|
|
-
|
|
-ts_ip "$0" "Delete netns $NS" netns del $NS
|
|
diff --git a/testsuite/tests/tc/dsmark.t b/testsuite/tests/tc/dsmark.t
|
|
deleted file mode 100755
|
|
index 3f1d5ef..0000000
|
|
--- a/testsuite/tests/tc/dsmark.t
|
|
+++ /dev/null
|
|
@@ -1,31 +0,0 @@
|
|
-#!/bin/sh
|
|
-# vim: ft=sh
|
|
-
|
|
-. lib/generic.sh
|
|
-
|
|
-ts_qdisc_available "dsmark"
|
|
-if [ $? -eq 0 ]; then
|
|
- ts_log "dsmark: Unsupported by $TC, skipping"
|
|
- exit 127
|
|
-fi
|
|
-
|
|
-ts_tc "dsmark" "dsmark root qdisc creation" \
|
|
- qdisc add dev $DEV root handle 10:0 \
|
|
- dsmark indices 64 default_index 1 set_tc_index
|
|
-
|
|
-ts_tc "dsmark" "dsmark class 1 creation" \
|
|
- class change dev $DEV parent 10:0 classid 10:12 \
|
|
- dsmark mask 0xff value 2
|
|
-
|
|
-ts_tc "dsmark" "dsmark class 2 creation" \
|
|
- class change dev $DEV parent 10:0 classid 10:13 \
|
|
- dsmark mask 0xfc value 4
|
|
-
|
|
-ts_tc "dsmark" "dsmark dump qdisc" \
|
|
- qdisc list dev $DEV
|
|
-
|
|
-ts_tc "dsmark" "dsmark dump class" \
|
|
- class list dev $DEV parent 10:0
|
|
-
|
|
-ts_tc "dsmark" "generic qdisc tree deletion" \
|
|
- qdisc del dev $DEV root
|
|
--
|
|
2.27.0
|
|
|