diff options
author | Fathi Boudra <fathi.boudra@linaro.org> | 2020-12-15 08:46:38 +0100 |
---|---|---|
committer | Fathi Boudra <fathi.boudra@linaro.org> | 2020-12-16 10:18:11 +0100 |
commit | d08deda7c619b617523f9e52f1d82ef841dfa761 (patch) | |
tree | ece4e15edb01b57ea5a12ca5a62788b720a9a59b | |
parent | d507b5b0875fc2d8398d44cf47495c72bddd64d2 (diff) |
automated: linux: device-tree: refactor the test
Prepare for adding a skip list. Make the test easier to read and follow.
* there's a couple of functions that aren't necessary.
* being root isn't necessary.
* added SPDX license identifier, set to GPL-2.0-only.
Note: the license was previously GPL2+. It has been agreed
by its authors to relicense to GPL-2.0-only.
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
-rwxr-xr-x | automated/linux/device-tree/device-tree.sh | 64 | ||||
-rw-r--r-- | automated/linux/device-tree/device-tree.yaml | 2 |
2 files changed, 20 insertions, 46 deletions
diff --git a/automated/linux/device-tree/device-tree.sh b/automated/linux/device-tree/device-tree.sh index 5f4e15a..2ae50b6 100755 --- a/automated/linux/device-tree/device-tree.sh +++ b/automated/linux/device-tree/device-tree.sh @@ -1,23 +1,9 @@ #!/bin/sh +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (C) 2016-2020 Linaro Ltd. # # Device Tree test cases # -# Copyright (C) 2016, Linaro Limited. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# # Author: Ricardo Salveti <rsalveti@linaro.org> # Maintainer: Naresh Kamboju <naresh.kamboju@linaro.org> @@ -25,42 +11,21 @@ . ../../lib/sh-test-lib OUTPUT="$(pwd)/output" -RESULT_FILE="${OUTPUT}/result.txt" -export RESULT_FILE +export RESULT_FILE="${OUTPUT}/result.txt" SYSFS_DEVICE_TREE="/sys/firmware/devicetree/base/" DEVICE_TREE="/proc/device-tree" MODEL="model" COMPATIBLE="compatible" -DT_SKIP_LIST_1="device-tree-${MODEL} device-tree-${COMPATIBLE}" -DT_SKIP_LIST_2="device_tree ${DT_SKIP_LIST_1}" - -# Check if /proc/device-tree is available -device_tree() { - [ -d "${DEVICE_TREE}" ] - exit_on_fail "device-tree" "${DT_SKIP_LIST_1}" -} +DT_SKIP_LIST="device-tree-${MODEL} device-tree-${COMPATIBLE}" -# Check device tree property -device_tree_property() { - [ "$#" -ne 1 ] && error_msg "Usage: device_tree_property test" - test="$1" - - DATA="$(cat "${DEVICE_TREE}/${test}")" - [ -n "${DATA}" ] - check_return "device-tree-${test}" -} - -# Test run. -! check_root && error_msg "This script must be run as root" +# Test run create_out_dir "${OUTPUT}" -if [ -f /proc/config.gz ] -then +if [ -f /proc/config.gz ]; then CONFIG_PROC_FS=$(zcat /proc/config.gz | grep "CONFIG_PROC_FS=") CONFIG_OF=$(zcat /proc/config.gz | grep "CONFIG_OF=") -elif [ -f /boot/config-"$(uname -r)" ] -then +elif [ -f /boot/config-"$(uname -r)" ]; then KERNEL_CONFIG_FILE="/boot/config-$(uname -r)" CONFIG_PROC_FS=$(grep "CONFIG_PROC_FS=" "${KERNEL_CONFIG_FILE}") CONFIG_OF=$(grep "CONFIG_OF=" "${KERNEL_CONFIG_FILE}") @@ -68,8 +33,15 @@ else exit_on_skip "device-tree-pre-requirements" "Kernel config file not available" fi +# Check if kernel config is available [ "${CONFIG_PROC_FS}" = "CONFIG_PROC_FS=y" ] && [ "${CONFIG_OF}" = "CONFIG_OF=y" ] && [ -d "${SYSFS_DEVICE_TREE}" ] -exit_on_fail "device-tree-Kconfig" "${DT_SKIP_LIST_2}" -device_tree -device_tree_property "${MODEL}" -device_tree_property "${COMPATIBLE}" +exit_on_fail "device-tree-Kconfig" "device_tree ${DT_SKIP_LIST}" + +# Check if /proc/device-tree is available +[ -d "${DEVICE_TREE}" ] +exit_on_fail "device-tree" "${DT_SKIP_LIST}" + +for dt_test in ${MODEL} ${COMPATIBLE}; do + [ -n "$(cat "${DEVICE_TREE}/${dt_test}")" ] + check_return "device-tree-${dt_test}" +done diff --git a/automated/linux/device-tree/device-tree.yaml b/automated/linux/device-tree/device-tree.yaml index c8637d0..20f6a51 100644 --- a/automated/linux/device-tree/device-tree.yaml +++ b/automated/linux/device-tree/device-tree.yaml @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (C) 2016-200 Linaro Ltd. metadata: name: device-tree format: "Lava-Test Test Definition 1.0" |