From d4e612d08d00c1424493c7d86d7cd1d98d211a84 Mon Sep 17 00:00:00 2001 From: Alan Somers Date: Mon, 5 May 2014 19:38:29 +0000 Subject: [PATCH] Remove the ifconfig test added in rev 263445. After discussion with melifaro, we agreed that ifconfig's behavior was not a bug. The main motivation for bin/187551 was to partially resolve kern/187549, but we resolved kern/187549 in a different way instead. ObsoleteFiles.inc etc/mtree/BSD.tests.dist sbin/ifconfig/tests/fibs_test.sh sbin/ifconfig/tests/Makefile sbin/ifconfig/Makefile Remove /usr/tests/sbin/ifconfig PR: bin/187551 MFC after: 3 days Sponsored by: Spectra Logic --- ObsoleteFiles.inc | 4 + etc/mtree/BSD.tests.dist | 2 - sbin/ifconfig/Makefile | 4 - sbin/ifconfig/tests/Makefile | 9 --- sbin/ifconfig/tests/fibs_test.sh | 126 ------------------------------- 5 files changed, 4 insertions(+), 141 deletions(-) delete mode 100644 sbin/ifconfig/tests/Makefile delete mode 100755 sbin/ifconfig/tests/fibs_test.sh diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 53a5fad43649..0ed605cbc492 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20140505: Reject PR kern/187551 +OLD_DIRS+=usr/tests/sbin/ifconfig +OLD_FILES+=usr/tests/sbin/ifconfig/Kyuafile +OLD_FILES+=usr/tests/sbin/ifconfig/fibs_test # 20140502: Removal of lindev(4) OLD_FILES+=usr/share/man/man4/lindev.4.gz # 20140314: AppleTalk diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 4cc3f87b41eb..2e6d30afa0cb 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -97,8 +97,6 @@ .. growfs .. - ifconfig - .. mdconfig .. .. diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile index 44c231942b64..d7c645226739 100644 --- a/sbin/ifconfig/Makefile +++ b/sbin/ifconfig/Makefile @@ -63,8 +63,4 @@ MAN= ifconfig.8 CFLAGS+= -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wnested-externs WARNS?= 2 -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif - .include diff --git a/sbin/ifconfig/tests/Makefile b/sbin/ifconfig/tests/Makefile deleted file mode 100644 index 9b7aa07e1790..000000000000 --- a/sbin/ifconfig/tests/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -.include - -TESTSDIR= ${TESTSBASE}/sbin/ifconfig - -ATF_TESTS_SH= fibs_test - -.include diff --git a/sbin/ifconfig/tests/fibs_test.sh b/sbin/ifconfig/tests/fibs_test.sh deleted file mode 100755 index 2a254580eb2b..000000000000 --- a/sbin/ifconfig/tests/fibs_test.sh +++ /dev/null @@ -1,126 +0,0 @@ -# -# Copyright (c) 2014 Spectra Logic Corporation -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions, and the following disclaimer, -# without modification. -# 2. Redistributions in binary form must reproduce at minimum a disclaimer -# substantially similar to the "NO WARRANTY" disclaimer below -# ("Disclaimer") and any redistribution must be conditioned upon -# including a substantially similar Disclaimer requirement for further -# binary redistribution. -# -# NO WARRANTY -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGES. -# -# Authors: Alan Somers (Spectra Logic Corporation) -# -# $FreeBSD$ - - -# Regression test for bin/187551 -atf_test_case process_fib cleanup -process_fib_head() -{ - atf_set "descr" "ifconfig will set its process fib whenever configuring an interface with nondefault fib" - atf_set "require.user" "root" - atf_set "require.config" "fibs" -} -process_fib_body() -{ - atf_expect_fail "bin/187551 ifconfig should change its process fib when configuring an interface with nondefault fib" - # Configure the TAP interface to use an RFC5737 nonrouteable address - # and a non-default fib - ADDR="192.0.2.2" - SUBNET="192.0.2.0" - MASK="24" - - # Check system configuration - if [ 0 != `sysctl -n net.add_addr_allfibs` ]; then - atf_skip "This test requires net.add_addr_allfibs=0" - fi - get_fibs 1 - - # Configure a TAP interface - get_tap - ktrace ifconfig $TAP ${ADDR}/${MASK} fib $FIB0 - if kdump -s | egrep -q 'CALL[[:space:]]+setfib'; then - atf_pass - else - atf_fail "ifconfig never called setfib(2)" - fi -} - -process_fib_cleanup() -{ - cleanup_tap -} - -atf_init_test_cases() -{ - atf_add_test_case process_fib -} - - -# parameter numfibs The number of fibs to lookup -get_fibs() -{ - NUMFIBS=$1 - net_fibs=`sysctl -n net.fibs` - i=0 - while [ $i -lt "$NUMFIBS" ]; do - fib=`atf_config_get "fibs" | \ - awk -v i=$(( i + 1 )) '{print $i}'` - echo "fib is ${fib}" - eval FIB${i}=${fib} - if [ "$fib" -ge "$net_fibs" ]; then - atf_skip "The ${i}th configured fib is ${fib}, which is not less than net.fibs, which is ${net_fibs}" - fi - i=$(( $i + 1 )) - done -} - - - -# Creates a new tap(4) interface, registers it for cleanup, and returns the -# name via the environment variable TAP -get_tap() -{ - local TAPN=0 - while ! ifconfig tap${TAPN} create > /dev/null 2>&1; do - if [ "$TAPN" -ge 8 ]; then - atf_skip "Could not create a tap(4) interface" - else - TAPN=$(($TAPN + 1)) - fi - done - local TAPD=tap${TAPN} - # Record the TAP device so we can clean it up later - echo ${TAPD} >> "tap_devices_to_cleanup" - TAP=${TAPD} -} - - - - -cleanup_tap() -{ - for TAPD in `cat "tap_devices_to_cleanup"`; do - ifconfig ${TAPD} destroy - done -} -