diff options
author | Chase Qi <chase.qi@linaro.org> | 2018-09-14 15:27:37 +0800 |
---|---|---|
committer | Chase Qi <chase.qi@linaro.org> | 2018-09-17 18:28:46 -0700 |
commit | 3cbb5e005bec07d9d2deebbd99fe9d69f231d61f (patch) | |
tree | 55a48eeea9c7dc1beeb3d3ea995200e9164ea1e7 /automated/linux | |
parent | fb1c1b0ede682582d0e3f4c920137542130deea2 (diff) |
linux/v4l2-compliance: support to modprobe driver and install v4l-utils
* Add hikey to supported board list.
* Add support to modprobe driver module.
* Try to install v4l-utils when v4l2-compliance command not found.
* Drop support for media device testing as we cannot really test it.
* Bug fixes.
Change-Id: I8518a06e04a1f842f4ebacf32c9b63eaf58ef5cb
Signed-off-by: Chase Qi <chase.qi@linaro.org>
Diffstat (limited to 'automated/linux')
-rwxr-xr-x | automated/linux/v4l2/v4l2-compliance.sh | 40 | ||||
-rw-r--r-- | automated/linux/v4l2/v4l2-compliance.yaml | 7 |
2 files changed, 27 insertions, 20 deletions
diff --git a/automated/linux/v4l2/v4l2-compliance.sh b/automated/linux/v4l2/v4l2-compliance.sh index 73a609fe..cea6eaf8 100755 --- a/automated/linux/v4l2/v4l2-compliance.sh +++ b/automated/linux/v4l2/v4l2-compliance.sh @@ -2,33 +2,47 @@ . ../../lib/sh-test-lib OUTPUT="$(pwd)/output" -RESULT_FILE="${OUTPUT}/result.txt" +export RESULT_FILE="${OUTPUT}/result.txt" TEST_SUITE="v4l2-compliance" +VIDEO_DEVICE="/dev/video0" +VIDEO_DRIVER="" + usage() { - echo "Usage: $0 [-d <video device>" 1>&2 + echo "Usage: $0 [-d <video device> -D <video driver>" 1>&2 exit 1 } -while getopts "d:h:m:" o; do +while getopts "d:D:h" o; do case "$o" in d) VIDEO_DEVICE="${OPTARG}" ;; - m) MEDIA_DEVICE_NUM="${OPTARG}" - MEDIA_DEVICE="/dev/media${OPTARG}" ;; + D) VIDEO_DRIVER="${OPTARG}" ;; h|*) usage ;; esac done echo VIDEO_DEVICE="${VIDEO_DEVICE}" -echo MEDIA_DEVICE="${MEDIA_DEVICE}" -echo MEDIA_DEVICE_NUM="${MEDIA_DEVICE_NUM}" +echo VIDEO_DRIVER="${VIDEO_DRIVER}" # Test run. create_out_dir "${OUTPUT}" +# Try to install v4l-utils when v4l2-compliance not found. +# install_deps() skips installation on unsupported distro +# like OE based builds by default. +command -v v4l2-compliance || install_deps "v4l-utils" command -v v4l2-compliance exit_on_fail "v4l2-existence-check" +if [ -n "${VIDEO_DRIVER}" ] && ! lsmod | grep "${VIDEO_DRIVER%.*}"; then + check_root || error_msg "Please run this script as root to modprobe driver module!" + ln -s "$(find "/lib/modules/$(uname -r)" -name "${VIDEO_DRIVER}*")" \ + "/lib/modules/$(uname -r)" + depmod -a + modprobe "${VIDEO_DRIVER%.*}" no_error_inj=1 + exit_on_fail "modprobe-${VIDEO_DRIVER%.*}" +fi + if [ ! -z "${VIDEO_DEVICE}" ] && [ -e "${VIDEO_DEVICE}" ]; then info_msg "Running v4l2-compliance device test..." LOG_FILE="${OUTPUT}/${TEST_SUITE}-output.txt" @@ -39,16 +53,6 @@ else info_msg "Skipping v4l2-compliance device test..." fi -if [ ! -z "${MEDIA_DEVICE}" ] && [ -e "${MEDIA_DEVICE}" ]; then - info_msg "Running v4l2-compliance media test..." - LOG_FILE="${OUTPUT}/${TEST_SUITE}-output.txt" - test_cmd="v4l2-compliance -v -m${MEDIA_DEVICE_NUM} 2>&1" - pipe0_status "${test_cmd}" "tee ${LOG_FILE}" - check_return "v4l2-compliance" -else - info_msg "Skipping v4l2-compliance media test..." -fi - # Parse test log. grep -e FAIL -e OK "${LOG_FILE}" | \ sed -e 's/^[ \t]*//' \ @@ -57,4 +61,4 @@ grep -e FAIL -e OK "${LOG_FILE}" | \ -e 's/ /_/g' \ -e 's/:_/ /' \ -e 's/ OK/ PASS/' \ - > "${RESULT_FILE}" + >> "${RESULT_FILE}" diff --git a/automated/linux/v4l2/v4l2-compliance.yaml b/automated/linux/v4l2/v4l2-compliance.yaml index c386d435..cf013346 100644 --- a/automated/linux/v4l2/v4l2-compliance.yaml +++ b/automated/linux/v4l2/v4l2-compliance.yaml @@ -11,13 +11,16 @@ metadata: - functional devices: - imx7s-warp + - hikey params: VIDEO_DEVICE: "/dev/video0" - MEDIA_DEVICE_NUM: "0" + # Specify video driver module to modprobe. + # Example: vivid.ko + VIDEO_DRIVER: "" run: steps: - cd ./automated/linux/v4l2/ - - ./v4l2-compliance.sh -d "${VIDEO_DEVICE}" -m "${MEDIA_DEVICE_NUM}" + - ./v4l2-compliance.sh -d "${VIDEO_DEVICE}" -D "${VIDEO_DRIVER}" - ../../utils/send-to-lava.sh ./output/result.txt |