Whamcloud - gitweb
LU-7479 tests: fix lustre-rsync-test test_2a on SLES12 75/17475/8
authorYang Sheng <yang.sheng@intel.com>
Fri, 4 Dec 2015 06:22:12 +0000 (14:22 +0800)
committerOleg Drokin <oleg.drokin@intel.com>
Tue, 12 Jan 2016 02:45:14 +0000 (02:45 +0000)
In sles12, ldd output has a wrong format for linux-vdso.so.1.
Since it is a virtual file so strip out is reasonable.

Signed-off-by: Yang Sheng <yang.sheng@intel.com>
Change-Id: I335139c4278db771a0c313573dde41eb9b96d649
Reviewed-on: http://review.whamcloud.com/17475
Tested-by: Jenkins
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lustre/tests/rundbench

index 2b17ebd..601b74c 100755 (executable)
@@ -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"