svn commit: r265385 - in head: . etc/mtree sbin/ifconfig sbin/ifconfig/tests

[Alan Somers]

Author: asomers
Date: Mon May  5 19:38:29 2014
New Revision: 265385
URL: http://svnweb.freebsd.org/changeset/base/265385

Log:
  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

Deleted:
  head/sbin/ifconfig/tests/Makefile
  head/sbin/ifconfig/tests/fibs_test.sh
Modified:
  head/ObsoleteFiles.inc
  head/etc/mtree/BSD.tests.dist
  head/sbin/ifconfig/Makefile

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Mon May  5 19:35:32 2014	(r265384)
+++ head/ObsoleteFiles.inc	Mon May  5 19:38:29 2014	(r265385)
@@ -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

Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist	Mon May  5 19:35:32 2014	(r265384)
+++ head/etc/mtree/BSD.tests.dist	Mon May  5 19:38:29 2014	(r265385)
@@ -97,8 +97,6 @@
             ..
             growfs
             ..
-            ifconfig
-            ..
             mdconfig
             ..
         ..

Modified: head/sbin/ifconfig/Makefile
==============================================================================
--- head/sbin/ifconfig/Makefile	Mon May  5 19:35:32 2014	(r265384)
+++ head/sbin/ifconfig/Makefile	Mon May  5 19:38:29 2014	(r265385)
@@ -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 <bsd.prog.mk>