In sync with upstream

Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>

2 files changed, 14 insertions, 35 deletions

diff --git a/ubuntu/install-uprobe-kernel-on-arndale.yaml b/ubuntu/install-uprobe-kernel-on-arndale.yaml
index 7b4151b..5ff05b1 100644
--- a/ubuntu/install-uprobe-kernel-on-arndale.yaml
+++ b/ubuntu/install-uprobe-kernel-on-arndale.yaml
@@ -1,7 +1,7 @@
 metadata:
     name: install-uprobe-kernel-on-arndale
     format: "Lava-Test-Shell Test Definition 1.0"
-    description: "Build and install uprobes kernel on arndale. Pre-requirement of uprobes_systemtap_test.yaml"
+    description: "Build and install uprobes kernel on arndale. Pre-requirement of native-uprobes-systemtap-test.yaml"
     maintainer:
         - naresh.kamboju@linaro.org
     os:
@@ -26,44 +26,28 @@ install:
         - u-boot-tools
 
     steps:
-        - 'git clone git://git.linaro.org/kernel/linux-linaro-tracking.git /usr/src/linux-linaro-tracking'
-        - 'echo git_clone_linux-linaro-tracking: pass'
-        - 'git clone git://git.linaro.org/qa/test-definitions.git /usr/src/test-definitions'
-        - 'echo git_clone_test-definitions: pass'
+        - 'HOME_PWD=`pwd`'
+        - 'git clone --depth 1 git://git.linaro.org/kernel/linux-linaro-tracking.git /usr/src/linux-linaro-tracking'
         - 'cd /usr/src/linux-linaro-tracking'
         - 'git checkout -b linux-linaro-uprobes origin/linux-linaro'
-        - 'echo checkout_linux-linaro: pass'
         - 'ARCH=arm scripts/kconfig/merge_config.sh linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/kvm-host.conf linaro/configs/xen.conf linaro/configs/uprobes.conf linaro/configs/arndale.conf'
         - 'make -j4  ARCH=arm LOADADDR=0x40008000 uImage'
-        - 'echo make_uImage: pass'
         - 'make ARCH=arm modules'
-        - 'echo make_modules: pass'
         - 'make ARCH=arm modules_install'
-        - 'echo make_modules_install: pass'
-        - 'cp /usr/src/test-definitions/common/scripts/make-kernel-install.exp /usr/src/linux-linaro-tracking/'
-        - 'echo copy_make-kernel-install: pass'
+        - 'cp $HOME_PWD/common/scripts/make-kernel-install.exp /usr/src/linux-linaro-tracking/'
         - '/usr/bin/expect make-kernel-install.exp'
-        - 'echo make-kernel-install: pass'
         - 'make ARCH=arm headers_install'
-        - 'echo make_headers-install: pass'
         - 'mount /dev/mmcblk1p5 /mnt/'
-        - 'echo mount_boot_partition: pass'
         - 'cp arch/arm/boot/uImage /mnt/'
-        - 'echo copy_uImage: pass'
         - 'umount /mnt/'
-        - 'echo umount_boot_partition: pass'
 run:
     steps:
         - 'cat /proc/version'
         - 'df -h'
-parse:
-    pattern: "^(?P<test_case_id>\\S+)\\s+:\\s+(?P<result>\\S+)$"
-    fixupdict:
-          PASS: pass
-          FAIL: fail
+        - 'lava-test-case install-uprobe-kernel-on-arndale --result pass'
 
 # Linux kernel clone, build, install would take 3 hours on target.
-# 10 GB test partition needed for install-uprobe-kernel and uprobes_systemtap_test
+# 10 GB test partition needed for install-uprobe-kernel and native-uprobes-systemtap-test.yaml
 # uImage will be copied on to boot partition.
 # Newly installed kernel image would be booted in next reboot by lava_test_shell
 # uprobes_systemtap_test.yaml would be run after this test.
diff --git a/ubuntu/uprobes_systemtap_test.yaml b/ubuntu/uprobes_systemtap_test.yaml
index daa9526..b6d3d9b 100644
--- a/ubuntu/uprobes_systemtap_test.yaml
+++ b/ubuntu/uprobes_systemtap_test.yaml
@@ -1,5 +1,5 @@
 metadata:
-    name: uprobes_systemtap_test
+    name: native-uprobes-systemtap-test
     format: "Lava-Test-Shell Test Definition 1.0"
     description: "Run uprobes systemtap tests. Pre-requirement is install-uprobe-kernel-on-arndale.yaml"
     maintainer:
@@ -30,14 +30,12 @@ install:
         - 'ls -l /lib/modules/`uname -r`/build/ | true'
         - 'cd /usr/src/'
         - 'wget --no-check-certificate  https://fedorahosted.org/releases/e/l/elfutils/0.159/elfutils-0.159.tar.bz2'
-        - 'echo PASS: wget_elfutils'
         - 'tar -xvf elfutils-0.159.tar.bz2'
         - 'wget --no-check-certificate https://sourceware.org/systemtap/ftp/releases/systemtap-2.5.tar.gz'
-        - 'echo PASS: wget_systemtap'
         - 'tar -xvf systemtap-2.5.tar.gz'
         - 'cd systemtap-2.5'
         - 'cp /usr/share/dejagnu/* . -a'
-        - 'echo skip tests which are known to hang'
+        - 'echo "skip tests which are known to hang"'
         - 'mv testsuite/systemtap.base/poll_map.exp testsuite/systemtap.base/poll_map.exp.back'
         - 'mv testsuite/systemtap.base/pr14546.exp testsuite/systemtap.base/pr14546.exp.back'
         - 'mv testsuite/systemtap.base/pr10854.exp testsuite/systemtap.base/pr10854.exp.back'
@@ -47,21 +45,18 @@ install:
         - 'mv testsuite/systemtap.base/target_set_thread.exp testsuite/systemtap.base/target_set_thread.exp.back'
         - 'mv testsuite/systemtap.unprivileged/unprivileged_myproc.exp testsuite/systemtap.unprivileged/unprivileged_myproc.exp.back'
         - './configure --prefix=/usr/local/ --with-elfutils=../elfutils-0.159'
-        - 'echo PASS: systemtap_configure'
         - 'make all'
-        - 'echo PASS: systemtap_make'
         - 'make install'
-        - 'echo PASS: systemtap_make_install'
 run:
     steps:
+        - 'lava-test-case systemtap-make-install --result pass'
         - 'cd /usr/src/systemtap-2.5'
         - 'make installcheck'
-        - 'echo PASS: systemtap_make_installcheck'
+        - 'lava-test-case systemtap-make-installcheck --result pass'
         - 'cat testsuite/systemtap.sum'
-        - "tar -zcvf systemtap_results.tar.gz testsuite/systemtap.sum testsuite/systemtap.log"
-        - 'echo PASS: archive_systemtap_results'
-        - "lava-test-run-attach /usr/src/systemtap-2.5/systemtap-results.tar.gz application/x-gtar"
-        - 'echo PASS: attachment_systemtap_results_tar_ball'
+        - 'lava-test-case-attach systemtap.sum testsuite/systemtap.sum text/plain'
+        - 'lava-test-case-attach systemtap.log testsuite/systemtap.log text/plain'
+        - 'lava-test-case attach-systemtap-results --result pass'
 parse:
     pattern: "(?P<result>PASS|FAIL|KFAIL|XFAIL|UNTESTED|UNSUPPORTED): (?P<test_case_id>[ ().0-9A-Za-z-_/]*)"
     fixupdict:
@@ -73,7 +68,7 @@ parse:
         UNSUPPORTED: skip
 
 # install-uprobe-kernel-on-arndale.yaml to be run before test
-# 10 GB test partition needed for install-uprobe-kernel and uprobes_systemtap_test
+# 10 GB test partition needed for install-uprobe-kernel and native-uprobes-systemtap-test
 # This is a long running test, expected to run for 25 hours.
 # Systemtap build, install and installcheck is the purpose of this test.
 # make installcheck runs systemtap testsuite.