1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
$NetBSD: patch-ah,v 1.3 2011/09/12 10:47:11 dholland Exp $
Make it installable (it was originally meant to be run out of its source tree)
--- scripts/maindriver.orig 2003-03-19 17:54:05.000000000 +0000
+++ scripts/maindriver
@@ -48,12 +48,6 @@ else
fi
-# Step 1: Discover hbench root path
-HBENCHROOT=`(cd \`dirname $0\`/.. ; pwd)`
-if [ X${HBENCHROOT}X = XX ]; then
- HBENCHROOT=$PWD
-fi
-
echo Current directory is $HBENCHROOT
# Step 2: Get run file name, check arguments, etc
@@ -99,16 +93,16 @@ if [ X${SCRATCHDIR}X = XX ]; then
fi
if [ X${PLAINBINDIR}X = XX ]; then
- PLAINBINDIR=${HBENCHROOT}/bin/${OSTYPE}-${ARCH}
+ PLAINBINDIR=@PREFIX@/bin/hbench/${OSTYPE}-${ARCH}
fi
if [ X${CYCLECOUNTERBINDIR}X = XX ]; then
- CYCLECOUNTERBINDIR=${HBENCHROOT}/bin/${OSTYPE}-${ARCH}-c
+ CYCLECOUNTERBINDIR=@PREFIX@/bin/hbench/${OSTYPE}-${ARCH}-c
fi
if [ X${EVENTCOUNTERBINDIR}X = XX ]; then
- EVENTCOUNTERBINDIR=${HBENCHROOT}/bin/${OSTYPE}-${ARCH}-ec
+ EVENTCOUNTERBINDIR=@PREFIX@/bin/hbench/${OSTYPE}-${ARCH}-ec
fi
if [ X${RESULTDIRBASE}X = XX ]; then
- RESULTDIRBASE=${HBENCHROOT}/Results/${OSTYPE}-${ARCH}
+ RESULTDIRBASE=@PREFIX@/share/hbench/Results/${OSTYPE}-${ARCH}
fi
RESULTDIRB=${RESULTDIRBASE}/${SYSTEMNAME}
@@ -125,10 +119,10 @@ if [ -f $TESTFILE ]; then
TESTS=${TESTFILE}
elif [ -f ${TESTFILE}.test ]; then
TESTS=${TESTFILE}.test
-elif [ -f ${HBENCHROOT}/conf/${TESTFILE} ]; then
- TESTS=${HBENCHROOT}/conf/${TESTFILE}
-elif [ -f ${HBENCHROOT}/conf/${TESTFILE}.test ]; then
- TESTS=${HBENCHROOT}/conf/${TESTFILE}.test
+elif [ -f @PREFIX@/share/hbench/conf/${TESTFILE} ]; then
+ TESTS=@PREFIX@/share/hbench/conf/${TESTFILE}
+elif [ -f @PREFIX@/share/hbench/conf/${TESTFILE}.test ]; then
+ TESTS=@PREFIX@/share/hbench/conf/${TESTFILE}.test
else
echo "Unable to locate test file ${TESTFILE}."
echo "Fix run file $1 and retry"
@@ -432,9 +426,9 @@ run_remote_test() {
;;
esac
else
- ${RCP} ${HBENCHROOT}/scripts/config.guess ${machine}:/tmp/get-os
+ ${RCP} @PREFIX@/bin/hbench/config.guess ${machine}:/tmp/get-os
REMOTEOS=`$RSH $machine -n /tmp/get-os | sed 's/^.*-.*-//`
- ${RCP} ${HBENCHROOT}/bin/${REMOTEOS}/$1 ${machine}:/tmp
+ ${RCP} @PREFIX@/bin/hbench/${REMOTEOS}/$1 ${machine}:/tmp
$RSH $machine -n /tmp/$1 0 $3 -s 2>> $STDERR &
fi
@@ -793,12 +787,12 @@ echo "done."
if [ X`perl -e 'print "perltest\n";' 2>&1`X = XperltestX ]; then
echo $ECHON "Generating summary information...${ECHOC}"
rm -f ${RESULTDIR}/summary
- ${HBENCHROOT}/scripts/gen-summary ${RESULTDIR} > ${RESULTDIR}/summary
+ @PREFIX@/bin/hbench/gen-summary ${RESULTDIR} > ${RESULTDIR}/summary
echo "done."
echo $ECHON "Performing basic automated data analysis...${ECHOC}"
rm -f ${RESULTDIR}/analysis
- ${HBENCHROOT}/scripts/gen-analysis ${RESULTDIR} > ${RESULTDIR}/analysis
+ @PREFIX@/bin/hbench/gen-analysis ${RESULTDIR} > ${RESULTDIR}/analysis
echo "done."
if [ `cat $RESULTDIR/errors | wc -l` -gt 0 ]; then
|
