Changeset View
Changeset View
Standalone View
Standalone View
head/benchmarks/unixbench/files/patch-Run
| --- Run.orig 1999-07-28 22:04:47 UTC | --- Run.orig 2017-09-04 20:35:19 UTC | ||||
| +++ Run | +++ Run | ||||
| @@ -88,11 +88,11 @@ else | @@ -91,10 +91,10 @@ chomp($BASEDIR); | ||||
| fi | my $BINDIR = getDir('UB_BINDIR', $BASEDIR . "/pgms"); | ||||
| # check that the required files are in the proper places | # Temp directory, for temp files. | ||||
| -if make check; then | -my $TMPDIR = getDir('UB_TMPDIR', $BASEDIR . "/tmp"); | ||||
| - : | +my $TMPDIR = "/tmp"; | ||||
| -else | |||||
| - make all | |||||
| -fi | |||||
| +#if make check; then | |||||
| +# : | |||||
| +#else | |||||
| +# make all | |||||
| +#fi | |||||
| # Directory to put results in. | |||||
| -my $RESULTDIR = getDir('UB_RESULTDIR', $BASEDIR . "/results"); | |||||
| +my $RESULTDIR = "/tmp"; | |||||
| # establish full paths to directories | # Directory where the tests are executed. | ||||
| @@ -114,7 +114,7 @@ cd $SCRPDIR | my $TESTDIR = getDir('UB_TESTDIR', $BASEDIR . "/testdir"); | ||||
| SCRPDIR=`pwd` | @@ -735,12 +735,10 @@ sub getSystemInfo { | ||||
| cd $_WD | |||||
| -TMPDIR=${HOMEDIR}/tmp | # Get the language info. | ||||
| +TMPDIR=${TMPDIR-${HOMEDIR}/tmp} | my $lang = getCmdOutput("printenv LANG"); | ||||
| cd $TMPDIR | - my $map = getCmdOutput("locale -k LC_CTYPE | grep charmap"); | ||||
| TMPDIR=`pwd` | + my $map = getCmdOutput("locale -k | grep charmap"); | ||||
| cd $_WD | $map =~ s/.*=//; | ||||
| @@ -367,10 +367,11 @@ do # line argument processing | - my $coll = getCmdOutput("locale -k LC_COLLATE | grep collate-codeset"); | ||||
| C) | - $coll =~ s/.*=//; | ||||
| logmsg="C Compiler Throughput" | - $info->{'language'} = sprintf "%s (charmap=%s, collate=%s)", | ||||
| prog="looper ${looper-60} ${CC} cctest.c" | - $lang, $map, $coll; | ||||
| + prog="looper ${looper-60} ${CC} cctest.c -o ${TMPDIR}/a.out" | + $info->{'language'} = sprintf "%s (charmap=%s)", | ||||
| stdout=/dev/null | + $lang, $map; | ||||
| repeat="$shortloop" | |||||
| cleanopt="-m $TMPTIMES" | |||||
| - rm -f ${TESTDIR}/cctest.o ${TESTDIR}/a.out | |||||
| + rm -f ${TESTDIR}/cctest.o ${TMPDIR}/a.out | |||||
| ;; | |||||
| arithoh) | # Get details on the CPUs, if possible. | ||||
| @@ -385,8 +386,8 @@ do # line argument processing | my $cpus = getCpuInfo(); | ||||
| @@ -750,10 +748,9 @@ sub getSystemInfo { | |||||
| } | |||||
| dc) | # Get graphics hardware info. | ||||
| logmsg="Dc: sqrt(2) to 99 decimal places" | - $info->{'graphics'} = getCmdOutput("3dinfo | cut -f1 -d\'(\'"); | ||||
| - prog="looper ${looper-30} dc" | + # $info->{'graphics'} = getCmdOutput("3dinfo | cut -f1 -d\'(\'"); | ||||
| - stdin=dc.dat | |||||
| + prog="looper ${looper-30} \"dc < ${TESTDIR}/dc.dat\"" | |||||
| + stdin= | |||||
| stdout=/dev/null | |||||
| cleanopt="-m $TMPTIMES" | |||||
| ;; | |||||
| @@ -508,7 +509,7 @@ do # line argument processing | |||||
| ########### some specific cleanup routines ############## | |||||
| case $bench in | |||||
| C) | |||||
| - rm -f ${TESTDIR}/cctest.o ${TESTDIR}/a.out | |||||
| + rm -f ${TESTDIR}/cctest.o ${TMPDIR}/a.out | |||||
| ;; | |||||
| fstime | fsbuffer | fsdisk) | # Get system run state, load and usage info. | ||||
| - $info->{'runlevel'} = getCmdOutput("runlevel | cut -f2 -d\" \""); | |||||
| $info->{'load'} = getCmdOutput("uptime"); | |||||
| $info->{'numUsers'} = getCmdOutput("who | wc -l"); | |||||
| @@ -781,6 +778,7 @@ sub abortRun { | |||||
| # Do checks that everything's ready for testing. | |||||
| sub preChecks { | |||||
| + return; | |||||
| # Set the language. | |||||
| $ENV{'LANG'} = $language; | |||||
| @@ -1386,7 +1384,7 @@ sub displaySystem { | |||||
| } | |||||
| # Display system load and usage info. | |||||
| - printf $fd " %s; runlevel %s\n\n", $info->{'load'}, $info->{'runlevel'}; | |||||
| + printf $fd " %s; \n\n", $info->{'load'}; | |||||
| } | |||||
| @@ -1603,8 +1601,8 @@ sub displaySystemHtml { | |||||
| # Display system runlevel, load and usage info. | |||||
| printf $fd "<tr>\n"; | |||||
| printf $fd " <td><b>Uptime:</b></td>\n"; | |||||
| - printf $fd " <td colspan=2>%s; runlevel %s</td>\n", | |||||
| - $info->{'load'}, $info->{'runlevel'}; | |||||
| + printf $fd " <td colspan=2>%s</td>\n", | |||||
| + $info->{'load'}; | |||||
| printf $fd "</tr>\n"; | |||||
| printf $fd "</table></p>\n\n"; | |||||