Date: Thu, 6 Jan 2011 20:05:24 +0000 (UTC) From: Giorgos Keramidas <keramida@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r217064 - head/tools/regression/acct Message-ID: <201101062005.p06K5ORU026814@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: keramida (doc committer) Date: Thu Jan 6 20:05:24 2011 New Revision: 217064 URL: http://svn.freebsd.org/changeset/base/217064 Log: tests: sort & fix includes, remove -include from CFLAGS of acct tests - Sort the includes of pack.c, moving sys/*.h files near the top. - Add a couple of missing #include lines, and remove the need for custom -include options in the CFLAGS of the test Makefile. - Remove the ad-hoc 'all' target, but keep its 'regress' bits for testing. - Convert the ad-hoc 'clean' target to proper CLEANFILES stuff, so that the normal bsd.prog.mk machinery can clean up. - Use `make -V .OBJDIR' to detect the place where 'pack' lives, so that regress.t works both with and without 'make obj'. Reviewed by: uqs MFC after: 1 week Modified: head/tools/regression/acct/Makefile head/tools/regression/acct/pack.c head/tools/regression/acct/regress.t Modified: head/tools/regression/acct/Makefile ============================================================================== --- head/tools/regression/acct/Makefile Thu Jan 6 19:50:11 2011 (r217063) +++ head/tools/regression/acct/Makefile Thu Jan 6 20:05:24 2011 (r217064) @@ -1,26 +1,22 @@ # # $FreeBSD$ # -# "make" will compile what is needed and run the regression tests. +# "make" will compile the acct test programs # + PROG= pack +SRCS= pack.c NO_MAN= +CFLAGS+= -I${.OBJDIR} -CFLAGS= -include /usr/include/sys/limits.h \ - -include /usr/include/sys/syslog.h - -all: regress - -pack: pack.c convert.c +pack.o: convert.c +CLEANFILES+= convert.c convert.c: ../../../sys/kern/kern_acct.c sed -n -e 's/log(/syslog(/g' \ -e '/FLOAT_CONVERSION_START/,/FLOAT_CONVERSION_END/p' $? >$@ regress: pack regress.t - ./regress.t - -clean: - rm -f $(PROG) convert.c + ${.CURDIR}/regress.t .include <bsd.prog.mk> Modified: head/tools/regression/acct/pack.c ============================================================================== --- head/tools/regression/acct/pack.c Thu Jan 6 19:50:11 2011 (r217063) +++ head/tools/regression/acct/pack.c Thu Jan 6 20:05:24 2011 (r217064) @@ -25,15 +25,18 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/types.h> + #include <assert.h> #include <float.h> +#include <limits.h> #include <math.h> #include <stdio.h> +#include <stdint.h> #include <stdlib.h> #include <strings.h> - -#include <sys/time.h> -#include <sys/types.h> +#include <syslog.h> +#include <time.h> #define KASSERT(val, msg) assert(val) Modified: head/tools/regression/acct/regress.t ============================================================================== --- head/tools/regression/acct/regress.t Thu Jan 6 19:50:11 2011 (r217063) +++ head/tools/regression/acct/regress.t Thu Jan 6 20:05:24 2011 (r217064) @@ -3,7 +3,12 @@ # $FreeBSD$ # -DIR=`dirname $0` +if test -z "${DIR}" ; then + DIR=$( make -V .OBJDIR ) +fi +if test -z "${DIR}" ; then + DIR=$( dirname $0 ) +fi check() {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101062005.p06K5ORU026814>