On 12/19/18 1:06 PM, David Ahern wrote: > On 12/18/18 8:57 AM, Stephen Hemminger wrote: >> Cleanup from scrub script. >> >> Signed-off-by: Stephen Hemminger <step...@networkplumber.org> >> --- >> testsuite/tests/ip/tunnel/add_tunnel.t | 1 - >> testsuite/tests/tc/cls-testbed.t | 2 +- >> 2 files changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/testsuite/tests/ip/tunnel/add_tunnel.t >> b/testsuite/tests/ip/tunnel/add_tunnel.t >> index 3f5a9d3c1acf..a9a0b2a3c1be 100755 >> --- a/testsuite/tests/ip/tunnel/add_tunnel.t >> +++ b/testsuite/tests/ip/tunnel/add_tunnel.t >> @@ -11,4 +11,3 @@ ts_ip "$0" "Del GRE tunnel over IPv4" tunnel del >> $TUNNEL_NAME >> >> ts_ip "$0" "Add GRE tunnel over IPv6" tunnel add name $TUNNEL_NAME mode >> ip6gre local dead:beef::1 remote dead:beef::2 >> ts_ip "$0" "Del GRE tunnel over IPv6" tunnel del $TUNNEL_NAME >> - > > Dropped this part since it is no longer relevant after > 85bcb524a2e38940a18fb934fd1e8d37c6496074. > > >> diff --git a/testsuite/tests/tc/cls-testbed.t >> b/testsuite/tests/tc/cls-testbed.t >> index d5c21e5c420c..982534cf52ed 100755 >> --- a/testsuite/tests/tc/cls-testbed.t >> +++ b/testsuite/tests/tc/cls-testbed.t >> @@ -61,7 +61,7 @@ for q in ${QDISCS}; do >> ts_tc "cls-testbed" "tree listing" qdisc list dev eth0 >> ts_tc "cls-testbed" "tree class listing" class list dev eth0 >> ts_log "cls-testbed: starting classifier test $c" >> - $c >> + $c >> >> case "$q" in >> *) >> > > applied to iproute2-next. Thanks >
I take that back. Not applied. your subsequent patch removes the file.