diff options
| author | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2014-06-09 14:18:01 +0100 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2014-06-09 13:42:27 +0000 |
| commit | b32c50b2446f33bf05ab5d04ac01c706b2ee30aa (patch) | |
| tree | 47d8a2077466cab2676217c496be9155fae4f2c4 | |
| parent | 1b004daab6d4010d3472d0ba7e148179c761ff24 (diff) | |
LTP: Fixed path problem on Ubuntu
On Ubuntu LTP gets installed in the LAVA test execution directory.
For this reason the ltpfixup.sh wasn't working correctly so far.
It had the /opt/ltp path hardcoded. This patch fixes the issue.
Change-Id: I4bd9389d63aea954b01e7162a4a0518aa2223750
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
| -rwxr-xr-x | common/scripts/ltpfixup.sh | 7 | ||||
| -rw-r--r-- | ubuntu/ltp.yaml | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/common/scripts/ltpfixup.sh b/common/scripts/ltpfixup.sh index baaba78..3fec48f 100755 --- a/common/scripts/ltpfixup.sh +++ b/common/scripts/ltpfixup.sh @@ -6,7 +6,12 @@ SCRIPT=$(readlink -f $0) SCRIPTPATH=`dirname $SCRIPT` echo "Script path is: $SCRIPTPATH" -cd /opt/ltp +LTP_PATH=/opt/ltp +# Second parameter is used as a path to LTP installation +if [ "$#" -gt 1 ]; then + LTP_PATH=$2 +fi +cd $LTP_PATH ./runltp -p -q -f $1 -l $SCRIPTPATH/LTP_$1.log -C $SCRIPTPATH/LTP_$1.failed | tee $SCRIPTPATH/LTP_$1.out find $SCRIPTPATH -name "LTP_$1.log" -print0 |xargs -0 cat tar czfv $SCRIPTPATH/LTP_$1.tar.gz $SCRIPTPATH/LTP* diff --git a/ubuntu/ltp.yaml b/ubuntu/ltp.yaml index 78e681f..40f35df 100644 --- a/ubuntu/ltp.yaml +++ b/ubuntu/ltp.yaml @@ -36,7 +36,7 @@ params: run: steps: - - './common/scripts/ltpfixup.sh $TST_CMDFILES' + - './common/scripts/ltpfixup.sh $TST_CMDFILES $(readlink -f build)' parse: pattern: "^(?!.+ED)(?P<test_case_id>\\w+)\\s+(?P<result>\\w+)\\s+\\d$" |