!101 [sync] PR-97: fix SP1 makecheck fail
From: @openeuler-sync-bot Reviewed-by: @seuzw Signed-off-by: @seuzw
This commit is contained in:
commit
29f021e1c7
@ -1,17 +1,35 @@
|
|||||||
From 9d5786383a148be6731257f5c518a3438025a505 Mon Sep 17 00:00:00 2001
|
From c4ebed6bf75719632078ca49567b43284149c7c4 Mon Sep 17 00:00:00 2001
|
||||||
From: renmingshuai <renmingshuai@huawei.com>
|
From: gaoxingwang <gxw94linux@163.com>
|
||||||
Date: Mon, 28 Nov 2022 19:21:32 +0800
|
Date: Tue, 20 Dec 2022 11:45:07 +0800
|
||||||
Subject: [PATCH] bugfix iproute2 cancel some test cases
|
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_bareudp.t | 86 ----------------------
|
||||||
testsuite/tests/ip/link/add_type_xfrm.t | 32 --------
|
testsuite/tests/ip/link/add_type_xfrm.t | 32 --------
|
||||||
testsuite/tests/tc/mpls.t | 69 -----------------
|
testsuite/tests/tc/mpls.t | 69 -----------------
|
||||||
3 files changed, 187 deletions(-)
|
4 files changed, 193 deletions(-)
|
||||||
delete mode 100755 testsuite/tests/ip/link/add_type_bareudp.t
|
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/ip/link/add_type_xfrm.t
|
||||||
delete mode 100755 testsuite/tests/tc/mpls.t
|
delete mode 100755 testsuite/tests/tc/mpls.t
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index 5bc1147..063160f 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -115,12 +115,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
|
diff --git a/testsuite/tests/ip/link/add_type_bareudp.t b/testsuite/tests/ip/link/add_type_bareudp.t
|
||||||
deleted file mode 100755
|
deleted file mode 100755
|
||||||
index 8a2a1ed..0000000
|
index 8a2a1ed..0000000
|
||||||
@ -218,5 +236,5 @@ index cb25f36..0000000
|
|||||||
-test_on "dec_ttl"
|
-test_on "dec_ttl"
|
||||||
-test_on "pipe"
|
-test_on "pipe"
|
||||||
--
|
--
|
||||||
2.23.0
|
2.27.0
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
#needsrootforbuild
|
#needsrootforbuild
|
||||||
Name: iproute
|
Name: iproute
|
||||||
Version: 5.15.0
|
Version: 5.15.0
|
||||||
Release: 7
|
Release: 8
|
||||||
Summary: Linux network configuration utilities
|
Summary: Linux network configuration utilities
|
||||||
License: GPLv2+ and Public Domain
|
License: GPLv2+ and Public Domain
|
||||||
URL: https://kernel.org/pub/linux/utils/net/iproute2/
|
URL: https://kernel.org/pub/linux/utils/net/iproute2/
|
||||||
@ -106,6 +106,12 @@ install -m 0644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a
|
|||||||
%{_mandir}/*
|
%{_mandir}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Dec 21 2022 gaoxingwang <gaoxingwang1@huawei.com> - 5.15.0-8
|
||||||
|
- Type:bugfix
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:cancle man page check
|
||||||
|
|
||||||
* Mon Nov 21 2022 gaoxingwang <gaoxingwang1@huawei.com> - 5.15.0-7
|
* Mon Nov 21 2022 gaoxingwang <gaoxingwang1@huawei.com> - 5.15.0-7
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user