diff options
| author | jlam <jlam> | 2000-08-04 06:13:26 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2000-08-04 06:13:26 +0000 |
| commit | 6342cad09b29d915dda615887e2eb9d36b97326a (patch) | |
| tree | f6869c2e091ed9e8eb1dd8cdd1cd6165fe283abe /benchmarks/bytebench | |
| parent | 6e319de85ee40b14f36f0325c513aca859de1d8d (diff) | |
| download | pkgsrc-6342cad09b29d915dda615887e2eb9d36b97326a.tar.gz | |
Make "make benchmark" actually work without having installed the software.
Also remove an apparent extraneous line in the executable script which
was causing errors.
Diffstat (limited to 'benchmarks/bytebench')
| -rw-r--r-- | benchmarks/bytebench/Makefile | 10 | ||||
| -rw-r--r-- | benchmarks/bytebench/files/patch-sum | 4 | ||||
| -rw-r--r-- | benchmarks/bytebench/patches/patch-aa | 10 |
3 files changed, 15 insertions, 9 deletions
diff --git a/benchmarks/bytebench/Makefile b/benchmarks/bytebench/Makefile index f60f5c1cfef..e44e32c6df8 100644 --- a/benchmarks/bytebench/Makefile +++ b/benchmarks/bytebench/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/03/16 12:16:50 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2000/08/04 06:13:26 jlam Exp $ DISTNAME= byte PKGNAME= bytebench-3.6 @@ -7,6 +7,11 @@ MASTER_SITES= ftp://ftp.cdrom.com/pub/unix-c/benchmarks/ MAINTAINER= root@garbled.net +BENCHMARK_ENV+= BINDIR=${WRKSRC}/pgms +BENCHMARK_ENV+= SCRPDIR=${WRKSRC}/pgms +BENCHMARK_ENV+= RESULTDIR=${WRKSRC}/results +BENCHMARK_ENV+= TESTDIR=${WRKSRC}/testdir + post-patch: ${SED} -e 's|@PREFIX@|${PREFIX}|' ${WRKSRC}/Run >${WRKSRC}/run-byte @@ -20,7 +25,8 @@ do-install: benchmark: @if [ `${ID} -u` != 0 ]; then ${ECHO} "This benchmark must be run as root!" ; exit 1 ; fi - @${WRKSRC}/run-byte | tee ${WRKSRC}/bytebench.out + @${SETENV} ${BENCHMARK_ENV} ${WRKSRC}/run-byte \ + | tee ${WRKSRC}/bytebench.out results: -@${MKDIR} /tmp/benches/`domainname` diff --git a/benchmarks/bytebench/files/patch-sum b/benchmarks/bytebench/files/patch-sum index e99d2b25f9b..7f58c617210 100644 --- a/benchmarks/bytebench/files/patch-sum +++ b/benchmarks/bytebench/files/patch-sum @@ -1,5 +1,5 @@ -$NetBSD: patch-sum,v 1.2 2000/01/05 12:23:56 agc Exp $ +$NetBSD: patch-sum,v 1.3 2000/08/04 06:13:28 jlam Exp $ -MD5 (patch-aa) = 6491252e66183914b4a546b1638c0d67 +MD5 (patch-aa) = 92f149689171a77764feaeae4704da99 MD5 (patch-ab) = 8af9aa8181cc0fa37a0b9ba1e457fe7f MD5 (patch-ac) = d091ccb6de88383e5c5ed1507d8f81e8 diff --git a/benchmarks/bytebench/patches/patch-aa b/benchmarks/bytebench/patches/patch-aa index ed1e580f949..23762171aa9 100644 --- a/benchmarks/bytebench/patches/patch-aa +++ b/benchmarks/bytebench/patches/patch-aa @@ -1,6 +1,7 @@ -$NetBSD: patch-aa,v 1.3 1998/09/23 16:01:37 agc Exp $ ---- Run.orig Sat May 13 12:32:15 1995 -+++ Run Sat Aug 29 10:39:35 1998 +$NetBSD: patch-aa,v 1.4 2000/08/04 06:13:28 jlam Exp $ + +--- Run.orig Sat May 13 15:32:15 1995 ++++ Run Fri Aug 4 01:56:34 2000 @@ -1,6 +1,6 @@ #! /bin/sh #################### set your defaults here ############## @@ -70,7 +71,7 @@ $NetBSD: patch-aa,v 1.3 1998/09/23 16:01:37 agc Exp $ cd $TESTDIR TESTDIR=`pwd` cd $PWD -@@ -417,11 +411,11 @@ +@@ -417,11 +411,10 @@ ############ THE BENCH IS TIMED ############## if test "$stdin" = "" then # without redirected stdin @@ -81,7 +82,6 @@ $NetBSD: patch-aa,v 1.3 1998/09/23 16:01:37 agc Exp $ + /usr/bin/time $prog $opt $bgstr <$stdin 2>>$TMPTIMES >>$stdout fi - /bin/time $benchcmd -+ /usr/bin/time $benchcmd ############################################### cd $pwd # move back home status=$? # save the result code |