Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-12685 llite: fix check for mem-alloc failure.
[fs/lustre-release.git]
/
lustre
/
tests
/
rundbench
diff --git
a/lustre/tests/rundbench
b/lustre/tests/rundbench
index
ad938da
..
11f6191
100755
(executable)
--- a/
lustre/tests/rundbench
+++ b/
lustre/tests/rundbench
@@
-1,4
+1,4
@@
-#!/bin/sh
+#!/bin/
ba
sh
LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
. $LUSTRE/tests/test-framework.sh
LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
. $LUSTRE/tests/test-framework.sh
@@
-44,13
+44,13
@@
for prefix in $CLIENT_PREFIX; do
[ "x$CLIENT" != "x" ] && break;
done
[ "x$CLIENT" != "x" ] && break;
done
-if [ -n "$
SRC" -a -s "$
SRC" ]; then
- CLIENT=${SRC}
+if [ -n "$
DBENCH_SRC" -a -s "$DBENCH_
SRC" ]; then
+ CLIENT=$DBENCH_SRC
fi
fi
-[ ! -s "$CLIENT" ] &&
\
- skip_env "$0
: $(hostname) no client file found for dbench DBENCH_LIB=$DBENCH_LIB SRC=$SRC" &&
\
- exit 0
+[ ! -s "$CLIENT" ] &&
+ skip_env "$0
: no client file found for dbench on $(hostname): "
\
+ "DBENCH_LIB=$DBENCH_LIB DBENCH_SRC=$DBENCH_SRC" && exit 0
[ ! -s "$TGT" ] && echo "copying $CLIENT to $TGT" && cp $CLIENT $TGT
[ ! -s "$TGT" ] && \
[ ! -s "$TGT" ] && echo "copying $CLIENT to $TGT" && cp $CLIENT $TGT
[ ! -s "$TGT" ] && \
@@
-59,7
+59,9
@@
fi
if [ "x$CHROOT" == "xyes" ]; then
echo "copying necessary libs to $DIR"
cp `which dbench` $DIR
if [ "x$CHROOT" == "xyes" ]; then
echo "copying necessary libs to $DIR"
cp `which dbench` $DIR
- LIBS71=$(ldd $DIR/dbench|sed -e 's/\t*//' -e 's/.*=> //' -e 's/ .*//' -e 's/^\///')
+ LIBS71=$(ldd $DIR/dbench |
+ sed -e 's/\t*//' -e 's/.*=> //' -e 's/ .*//' -e 's/^\///' |
+ grep -v 'linux-vdso.so.1')
tar -C / -chf - $LIBS71 | tar -C $DIR -xvf -
if [ "${PIPESTATUS[*]}" != "0 0" ]; then
echo "can't copy libs $LIBS71 to $DIR"
tar -C / -chf - $LIBS71 | tar -C $DIR -xvf -
if [ "${PIPESTATUS[*]}" != "0 0" ]; then
echo "can't copy libs $LIBS71 to $DIR"
@@
-80,6
+82,10
@@
rm -rf dbench $LIBS71 client.txt
exit 0
' TERM
exit 0
' TERM
+# turn off errexit. rundbench will return error code on failure
+trap '' ERR
+set +e
+
cd $DIR
echo "running 'dbench $@' $PREFIX $PWD at `date`"
cd $DIR
echo "running 'dbench $@' $PREFIX $PWD at `date`"