Skip to contentSkip to conversation

network/tc01.sh: Add a regression test for tc qdisc command

PATCH New Yang Xu 3 participants 11 messages Jul 7, 2021 – Jul 21, 2021

lore
Share & tools
lore

Yang Xu

author
#0 lore raw

PATCH 1/1 network/tc01.sh: Add a regression test for tc qdisc command

---
 runtest/net.tcp_cmds                   |  1 +
 testcases/network/tcp_cmds/tc/Makefile | 13 +++++++
 testcases/network/tcp_cmds/tc/tc01.sh  | 51 ++++++++++++++++++++++++++
 3 files changed, 65 insertions(+)
 create mode 100644 testcases/network/tcp_cmds/tc/Makefile
 create mode 100755 testcases/network/tcp_cmds/tc/tc01.sh
runtest/net.tcp_cmds +1 -0
index db47dfd5b..7e142de11 100644
@@ -12,6 +12,7 @@ netstat netstat01.sh
 ping01 ping01.sh
 ping02 ping02.sh
 sendfile sendfile01.sh
+tc01 tc01.sh
 tcpdump tcpdump01.sh
 telnet telnet01.sh
 iptables iptables01.sh
testcases/network/tcp_cmds/tc/Makefile new file +13 -0
new file mode 100644
index 000000000..60150a1ce
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2009, Cisco Systems Inc.
+# Ngie Cooper, July 2009
+
+top_srcdir		?= ../../../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+INSTALL_TARGETS		:= tc01.sh
+
+MAKE_TARGETS		:=
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/tcp_cmds/tc/tc01.sh new file +51 -0

51 lines not on this page · raw message

Signature · 1 line
2.23.0
#1 lore raw

PATCH 1/1 network/tc01.sh: Add a regression test for tc qdisc command

Hi!

Quoted 66 lines · Yang Xu
---
 runtest/net.tcp_cmds                   |  1 +
 testcases/network/tcp_cmds/tc/Makefile | 13 +++++++
 testcases/network/tcp_cmds/tc/tc01.sh  | 51 ++++++++++++++++++++++++++
 3 files changed, 65 insertions(+)
 create mode 100644 testcases/network/tcp_cmds/tc/Makefile
 create mode 100755 testcases/network/tcp_cmds/tc/tc01.sh
runtest/net.tcp_cmds +1 -0
index db47dfd5b..7e142de11 100644
@@ -12,6 +12,7 @@ netstat netstat01.sh
 ping01 ping01.sh
 ping02 ping02.sh
 sendfile sendfile01.sh
+tc01 tc01.sh
 tcpdump tcpdump01.sh
 telnet telnet01.sh
 iptables iptables01.sh
testcases/network/tcp_cmds/tc/Makefile new file +13 -0
new file mode 100644
index 000000000..60150a1ce
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2009, Cisco Systems Inc.
+# Ngie Cooper, July 2009
+
+top_srcdir		?= ../../../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+INSTALL_TARGETS		:= tc01.sh
+
+MAKE_TARGETS		:=
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/tcp_cmds/tc/tc01.sh new file +20 -0
new file mode 100755
index 000000000..0a241843b
@@ -0,0 +1,51 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) 2021 FUJITSU LIMITED. All rights reserved.
+# Author: Yang Xu<[email protected]>
+#
+# When using "tc qdisc add dev teql0 root teql0 command", qdisc_create()
+# calls teql_qdisc_init() it imediately fails after check "if (m->dev == dev)"
+# because both devices are teql0, and it does not set qdisc_priv(sch)->m
+# leaving it zero on error path, then qdisc_create() imediately calls
+# teql_destroy() which does not expect zero master pointer and we get OOPS
+# on unpatched kernel.
+#
+# If we enable panic_on_oops, this case may crash.
+#
+# This kernel bug was introduced by
+# commit 87b60cfacf9f ("net_sched: fix error recovery at qdisc creation")
+# and has been fixed by
+# commit 1ffbc7ea9160 ("net: sched: sch_teql: fix null-pointer dereference")
+#
+

testcases/network/tcp_cmds/tc/tc01.sh line 30

Quoted 10 lines
testcases/network/tcp_cmds/tc/tc01.sh new file +10 -0
+TST_TESTFUNC="do_test"
+TST_NEEDS_ROOT=1
+TST_NEEDS_DRIVERS="sch_teql"
+TST_NEEDS_CMDS="tc modprobe"
+sys_file="/proc/sys/kernel/panic_on_oops"
+. tst_test.sh
+
+do_test()
+{
+	[ ! -f "$sys_file" ] && tst_brk TCONF "$sys_file not enabled"

Why this check is needed and also setting panic_on_oops to trigger the bug? If not, I would suggest to remove them from the test.

testcases/network/tcp_cmds/tc/tc01.sh line 37

Quoted 7 lines
testcases/network/tcp_cmds/tc/tc01.sh new file +7 -0
+	orig_value=$(cat "$sys_file")
+	if [ $orig_value = "0" ]; then
+		echo 1 > $sys_file
+	fi
+
+	tst_res TINFO "Use tc qdisc command to trigger a null-pointer dereference"
+	modprobe $TST_NEEDS_DRIVERS

setup()
{
ROD modprobe $TST_NEEDS_DRIVERS
}

testcases/network/tcp_cmds/tc/tc01.sh line 39

Quoted 2 lines
testcases/network/tcp_cmds/tc/tc01.sh new file +2 -0
+
+	tc qdisc add dev teql0 root teql0 2>/dev/null

TST_EXP_FAIL tc qdisc add dev teql0 root teql0

Quoted 13 lines
testcases/network/tcp_cmds/tc/tc01.sh new file +12 -0
+	if [ $? -eq 0 ]; then
+		tst_res TFAIL "tc qdisc command succeeded unexpectedly"
+	else
+		tst_res TPASS "the bug was not reproduced"
+	fi
+
+	if [ $orig_value = "0" ]; then
+		 echo 0 > $sys_file
+	fi
+}
+
+tst_run
#2 lore raw

PATCH 1/1 network/tc01.sh: Add a regression test for tc qdisc command

Hi Alexey

Quoted 74 lines

Hi!

Quoted 72 lines · Yang Xu
---
  runtest/net.tcp_cmds                   |  1 +
  testcases/network/tcp_cmds/tc/Makefile | 13 +++++++
  testcases/network/tcp_cmds/tc/tc01.sh  | 51 ++++++++++++++++++++++++++
  3 files changed, 65 insertions(+)

create mode 100644 testcases/network/tcp_cmds/tc/Makefile create mode 100755 testcases/network/tcp_cmds/tc/tc01.sh

runtest/net.tcp_cmds +1 -0
index db47dfd5b..7e142de11 100644
@@ -12,6 +12,7 @@ netstat netstat01.sh
  ping01 ping01.sh
  ping02 ping02.sh
  sendfile sendfile01.sh
+tc01 tc01.sh
  tcpdump tcpdump01.sh
  telnet telnet01.sh
  iptables iptables01.sh
testcases/network/tcp_cmds/tc/Makefile new file +13 -0
new file mode 100644
index 000000000..60150a1ce
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2009, Cisco Systems Inc.
+# Ngie Cooper, July 2009
+
+top_srcdir		?= ../../../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+INSTALL_TARGETS		:= tc01.sh
+
+MAKE_TARGETS		:=
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/tcp_cmds/tc/tc01.sh new file +26 -0
new file mode 100755
index 000000000..0a241843b
@@ -0,0 +1,51 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) 2021 FUJITSU LIMITED. All rights reserved.
+# Author: Yang Xu<[email protected]>
+#
+# When using "tc qdisc add dev teql0 root teql0 command", qdisc_create()
+# calls teql_qdisc_init() it imediately fails after check "if (m->dev == dev)"
+# because both devices are teql0, and it does not set qdisc_priv(sch)->m
+# leaving it zero on error path, then qdisc_create() imediately calls
+# teql_destroy() which does not expect zero master pointer and we get OOPS
+# on unpatched kernel.
+#
+# If we enable panic_on_oops, this case may crash.
+#
+# This kernel bug was introduced by
+# commit 87b60cfacf9f ("net_sched: fix error recovery at qdisc creation")
+# and has been fixed by
+# commit 1ffbc7ea9160 ("net: sched: sch_teql: fix null-pointer dereference")
+#
+
+TST_TESTFUNC="do_test"
+TST_NEEDS_ROOT=1
+TST_NEEDS_DRIVERS="sch_teql"
+TST_NEEDS_CMDS="tc modprobe"
+sys_file="/proc/sys/kernel/panic_on_oops"
+. tst_test.sh
Quoted 9 lines

testcases/network/tcp_cmds/tc/tc01.sh

Quoted 4 lines
testcases/network/tcp_cmds/tc/tc01.sh new file +4 -0
+
+do_test()
+{
+	[ ! -f "$sys_file" ]&&  tst_brk TCONF "$sys_file not enabled"

Why this check is needed and also setting panic_on_oops to trigger the bug? If not, I would suggest to remove them from the test.

Yes, I will remove it.

Quoted 13 lines

testcases/network/tcp_cmds/tc/tc01.sh line 37

Quoted 7 lines
testcases/network/tcp_cmds/tc/tc01.sh new file +7 -0
+	orig_value=$(cat "$sys_file")
+	if [ $orig_value = "0" ]; then
+		echo 1>  $sys_file
+	fi
+
+	tst_res TINFO "Use tc qdisc command to trigger a null-pointer dereference"
+	modprobe $TST_NEEDS_DRIVERS

setup()
{
ROD modprobe $TST_NEEDS_DRIVERS
}

Quoted 4 lines

testcases/network/tcp_cmds/tc/tc01.sh line 39

Quoted 2 lines
testcases/network/tcp_cmds/tc/tc01.sh new file +2 -0
+
+	tc qdisc add dev teql0 root teql0 2>/dev/null

TST_EXP_FAIL tc qdisc add dev teql0 root teql0

Will do these on v2.

Best Regards
Yang Xu

Quoted 14 lines
Quoted 14 lines
testcases/network/tcp_cmds/tc/tc01.sh new file +12 -0
+	if [ $? -eq 0 ]; then
+		tst_res TFAIL "tc qdisc command succeeded unexpectedly"
+	else
+		tst_res TPASS "the bug was not reproduced"
+	fi
+
+	if [ $orig_value = "0" ]; then
+		 echo 0>  $sys_file
+	fi
+}
+
+tst_run
author
#3 lore raw

PATCH v2 1/1 network/tc01.sh: Add a regression test for tc qdisc command

In reply to Alexey Kodanev
---
 runtest/net.tcp_cmds                   |  1 +
 testcases/network/tcp_cmds/tc/Makefile | 13 +++++++
 testcases/network/tcp_cmds/tc/tc01.sh  | 48 ++++++++++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 testcases/network/tcp_cmds/tc/Makefile
 create mode 100755 testcases/network/tcp_cmds/tc/tc01.sh
runtest/net.tcp_cmds +1 -0
index db47dfd5b..7e142de11 100644
@@ -12,6 +12,7 @@ netstat netstat01.sh
 ping01 ping01.sh
 ping02 ping02.sh
 sendfile sendfile01.sh
+tc01 tc01.sh
 tcpdump tcpdump01.sh
 telnet telnet01.sh
 iptables iptables01.sh
testcases/network/tcp_cmds/tc/Makefile new file +13 -0
new file mode 100644
index 000000000..60150a1ce
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2009, Cisco Systems Inc.
+# Ngie Cooper, July 2009
+
+top_srcdir		?= ../../../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+INSTALL_TARGETS		:= tc01.sh
+
+MAKE_TARGETS		:=
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/tcp_cmds/tc/tc01.sh new file +48 -0

48 lines not on this page · raw message

Signature · 1 line
2.23.0
#4 lore raw

PATCH v2 1/1 network/tc01.sh: Add a regression test for tc qdisc command

Quoted 2 lines · Yang Xu

---

...

testcases/network/tcp_cmds/tc/tc01.sh line 40

Quoted 7 lines
testcases/network/tcp_cmds/tc/tc01.sh new file +7 -0
+do_test()
+{
+	tst_res TINFO "Use tc qdisc command to trigger a null-pointer dereference"
+
+	EXPECT_FAIL tc qdisc add dev teql0 root teql0
+
+	dmesg | grep RIP | grep teql_destroy | grep sch_teql > /dev/null

It can be simplified to:

if dmesg | grep -q 'RIP:.*sch_teql'; then

Quoted 9 lines
testcases/network/tcp_cmds/tc/tc01.sh new file +8 -0
+	if [ $? -eq 0 ]; then
+		tst_res TFAIL "This bug is reproduced."
+	else
+		tst_res TPASS "This bug is not reproduced."
+	fi
+}
+
+tst_run
author
#5 lore raw

PATCH v3 1/1 network/tc01.sh: Add a regression test for tc qdisc command

---
 runtest/net.tcp_cmds                   |  1 +
 testcases/network/tcp_cmds/tc/Makefile | 13 +++++++
 testcases/network/tcp_cmds/tc/tc01.sh  | 47 ++++++++++++++++++++++++++
 3 files changed, 61 insertions(+)
 create mode 100644 testcases/network/tcp_cmds/tc/Makefile
 create mode 100755 testcases/network/tcp_cmds/tc/tc01.sh
runtest/net.tcp_cmds +1 -0
index db47dfd5b..7e142de11 100644
@@ -12,6 +12,7 @@ netstat netstat01.sh
 ping01 ping01.sh
 ping02 ping02.sh
 sendfile sendfile01.sh
+tc01 tc01.sh
 tcpdump tcpdump01.sh
 telnet telnet01.sh
 iptables iptables01.sh
testcases/network/tcp_cmds/tc/Makefile new file +13 -0
new file mode 100644
index 000000000..60150a1ce
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2009, Cisco Systems Inc.
+# Ngie Cooper, July 2009
+
+top_srcdir		?= ../../../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+INSTALL_TARGETS		:= tc01.sh
+
+MAKE_TARGETS		:=
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/tcp_cmds/tc/tc01.sh new file +47 -0

47 lines not on this page · raw message

Signature · 1 line
2.23.0
#6 lore raw

PATCH v3 1/1 network/tc01.sh: Add a regression test for tc qdisc command

Hi Xu!

Quoted 27 lines · Yang Xu
---
 runtest/net.tcp_cmds                   |  1 +
 testcases/network/tcp_cmds/tc/Makefile | 13 +++++++
 testcases/network/tcp_cmds/tc/tc01.sh  | 47 ++++++++++++++++++++++++++
 3 files changed, 61 insertions(+)
 create mode 100644 testcases/network/tcp_cmds/tc/Makefile
 create mode 100755 testcases/network/tcp_cmds/tc/tc01.sh
runtest/net.tcp_cmds +1 -0
index db47dfd5b..7e142de11 100644
@@ -12,6 +12,7 @@ netstat netstat01.sh
 ping01 ping01.sh
 ping02 ping02.sh
 sendfile sendfile01.sh
+tc01 tc01.sh
 tcpdump tcpdump01.sh
 telnet telnet01.sh
 iptables iptables01.sh
testcases/network/tcp_cmds/tc/Makefile new file +0 -0
new file mode 100644
index 000000000..60150a1ce

testcases/network/tcp_cmds/tc/Makefile line 3

Quoted 3 lines
testcases/network/tcp_cmds/tc/Makefile new file +3 -0
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2009, Cisco Systems Inc.
+# Ngie Cooper, July 2009

Since it's a new Makefile, not sure if it should be copy-pasted from the other tests...

testcases/network/tcp_cmds/tc/Makefile line 11

Quoted 8 lines
testcases/network/tcp_cmds/tc/Makefile new file +8 -0
+
+top_srcdir		?= ../../../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+INSTALL_TARGETS		:= tc01.sh
+
+MAKE_TARGETS		:=

There is no point adding an empty make targets here.

Quoted 46 lines
testcases/network/tcp_cmds/tc/Makefile new file +2 -0
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/tcp_cmds/tc/tc01.sh new file +37 -0
new file mode 100755
index 000000000..a9da45b41
@@ -0,0 +1,47 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) 2021 FUJITSU LIMITED. All rights reserved.
+# Author: Yang Xu<[email protected]>
+#
+# When using "tc qdisc add dev teql0 root teql0 command", qdisc_create()
+# calls teql_qdisc_init() it imediately fails after check "if (m->dev == dev)"
+# because both devices are teql0, and it does not set qdisc_priv(sch)->m
+# leaving it zero on error path, then qdisc_create() imediately calls
+# teql_destroy() which does not expect zero master pointer and we get OOPS
+# on unpatched kernel.
+#
+# If we enable panic_on_oops, this case may crash.
+#
+# This kernel bug was introduced by
+# commit 87b60cfacf9f ("net_sched: fix error recovery at qdisc creation")
+# and has been fixed by
+# commit 1ffbc7ea9160 ("net: sched: sch_teql: fix null-pointer dereference")
+#
+
+TST_SETUP="setup"
+TST_TESTFUNC="do_test"
+TST_NEEDS_ROOT=1
+TST_NEEDS_DRIVERS="sch_teql"
+TST_NEEDS_CMDS="tc modprobe dmesg grep"
+
+. tst_test.sh
+
+setup()
+{
+	ROD modprobe $TST_NEEDS_DRIVERS
+}
+
+do_test()
+{
+	tst_res TINFO "Use tc qdisc command to trigger a null-pointer dereference"
+

testcases/network/tcp_cmds/tc/tc01.sh line 47

Quoted 10 lines
testcases/network/tcp_cmds/tc/tc01.sh new file +10 -0
+	EXPECT_FAIL tc qdisc add dev teql0 root teql0
+
+	if dmesg | grep -q 'RIP:.*sch_teql'; then
+		tst_res TFAIL "This bug is reproduced."
+	else
+		tst_res TPASS "This bug is not reproduced."
+	fi
+}
+
+tst_run

For the rest:

author
#7 lore raw

PATCH v4 1/2 network/tc01.sh: Add a regression test for tc qdisc command

---
 runtest/net.tcp_cmds                   |  1 +
 testcases/network/tcp_cmds/tc/Makefile | 10 ++++++
 testcases/network/tcp_cmds/tc/tc01.sh  | 47 ++++++++++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 testcases/network/tcp_cmds/tc/Makefile
 create mode 100755 testcases/network/tcp_cmds/tc/tc01.sh
runtest/net.tcp_cmds +1 -0
index db47dfd5b..7e142de11 100644
@@ -12,6 +12,7 @@ netstat netstat01.sh
 ping01 ping01.sh
 ping02 ping02.sh
 sendfile sendfile01.sh
+tc01 tc01.sh
 tcpdump tcpdump01.sh
 telnet telnet01.sh
 iptables iptables01.sh
testcases/network/tcp_cmds/tc/Makefile new file +10 -0
new file mode 100644
index 000000000..b4d8b86ee
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) 2021 FUJITSU LIMITED. All rights reserved.
+
+top_srcdir		?= ../../../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+INSTALL_TARGETS		:= tc01.sh
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/tcp_cmds/tc/tc01.sh new file +47 -0

47 lines not on this page · raw message

Signature · 1 line
2.23.0
#8 lore raw

PATCH v4 1/2 network/tc01.sh: Add a regression test for tc qdisc command

Hi Alexey

Thanks for your review, I have merged this patch.

Best Regards
Yang Xu

Quoted 91 lines
---
  runtest/net.tcp_cmds                   |  1 +
  testcases/network/tcp_cmds/tc/Makefile | 10 ++++++
  testcases/network/tcp_cmds/tc/tc01.sh  | 47 ++++++++++++++++++++++++++
  3 files changed, 58 insertions(+)

create mode 100644 testcases/network/tcp_cmds/tc/Makefile create mode 100755 testcases/network/tcp_cmds/tc/tc01.sh

runtest/net.tcp_cmds +1 -0
index db47dfd5b..7e142de11 100644
@@ -12,6 +12,7 @@ netstat netstat01.sh
  ping01 ping01.sh
  ping02 ping02.sh
  sendfile sendfile01.sh
+tc01 tc01.sh
  tcpdump tcpdump01.sh
  telnet telnet01.sh
  iptables iptables01.sh
testcases/network/tcp_cmds/tc/Makefile new file +10 -0
new file mode 100644
index 000000000..b4d8b86ee
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) 2021 FUJITSU LIMITED. All rights reserved.
+
+top_srcdir		?= ../../../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+INSTALL_TARGETS		:= tc01.sh
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/tcp_cmds/tc/tc01.sh new file +47 -0
new file mode 100755
index 000000000..a9da45b41
@@ -0,0 +1,47 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) 2021 FUJITSU LIMITED. All rights reserved.
+# Author: Yang Xu<[email protected]>
+#
+# When using "tc qdisc add dev teql0 root teql0 command", qdisc_create()
+# calls teql_qdisc_init() it imediately fails after check "if (m->dev == dev)"
+# because both devices are teql0, and it does not set qdisc_priv(sch)->m
+# leaving it zero on error path, then qdisc_create() imediately calls
+# teql_destroy() which does not expect zero master pointer and we get OOPS
+# on unpatched kernel.
+#
+# If we enable panic_on_oops, this case may crash.
+#
+# This kernel bug was introduced by
+# commit 87b60cfacf9f ("net_sched: fix error recovery at qdisc creation")
+# and has been fixed by
+# commit 1ffbc7ea9160 ("net: sched: sch_teql: fix null-pointer dereference")
+#
+
+TST_SETUP="setup"
+TST_TESTFUNC="do_test"
+TST_NEEDS_ROOT=1
+TST_NEEDS_DRIVERS="sch_teql"
+TST_NEEDS_CMDS="tc modprobe dmesg grep"
+
+. tst_test.sh
+
+setup()
+{
+	ROD modprobe $TST_NEEDS_DRIVERS
+}
+
+do_test()
+{
+	tst_res TINFO "Use tc qdisc command to trigger a null-pointer dereference"
+
+	EXPECT_FAIL tc qdisc add dev teql0 root teql0
+
+	if dmesg | grep -q 'RIP:.*sch_teql'; then
+		tst_res TFAIL "This bug is reproduced."
+	else
+		tst_res TPASS "This bug is not reproduced."
+	fi
+}
+
+tst_run
author
#9 lore raw

PATCH v4 2/2 testcase/network: Remove useless MAKE_TARGETS

In reply to Yang Xu
---
 testcases/network/dhcp/Makefile                           | 2 --
 testcases/network/iproute/Makefile                        | 2 --
 testcases/network/multicast/mc_cmds/Makefile              | 2 --
 testcases/network/nfs/nfsstat01/Makefile                  | 2 --
 testcases/network/rpc/basic_tests/rpcinfo/Makefile        | 2 --
 testcases/network/rpc/basic_tests/rup/Makefile            | 2 --
 testcases/network/rpc/basic_tests/rusers/Makefile         | 2 --
 testcases/network/rpc/rpc-tirpc/Makefile                  | 2 --
 testcases/network/stress/broken_ip/Makefile               | 2 --
 testcases/network/stress/dns/Makefile                     | 2 --
 testcases/network/stress/ftp/Makefile                     | 2 --
 testcases/network/stress/http/Makefile                    | 2 --
 testcases/network/stress/icmp/multi-diffip/Makefile       | 2 --
 testcases/network/stress/icmp/multi-diffnic/Makefile      | 2 --
 testcases/network/stress/interface/Makefile               | 2 --
 testcases/network/stress/multicast/grp-operation/Makefile | 2 --
 testcases/network/stress/multicast/packet-flood/Makefile  | 2 --
 testcases/network/stress/multicast/query-flood/Makefile   | 2 --
 testcases/network/stress/tcp/multi-diffip/Makefile        | 2 --
 testcases/network/stress/tcp/multi-diffnic/Makefile       | 2 --
 testcases/network/stress/tcp/multi-diffport/Makefile      | 2 --
 testcases/network/stress/tcp/multi-sameport/Makefile      | 2 --
 testcases/network/stress/tcp/uni-basic/Makefile           | 2 --
 testcases/network/stress/tcp/uni-dsackoff/Makefile        | 2 --
 testcases/network/stress/tcp/uni-pktlossdup/Makefile      | 2 --
 testcases/network/stress/tcp/uni-sackoff/Makefile         | 2 --
 testcases/network/stress/tcp/uni-smallsend/Makefile       | 2 --
 testcases/network/stress/tcp/uni-tso/Makefile             | 2 --
 testcases/network/stress/tcp/uni-winscale/Makefile        | 1 -
 testcases/network/stress/udp/multi-diffip/Makefile        | 2 --
 testcases/network/stress/udp/multi-diffnic/Makefile       | 2 --
 testcases/network/stress/udp/multi-diffport/Makefile      | 2 --
 testcases/network/stress/udp/uni-basic/Makefile           | 2 --
 testcases/network/tcp_cmds/host/Makefile                  | 2 --
 testcases/network/tcp_cmds/ipneigh/Makefile               | 2 --
 testcases/network/tcp_cmds/netstat/Makefile               | 2 --
 testcases/network/tcp_cmds/ping/Makefile                  | 2 --
 testcases/network/tcp_cmds/tcpdump/Makefile               | 2 --
 testcases/network/tcp_cmds/telnet/Makefile                | 2 --
 testcases/network/xinetd/Makefile                         | 2 --
 40 files changed, 79 deletions(-)
testcases/network/dhcp/Makefile +0 -2
index 3750e698b..399301910 100644
@@ -8,6 +8,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= dhcp_lib.sh dhcpd_tests.sh dnsmasq_tests.sh
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/iproute/Makefile +0 -2
index a18c7099e..30d8e11ed 100644
@@ -8,6 +8,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= ip_tests.sh
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/multicast/mc_cmds/Makefile +0 -2
index f4142ad0c..4d9e1bea8 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS	:= mc_cmds.sh
 
-MAKE_TARGETS	:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/nfs/nfsstat01/Makefile +0 -2
index 6c6c4fd9c..cfde9aee9 100644
@@ -8,6 +8,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= nfsstat01
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/rpc/basic_tests/rpcinfo/Makefile +0 -2
index 6b844038b..8a8a11402 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= rpcinfo01.sh
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/rpc/basic_tests/rup/Makefile +0 -2
index a4dee681a..e0ebaaa58 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= rup01.sh
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/rpc/basic_tests/rusers/Makefile +0 -2
index b5f69f596..345365171 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= rusers01.sh
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/rpc/rpc-tirpc/Makefile +0 -2
index 4fb080965..d2e1318c6 100644
@@ -7,6 +7,4 @@ include	$(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= rpc_test.sh
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_trunk_target.mk
testcases/network/stress/broken_ip/Makefile +0 -2
index e530c7c13..0a5207a94 100644
@@ -8,6 +8,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= broken_ip*
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/dns/Makefile +0 -2
index a345f12fa..4c34ee24b 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= *.sh
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/ftp/Makefile +0 -2
index 38cbd13a5..9257ef9c6 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= *.sh
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/http/Makefile +0 -2
index 4529865e1..f354293b0 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= *.sh
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/icmp/multi-diffip/Makefile +0 -2
index d0bfb3701..5fd73aadf 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= icmp*
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/icmp/multi-diffnic/Makefile +0 -2
index 5eb10125f..63389ab55 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= icmp*
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/interface/Makefile +0 -2
index 4ae3e7b6d..7ebeec142 100644
@@ -8,6 +8,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= *.sh
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/multicast/grp-operation/Makefile +0 -2
index a31290115..267dca06a 100644
@@ -8,6 +8,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= mcast*.sh
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/multicast/packet-flood/Makefile +0 -2
index e99a8efce..e6c8115f4 100644
@@ -8,6 +8,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= mcast*
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/multicast/query-flood/Makefile +0 -2
index e99a8efce..e6c8115f4 100644
@@ -8,6 +8,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= mcast*
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/tcp/multi-diffip/Makefile +0 -2
index ccf58633d..727b2ccb7 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= tcp*
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/tcp/multi-diffnic/Makefile +0 -2
index b0894ac67..936562841 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= tcp*
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/tcp/multi-diffport/Makefile +0 -2
index cfd508502..4f1b77beb 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= tcp*
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/tcp/multi-sameport/Makefile +0 -2
index dd6f269e3..be2472f92 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= tcp*
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/tcp/uni-basic/Makefile +0 -2
index 310e8f047..f5e692091 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= tcp*
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/tcp/uni-dsackoff/Makefile +0 -2
index 4b858b1d6..f8fe935b9 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= tcp*
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/tcp/uni-pktlossdup/Makefile +0 -2
index d6511f753..10525cf3c 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= tcp*
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/tcp/uni-sackoff/Makefile +0 -2
index ef469d633..0d8735872 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= tcp*
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/tcp/uni-smallsend/Makefile +0 -2
index ba5fbbb43..de4bb0cd5 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= tcp*
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/tcp/uni-tso/Makefile +0 -2
index 7aafd1613..cd70ed22f 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= tcp*
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/tcp/uni-winscale/Makefile +0 -1
index 895848604..b29a4b2ef 100644
@@ -26,6 +26,5 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= tcp*
 
-MAKE_TARGETS		:=
 
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/udp/multi-diffip/Makefile +0 -2
index 654704021..2592c71b1 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= udp*
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/udp/multi-diffnic/Makefile +0 -2
index d542555a2..5bc2107a7 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= udp*
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/udp/multi-diffport/Makefile +0 -2
index 66714c95c..118e54cb6 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= udp*
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/stress/udp/uni-basic/Makefile +0 -2
index 4f9c91e01..7f6ae674d 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= udp*
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/tcp_cmds/host/Makefile +0 -2
index 53eed9861..453951e0d 100644
@@ -8,6 +8,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= host01.sh
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/tcp_cmds/ipneigh/Makefile +0 -2
index 64cc87b92..cf3f731a8 100644
@@ -8,6 +8,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= ipneigh01.sh
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/tcp_cmds/netstat/Makefile +0 -2
index 9b46ebb18..b29bea50c 100644
@@ -8,6 +8,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= netstat01.sh
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/tcp_cmds/ping/Makefile +0 -2
index f8293e573..ed00eb16a 100644
@@ -10,6 +10,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 INSTALL_TARGETS		:= ping01.sh \
 			   ping02.sh
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/tcp_cmds/tcpdump/Makefile +0 -2
index ed06cb81f..747d1e5e9 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= tcpdump01.sh
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/tcp_cmds/telnet/Makefile +0 -2
index fefdf6be8..90e879de2 100644
@@ -26,6 +26,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= telnet01.sh
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/network/xinetd/Makefile +0 -2
index f0ddf1446..b789b2a3a 100644
@@ -8,6 +8,4 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_TARGETS		:= xinetd_tests.sh
 
-MAKE_TARGETS		:=
-
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
Signature · 1 line
2.23.0
#10 lore raw

PATCH v4 2/2 testcase/network: Remove useless MAKE_TARGETS

Hi Xu,

obviously correct, merged.

Kind regards,
Petr