svn commit: r342173 - in head: tests/sys tools/build/mk

[Alan Somers]

Author: asomers
Date: Mon Dec 17 18:35:32 2018
New Revision: 342173
URL: https://svnweb.freebsd.org/changeset/base/342173

Log:
  Conditionalize installtion audit(4) tests on MK_AUDIT
  
  MK_AUDIT already controls auditd(8), praudit(1), etc.  It should also control
  the audit test suite.
  
  Submitted by:	ngie
  MFC after:	2 weeks
  Pull Request:	https://github.com/freebsd/freebsd/pull/240

Modified:
  head/tests/sys/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/tests/sys/Makefile
==============================================================================
--- head/tests/sys/Makefile	Mon Dec 17 18:11:06 2018	(r342172)
+++ head/tests/sys/Makefile	Mon Dec 17 18:35:32 2018	(r342173)
@@ -6,7 +6,7 @@ TESTSDIR=		${TESTSBASE}/sys
 
 TESTS_SUBDIRS+=		acl
 TESTS_SUBDIRS+=		aio
-TESTS_SUBDIRS+=		audit
+TESTS_SUBDIRS+=		${_audit}
 TESTS_SUBDIRS+=		auditpipe
 TESTS_SUBDIRS+=		capsicum
 TESTS_SUBDIRS+=		${_cddl}
@@ -26,6 +26,10 @@ TESTS_SUBDIRS+=		posixshm
 TESTS_SUBDIRS+=		sys
 TESTS_SUBDIRS+=		vfs
 TESTS_SUBDIRS+=		vm
+
+.if ${MK_AUDIT} != "no"
+_audit=	audit
+.endif
 
 .if ${MK_CDDL} != "no"
 _cddl=	cddl

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Dec 17 18:11:06 2018	(r342172)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Dec 17 18:35:32 2018	(r342173)
@@ -160,6 +160,22 @@ OLD_FILES+=usr/share/man/man5/auditdistd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/audit.8.gz
 OLD_FILES+=usr/share/man/man8/auditd.8.gz
 OLD_FILES+=usr/share/man/man8/auditdistd.8.gz
+OLD_FILES+=usr/tests/sys/audit/process-control
+OLD_FILES+=usr/tests/sys/audit/open
+OLD_FILES+=usr/tests/sys/audit/network
+OLD_FILES+=usr/tests/sys/audit/miscellaneous
+OLD_FILES+=usr/tests/sys/audit/Kyuafile
+OLD_FILES+=usr/tests/sys/audit/ioctl
+OLD_FILES+=usr/tests/sys/audit/inter-process
+OLD_FILES+=usr/tests/sys/audit/file-write
+OLD_FILES+=usr/tests/sys/audit/file-read
+OLD_FILES+=usr/tests/sys/audit/file-delete
+OLD_FILES+=usr/tests/sys/audit/file-create
+OLD_FILES+=usr/tests/sys/audit/file-close
+OLD_FILES+=usr/tests/sys/audit/file-attribute-modify
+OLD_FILES+=usr/tests/sys/audit/file-attribute-access
+OLD_FILES+=usr/tests/sys/audit/administrative
+OLD_DIRS+=usr/tests/sys/audit
 .endif
 
 .if ${MK_AUTHPF} == no