make aware of BATCH (if interactive), uid (if benchmark needs to be run as root)

5 files changed, 27 insertions, 5 deletions

diff --git a/benchmarks/benchfft/Makefile b/benchmarks/benchfft/Makefile
index ad5b3a027f8..1be6e338a1e 100644
--- a/benchmarks/benchfft/Makefile
+++ b/benchmarks/benchfft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/10/21 19:35:56 garbled Exp $
+# $NetBSD: Makefile,v 1.2 1998/12/03 01:27:04 hubertf Exp $
 
 DISTNAME=		benchfft-2.0
 CATEGORIES=		benchmarks math
@@ -23,7 +23,16 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bench ${PREFIX}/bin/bench-fft
 	${INSTALL_SCRIPT} ${WRKSRC}/submit-script ${PREFIX}/bin/run-fftbench
 
+.include "../../mk/bsd.prefs.mk"
+
 benchmark:
+.if defined(BATCH)
+	@${ECHO} "*** This benchmark may only be run in non-batch mode" ; \
+	exit 1
+.else
 	@${WRKSRC}/submit-script
+	@${ECHO} ${PKGNAME} results:
+	${CAT} submit.txt
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/bytebench/Makefile b/benchmarks/bytebench/Makefile
index 5a367167528..85296a80b6e 100644
--- a/benchmarks/bytebench/Makefile
+++ b/benchmarks/bytebench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/09/23 16:01:36 agc Exp $
+# $NetBSD: Makefile,v 1.3 1998/12/03 01:27:05 hubertf Exp $
 
 DISTNAME=		byte
 PKGNAME=		bytebench-3.6
@@ -19,6 +19,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/run-byte ${PREFIX}/bin
 
 benchmark:
+	@if [ `id -u` != 0 ]; then echo "This benchmark must be run as root!" ; exit 1 ; fi
 	@${WRKSRC}/run-byte
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/hbench/Makefile b/benchmarks/hbench/Makefile
index fcaf90eb854..2bbdf40830a 100644
--- a/benchmarks/hbench/Makefile
+++ b/benchmarks/hbench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/11/16 11:27:54 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/12/03 01:27:05 hubertf Exp $
 
 DISTNAME=		hbench-OS-1.0
 PKGNAME=		hbench-1.0
@@ -41,6 +41,7 @@ do-install:
 	@${SETENV} PREFIX=${PREFIX} WRKSRC=${WRKSRC} ${SCRIPTDIR}/do-install
 
 benchmark:
+	@if [ `id -u` != 0 ]; then echo "This benchmark must be run as root!" ; exit 1 ; fi
 	@cd ${WRKSRC};							\
 	${SED} -e 's|@pwd@|'`/bin/pwd`'|g' 				\
 		-e 's|@hostname@|'`/bin/hostname -s`'|g'		\
diff --git a/benchmarks/hint/Makefile b/benchmarks/hint/Makefile
index 7e70561cdb5..968a96ed77b 100644
--- a/benchmarks/hint/Makefile
+++ b/benchmarks/hint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/11/13 14:06:01 drochner Exp $
+# $NetBSD: Makefile,v 1.3 1998/12/03 01:27:05 hubertf Exp $
 #
 # New ports collection makefile for:	hint
 # Version required:	12 June 1998 (no version stamp)
@@ -25,4 +25,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/DOUBLE ${PREFIX}/bin/hint
 	${INSTALL_MAN} ${WRKSRC}/hint.1 ${PREFIX}/man/man1
 
+benchmark:
+	cd ${WRKSRC} ; mkdir -p data ; ./DOUBLE
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/lmbench/Makefile b/benchmarks/lmbench/Makefile
index 57f4f2af012..63f4c314856 100644
--- a/benchmarks/lmbench/Makefile
+++ b/benchmarks/lmbench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/09/24 08:45:00 agc Exp $
+# $NetBSD: Makefile,v 1.3 1998/12/03 01:27:05 hubertf Exp $
 
 DISTNAME=		lmbench-2alpha11
 PKGNAME=		lmbench-2.11a
@@ -28,7 +28,15 @@ post-configure:
 do-install:
 	@${SETENV} PREFIX=${PREFIX} WRKSRC=${WRKSRC} ${SCRIPTDIR}/do-install
 
+.include "../../mk/bsd.prefs.mk"
+
 benchmark:
+.if defined(BATCH)
+	@${ECHO} "*** This benchmark may only be run in non-batch mode" ; \
+	exit 1
+.else
+	@if [ `id -u` != 0 ]; then echo "This benchmark must be run as root!" ; exit 1 ; fi
 	@cd ${WRKSRC}/src; ${GMAKE} results
+.endif
 
 .include "../../mk/bsd.pkg.mk"