From 4cec9db0b4085c1b2e8072bac2d07843a9285ac1 Mon Sep 17 00:00:00 2001
From: Vadim Kochan <vadim4j@gmail.com>
Date: Thu, 15 Jan 2015 18:59:22 +0200
Subject: [PATCH] tests: Add few 'ip link' related tests

Added two tests which checks the following fixed issues:

    1) Bug when not possible add new virtual interface via:

        $ ip link add dev XXX type

       It was fixed a few releases ago.

    2) Crash on older kernels when VF rate info does not exist:

        $ ip link show

       Used dump file from William Dauchy <william@gandi.net>:
           testsuite/tests/ip/link/dev_wo_vf_rate.nl

       So 'ip link show' replaced by 'ip -d monitor file ...' which does
       the same thing.

Also added new func in testsuite/lib/generic.sh to gen new random dev name.

Added 'clean' dependency on running all tests.

Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
---
 testsuite/Makefile                            |   3 ++-
 testsuite/lib/generic.sh                      |   8 +++++++-
 testsuite/tests/ip/link/dev_wo_vf_rate.nl     | Bin 0 -> 14076 bytes
 testsuite/tests/ip/link/new_link.t            |  11 +++++++++++
 testsuite/tests/ip/link/show_dev_wo_vf_rate.t |   6 ++++++
 5 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 testsuite/tests/ip/link/dev_wo_vf_rate.nl
 create mode 100755 testsuite/tests/ip/link/new_link.t
 create mode 100755 testsuite/tests/ip/link/show_dev_wo_vf_rate.t

diff --git a/testsuite/Makefile b/testsuite/Makefile
index 2ba954737..a2c8a2d9c 100644
--- a/testsuite/Makefile
+++ b/testsuite/Makefile
@@ -31,12 +31,13 @@ listtests:
 alltests: $(TESTS)
 
 clean:
+	@echo "Removing $(RESULTS_DIR) dir ..."
 	@rm -rf $(RESULTS_DIR)
 
 distclean: clean
 	echo "Entering iproute2" && cd iproute2 && $(MAKE) distclean && cd ..;
 
-$(TESTS):
+$(TESTS): clean
 	@mkdir -p $(RESULTS_DIR)
 	
 	@for d in $(TESTS_DIR); do \
diff --git a/testsuite/lib/generic.sh b/testsuite/lib/generic.sh
index 8f76e492d..3473cc134 100644
--- a/testsuite/lib/generic.sh
+++ b/testsuite/lib/generic.sh
@@ -62,8 +62,9 @@ ts_ip()
 	TMP_OUT=`mktemp /tmp/tc_testsuite.XXXXXX` || exit
 
 	$IP $@ 2> $TMP_ERR > $TMP_OUT
+        RET=$?
 
-	if [ -s $TMP_ERR ]; then
+	if [ -s $TMP_ERR ] || [ "$RET" != "0" ]; then
 		ts_err "${SCRIPT}: ${DESC} failed:"
 		ts_err "command: $IP $@"
 		ts_err "stderr output:"
@@ -91,3 +92,8 @@ ts_qdisc_available()
 		return 1;
 	fi
 }
+
+rand_dev()
+{
+    echo "dev-$(tr -dc "[:alpha:]" < /dev/urandom | head -c 6)"
+}
diff --git a/testsuite/tests/ip/link/dev_wo_vf_rate.nl b/testsuite/tests/ip/link/dev_wo_vf_rate.nl
new file mode 100644
index 0000000000000000000000000000000000000000..40fa87ff1b158fb972e064efb38f76b0e9a56697
GIT binary patch
literal 14076
zc-rmSU1$_X902hD?CxFm?qZCZ#He8X!sIE$Xk+}K9QtI?f)G$dh|yef2d9a8Dbfla
zLaUJ090jE>EiDugLEA!o^TDr&K2>}Z5%kg5LVZ!p`k&buv)P$!?k*c{lguCP=I(ZO
zW_M@icQbp}3INMtDt>tTN8g<fNf@*M8o_{T_`Yog-C~&ppAP_G`Rc%g{0M*z%h>xE
z=5|w-89&DYFs}{k`1|!d{fw1h!v>bdU?WTGAr5Co&W>fqGOz_2ASmKj9Vf|;gGLgM
zQ^W~8vh}!$KF0rYA7RFQSk20&AyQFC*mZ>+C1WjIz-v|TTssj&@lZw3HdQpX0lYB*
znv5j2xw~f*wz}g0{D)oTc(1$tDsRIyuZ8&P!z}RYayPGoQQVz?;$gx*KWYH)edQe=
z-A>E!A0z#I3o)_(=?ID)I9B5o?$d<h(jT2MzcGaMg8hwd3ns92GlguY>&7zHPSlyW
z&zbhkpmfIO&e$Gj>TvJVXMr2@?|Wc<;puzTF*9Sf=AC;FTw@%^?KRXG>p8%o%K*a@
zjxqM?h+<!LB+E30mQRD$L4(#qQ&nBn)-#v<GldP!tPP()3tlGz?R+#IGe#~x`!T=?
zkKw?+4@}Q%>(jWc$CjM3-YuVg-tk+vx#3=L`NUT~@sv+I<&zM-tTYr}7KN8zt^#<F
zk-en-Kgdf~$Q->SievP9DNOj2XEvn1;YPa=4aY2=rh-l!qty&9CtiV<GhLHvy)<Pn
zx6PlIkGPkQgS~txd$|U;WA}yMTLAVbrgzPAoRh8LuUGMu)<a`YLwRL1*QgK9<mKJ$
zrWXft^XKKsFaD4HGr73Eyort4b3D3UiWV%+P>vAbHHn6o#w=cn^Jp~7E2o<IWnBec
z7A)CIIx-C2nB2=Q;U#UO7#~?)FJH!>taU7~wR9XthjK$B{X+xi3oz?iR=6qVM}9X`
z{G1Oa0D6sZ=WW!@l<&IIdT8{P`5m3Cp_>shXWE+f*0^jA?L$#8M|>M($+RhsG``+M
z#GJ6^Xt4^+At9R+lg-&41#`rjNo5Y51NPz5PnNuIA|!Lf+_#UvP}QZ1gf>Sqr{}gd
zN1HQcPFyx;M~%%XQgg(*M!KKI&$$PWq1OtxJ=y&<-*xTbjZ;ZoM4L0soYL3PHD{r%
zt;j6qq!+;2s!lfN^C--7#JvucIX1VTG>_)kK66UioT|-9PiS+NsyU+yb8Ok1?rP0R
zb92%jbEe<_p4}Sw{vCOGP_|}1gIcptLs(-$OC-J7yDz%l=&0Nqn4>od*_)j;_vVoH
zX0dpa-LJh_s@@b8-q7Dy#P9nnuyserPUdr``Umo(*#Y5>d#_3U|7E#rt4jZWDeU>>
zQro+>@3cK-k9}B)b8TFYp34mmXQKCec?;6GcS8HKRQ<W2@F(T*hyDj-F!NP^SJ$qZ
zx-)qr*YI<Pc4x7;a}C{jUefMpcc$E__qdb7)-9aN<@24jo$qvibA8j_SF}5e#hpoX
Mr~X^*&Qf*fBlx5C+yDRo

literal 0
Hc-jL100001

diff --git a/testsuite/tests/ip/link/new_link.t b/testsuite/tests/ip/link/new_link.t
new file mode 100755
index 000000000..549ff2561
--- /dev/null
+++ b/testsuite/tests/ip/link/new_link.t
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+source lib/generic.sh
+
+ts_log "[Testing add/del virtual links]"
+
+NEW_DEV="$(rand_dev)"
+
+ts_ip "$0" "Add $NEW_DEV dummy interface"  link add dev $NEW_DEV type dummy
+ts_ip "$0" "Show $NEW_DEV dummy interface" link show dev $NEW_DEV
+ts_ip "$0" "Del $NEW_DEV dummy interface"  link del dev $NEW_DEV
diff --git a/testsuite/tests/ip/link/show_dev_wo_vf_rate.t b/testsuite/tests/ip/link/show_dev_wo_vf_rate.t
new file mode 100755
index 000000000..a600ba65c
--- /dev/null
+++ b/testsuite/tests/ip/link/show_dev_wo_vf_rate.t
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+source lib/generic.sh
+
+NL_FILE="tests/ip/link/dev_wo_vf_rate.nl"
+ts_ip "$0" "Show VF devices w/o VF rate info" -d monitor file $NL_FILE
-- 
2.47.2