From 574fe75809ddccaaa62c25ecc252f81675e7a319 Mon Sep 17 00:00:00 2001
From: Giorgos Keramidas <keramida@FreeBSD.org>
Date: Thu, 6 Jan 2011 20:05:24 +0000
Subject: [PATCH] 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
---
 tools/regression/acct/Makefile  | 18 +++++++-----------
 tools/regression/acct/pack.c    |  9 ++++++---
 tools/regression/acct/regress.t |  7 ++++++-
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/tools/regression/acct/Makefile b/tools/regression/acct/Makefile
index 09f8b323ecd..6da91b6a914 100644
--- a/tools/regression/acct/Makefile
+++ b/tools/regression/acct/Makefile
@@ -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>
diff --git a/tools/regression/acct/pack.c b/tools/regression/acct/pack.c
index 122b623206f..d1d30856f7f 100644
--- a/tools/regression/acct/pack.c
+++ b/tools/regression/acct/pack.c
@@ -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)
 
diff --git a/tools/regression/acct/regress.t b/tools/regression/acct/regress.t
index 8bb8969af7e..3f63c3ac3ac 100755
--- a/tools/regression/acct/regress.t
+++ b/tools/regression/acct/regress.t
@@ -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()
 {