diff options
-rwxr-xr-x | common/scripts/ltpfixup.sh | 4 | ||||
-rw-r--r-- | ubuntu/ltp.yaml | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/common/scripts/ltpfixup.sh b/common/scripts/ltpfixup.sh index 777f237..52c85c9 100755 --- a/common/scripts/ltpfixup.sh +++ b/common/scripts/ltpfixup.sh @@ -9,7 +9,7 @@ echo "Script path is: $SCRIPTPATH" TST_CMDFILES="" # List of test cases to be skipped SKIPFILE="" -# Used only for ltp-ddt tests. Only run test cases which match PATTERNS. Patterns are +# Used only for ltp-ddt tests. Only run test cases which match PATTERNS. Patterns are # seperated by a comma PATTERNS="" @@ -17,7 +17,7 @@ LTP_PATH=/opt/ltp while getopts T:S:P:s: arg do case $arg in - T) + T) TST_CMDFILES="$OPTARG" LOG_FILE=`echo $OPTARG| sed 's,\/,_,'`;; S) OPT=`echo $OPTARG | grep "http"` diff --git a/ubuntu/ltp.yaml b/ubuntu/ltp.yaml index d1eb43c..80eeb5a 100644 --- a/ubuntu/ltp.yaml +++ b/ubuntu/ltp.yaml @@ -20,6 +20,9 @@ metadata: install: steps: - 'VERSION=20150420' + - 'rm -rf /opt/ltp' + - 'mkdir -p /opt/ltp' + - 'cd /opt/ltp' - 'wget http://sourceforge.net/projects/ltp/files/LTP%20Source/ltp-$VERSION/ltp-full-$VERSION.tar.xz' - 'tar --strip-components=1 -Jxf ltp-full-$VERSION.tar.xz' - 'mkdir build' @@ -46,7 +49,7 @@ params: run: steps: - - './common/scripts/ltpfixup.sh -T $TST_CMDFILES -P $(readlink -f build) -S $SKIPFILE' + - './common/scripts/ltpfixup.sh -T $TST_CMDFILES -P /opt/ltp/build -S $SKIPFILE' parse: pattern: "^(?!.+ED)(?P<test_case_id>\\w+)\\s+(?P<result>\\w+)\\s+\\d$" |