From 4479f80958d633bc23ff754a8ef11846daf636bc Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Mon, 25 Mar 2013 16:01:04 +0800 Subject: [PATCH] LU-2136 tests: build posix test suite on i686 client This patch improves prep() in lustre/tests/posix/posix.cfg to support building posix test suite on i686 client. Test-Parameters: envdefinitions=SLOW=yes \ clientdistro=el6 serverdistro=el6 clientarch=i686 \ serverarch=x86_64 testlist=posix Signed-off-by: Jian Yu Change-Id: I7b2fdc5552f0d2eb5cc7ef38b1192ec5a4fdefcf Reviewed-on: http://review.whamcloud.com/5831 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Minh Diep Reviewed-by: Wei Liu Reviewed-by: Oleg Drokin --- lustre/tests/posix/posix.cfg | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lustre/tests/posix/posix.cfg b/lustre/tests/posix/posix.cfg index 1f1408c..e9f9f6f 100644 --- a/lustre/tests/posix/posix.cfg +++ b/lustre/tests/posix/posix.cfg @@ -99,19 +99,20 @@ prep() { [[ -d $INSTALL_DIR ]] && rm -rf $INSTALL_DIR if grep -q " 6." /etc/issue; then + local arch=$(uname -m) [[ -d /usr/include/bits ]] || mkdir -p /usr/include/bits [[ -d /usr/include/sys ]] || mkdir -p /usr/include/sys - [[ -s /usr/include/stropts.h ]] || \ - ln -s /usr/lib/x86_64-redhat-linux5E/include/stropts.h \ + [[ -s /usr/include/stropts.h ]] || + ln -s /usr/lib/$arch-redhat-linux5E/include/stropts.h \ /usr/include/stropts.h - [[ -s /usr/include/bits/stropts.h ]] || \ - ln -s /usr/lib/x86_64-redhat-linux5E/include/bits/stropts.h \ + [[ -s /usr/include/bits/stropts.h ]] || + ln -s /usr/lib/$arch-redhat-linux5E/include/bits/stropts.h \ /usr/include/bits/stropts.h - [[ -s /usr/include/bits/xtitypes.h ]] || \ - ln -s /usr/lib/x86_64-redhat-linux5E/include/bits/xtitypes.h \ + [[ -s /usr/include/bits/xtitypes.h ]] || + ln -s /usr/lib/$arch-redhat-linux5E/include/bits/xtitypes.h \ /usr/include/bits/xtitypes.h - [[ -s /usr/include/sys/stropts.h ]] || \ - ln -s /usr/lib/x86_64-redhat-linux5E/include/sys/stropts.h \ + [[ -s /usr/include/sys/stropts.h ]] || + ln -s /usr/lib/$arch-redhat-linux5E/include/sys/stropts.h \ /usr/include/sys/stropts.h fi -- 1.8.3.1