LU-11673 tests: quote argument of -n and test fix

[fs/lustre-release.git] / lustre / tests / rundbench

diff --git a/lustre/tests/rundbench b/lustre/tests/rundbench
index 2b17ebd..11f6191 100755 (executable)
--- a/lustre/tests/rundbench
+++ b/lustre/tests/rundbench
@@ -59,7 +59,9 @@ fi
 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"
@@ -80,6 +82,10 @@ rm -rf dbench $LIBS71 client.txt
 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`"