summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBotao Sun <botao.sun@linaro.org>2014-03-26 18:16:54 +1100
committerBotao Sun <botao.sun@linaro.org>2014-04-04 17:52:16 +1100
commit041762839281565e0fa3860750e808c084efa627 (patch)
treea53b926f73233941500d3c767f5860b63cbe1645
parentaf7059a2e79ff0d8ea6c2a8073d0e6ef9bbd68f1 (diff)
Update ubuntu Device Tree Test Code
Remove sudo in yaml file; Remove check root in device-tree.sh, it's unnecessary; Fix the MODEL test case name issue; Add and update metadata and comments section. Signed-off by: Botao Sun <botao.sun@linaro.org> Change-Id: I6688b2595831abc78a7a20fb40d8adee461f23f8
-rw-r--r--ubuntu/device-tree.yaml10
-rwxr-xr-xubuntu/scripts/device-tree.sh14
2 files changed, 12 insertions, 12 deletions
diff --git a/ubuntu/device-tree.yaml b/ubuntu/device-tree.yaml
index 7442655..08001b6 100644
--- a/ubuntu/device-tree.yaml
+++ b/ubuntu/device-tree.yaml
@@ -2,12 +2,14 @@ metadata:
name: device-tree
format: "Lava-Test-Shell Test Definition 1.0"
description: "Device tree test to check the folder structure"
+ maintainer:
+ - botao.sun@linaro.org
os:
- ubuntu
- openembedded
+ scope:
+ - functional
devices:
- - origen
- - snowball
- panda
- panda-es
- vexpress-a9
@@ -17,12 +19,14 @@ metadata:
- rtsm_fvp_base-aemv8a
- arndale
- aa9
+ - origen
+ - snowball
environment:
- lava-test-shell
run:
steps:
- - "cd ubuntu/scripts; sudo bash -x ./device-tree.sh"
+ - "cd ubuntu/scripts; ./device-tree.sh"
parse:
pattern: "(?P<test_case_id>[a-zA-Z0-9_-]+):\\s(?P<result>\\w+)"
diff --git a/ubuntu/scripts/device-tree.sh b/ubuntu/scripts/device-tree.sh
index f22ee5a..199d1c4 100755
--- a/ubuntu/scripts/device-tree.sh
+++ b/ubuntu/scripts/device-tree.sh
@@ -1,8 +1,8 @@
#!/bin/bash
#
-# Device Tree Enablement test cases
+# Device Tree test cases for Linux Linaro ubuntu
#
-# Copyright (C) 2012, Linaro Limited.
+# Copyright (C) 2012 - 2014, Linaro Limited.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -19,6 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# Author: Ricardo Salveti <rsalveti@linaro.org>
+# Maintainer Botao Sun <botao.sun@linaro.org>
#
source include/sh-test-lib
@@ -54,19 +55,14 @@ test_device_tree_model_not_empty() {
return 1
fi
- echo "MODEL: $model" 1>&2
+ echo "The model of the board is $model"
pass_test
}
-# check we're root
-if ! check_root; then
- error_msg "Please run the test case as root"
-fi
-
# run the tests
test_has_proc_device_tree
test_device_tree_model_not_empty
# clean exit so lava-test can trust the results
-exit 0
+exit 0 \ No newline at end of file