LTP: fixed result parsing when running each package separately

When running packages separately in the same LAVA job, results were
concatenated. Now result files are stored in the test execution directory
and are separate for each lava-test-shell. ltpfixup.sh script was moved
to 'common' directory. Definition was unified between Ubuntu and OE.

Change-Id: I43372b0d060d88f871407bc4b1b44c2cf94ef333
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>

4 files changed, 31 insertions, 20 deletions

diff --git a/common/scripts/ltpfixup.sh b/common/scripts/ltpfixup.sh
new file mode 100755
index 0000000..baaba78
--- /dev/null
+++ b/common/scripts/ltpfixup.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Absolute path to this script. /home/user/bin/foo.sh
+SCRIPT=$(readlink -f $0)
+# Absolute path this script is in. /home/user/bin
+SCRIPTPATH=`dirname $SCRIPT`
+echo "Script path is: $SCRIPTPATH"
+
+cd /opt/ltp
+./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*
+lava-test-case LTP_$1 --result pass
+lava-test-case-attach LTP_$1 $SCRIPTPATH/LTP_$1.tar.gz
+exit 0
diff --git a/openembedded/ltp.yaml b/openembedded/ltp.yaml
index a48c097..6097690 100644
--- a/openembedded/ltp.yaml
+++ b/openembedded/ltp.yaml
@@ -2,7 +2,7 @@ metadata:
     name: ltp
     format: "Lava-Test-Shell Test Definition 1.0"
     version: 20140115
-    description: "Run LTP syscalls on OpenEmbedded."
+    description: "Run LTP test suite on OpenEmbedded."
     maintainer:
         - milosz.wasilewski@linaro.org
         - fathi.boudra@linaro.org
@@ -11,14 +11,17 @@ metadata:
     scope:
         - functional
     devices:
-        - rtsm_ve-armv8
+        - rtsm_fvp_base-aemv8a
+        - rtsm_fvp_base_cortex-a57x1-a53x1
+        - rtsm_fvp_base_cortex-a57x4-a53x4
+        - wg
 
 params:
-    TST_CMDFILES: syscalls,mm,math,timers,fcntl-locktests,ipc,fsx,fs,hugetlb,io,timers,nptl,pty,containers,fs_bind,filecaps,admin_tools,connectors
+    TST_CMDFILES: syscalls,mm,math,timers,fcntl-locktests,ipc,fsx,fs,hugetlb,io,nptl,pty,containers,fs_bind,filecaps,admin_tools,connectors
 
 run:
     steps:
-        - './openembedded/scripts/ltpfixup.sh $TST_CMDFILES'
+        - './common/scripts/ltpfixup.sh $TST_CMDFILES'
 
 parse:
     pattern: "^(?!.+ED)(?P<test_case_id>\\w+)\\s+(?P<result>\\w+)\\s+\\d$"
diff --git a/openembedded/scripts/ltpfixup.sh b/openembedded/scripts/ltpfixup.sh
deleted file mode 100755
index 3374d58..0000000
--- a/openembedded/scripts/ltpfixup.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-cd /opt/ltp
-./runltp -p -q -f $1
-find ./results -name "LTP_RUN_ON*" -print0 |xargs -0 cat
-exit 0
diff --git a/ubuntu/ltp.yaml b/ubuntu/ltp.yaml
index 4586bf6..aac24ac 100644
--- a/ubuntu/ltp.yaml
+++ b/ubuntu/ltp.yaml
@@ -1,7 +1,7 @@
 metadata:
     name: ltp
     format: "Lava-Test-Shell Test Definition 1.0"
-    description: "Run LTP syscalls tests"
+    description: "Run LTP test suite on Ubuntu"
     maintainer:
         - milosz.wasilewski@linaro.org
         - fathi.boudra@linaro.org
@@ -30,17 +30,16 @@ install:
         - bison
         - build-essential
         - wget
+
+params:
+    TST_CMDFILES: syscalls,mm,math,timers,fcntl-locktests,ipc,fsx,fs,hugetlb,io,nptl,pty,containers,fs_bind,filecaps,admin_tools,connectors
+
 run:
     steps:
-        - 'cd build'
-        - 'sudo ./runltp -f syscalls -p -q'
+        - './common/scripts/ltpfixup.sh $TST_CMDFILES'
 
 parse:
-    pattern: "^(?P<test_case_id>\\S+)\\s+\\d+\\s+(?P<result>\\w+)\\s+:\\s+.+"
+    pattern: "^(?!.+ED)(?P<test_case_id>\\w+)\\s+(?P<result>\\w+)\\s+\\d$"
     fixupdict:
-        TBROK: fail
-        TCONF: skip
-        TFAIL: fail
-        TINFO: skip
-        TPASS: pass
-        TWARN: unknown
+        FAIL: fail
+        PASS: pass