diff options
author | Arthur She <arthur.she@linaro.org> | 2020-10-09 06:55:33 -0700 |
---|---|---|
committer | Arthur She <arthur.she@linaro.org> | 2020-10-09 06:55:33 -0700 |
commit | fdbe033335a13a5b3e84741e7939724ebca6cba0 (patch) | |
tree | f108b73bf0f9f1a368fff839365fd2e4e2763ce7 /automated | |
parent | c7c7aadcb6f985a6a4ea2e726d79fd096a4fc626 (diff) |
igt: modify igt-test-runner-dmesg-warn-level.sh to igt_runner exclusive
Signed-off-by: Arthur She <arthur.she@linaro.org>
Diffstat (limited to 'automated')
-rwxr-xr-x | automated/linux/igt/igt-test-runner-dmesg-warn-level.sh | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/automated/linux/igt/igt-test-runner-dmesg-warn-level.sh b/automated/linux/igt/igt-test-runner-dmesg-warn-level.sh index 9c1fd7e..9758182 100755 --- a/automated/linux/igt/igt-test-runner-dmesg-warn-level.sh +++ b/automated/linux/igt/igt-test-runner-dmesg-warn-level.sh @@ -5,6 +5,8 @@ set -ex RESULT_LOG="result.log" DUMP_FRAMES_DIR="/root/dump-frames" +export IGT_TEST_ROOT="/usr/libexec/igt-gpu-tools" + generate_igtrc() { cd "$HOME" || exit 1 @@ -28,16 +30,7 @@ generate_chamelium_testlist() { echo "Generate Chamelium test list" TEST_LIST=igt-chamelium-test.testlist # Skip Display Port/VGA and Suspend/Hibrnate related tests - ${TEST_SCRIPT} --list-all | grep chamelium | grep -v "dp\|vga\|suspend\|hibernate" | tee "${IGT_DIR}"/"${TEST_LIST}" -} - -download_piglit() { - # Download Piglit - git config --global http.postBuffer 157286400 - if [ ! -d "${IGT_DIR}/piglit" ]; then - echo "Download Piglit.." - time ${TEST_SCRIPT} -d - fi + ${TEST_RUNNER} --list-all | grep chamelium | grep -v "dp\|vga\|suspend\|hibernate" | tee "${IGT_DIR}"/"${TEST_LIST}" } usage() { @@ -55,26 +48,23 @@ while getopts ":c:h:d:t:" opt; do esac done +TEST_RUNNER="${IGT_DIR}/runner/igt_runner" + if [ -z "${IGT_DIR}" ] || [ -z "${TEST_LIST}" ]; then usage fi +if [ ! -f "${TEST_RUNNER}" ]; then + echo "Can not find ${TEST_RUNNER}" + exit 1 +fi + if [ "${TEST_LIST}" = "CHAMELIUM" ]; then if [ -z "${CHAMELIUM_IP}" ] || [ -z "${HDMI_DEV_NAME}" ]; then usage fi fi -#TEST_SCRIPT="${IGT_DIR}/scripts/run-tests.sh" -TEST_SCRIPT="${IGT_DIR}/runner/igt_runner" - -export IGT_TEST_ROOT="/usr/libexec/igt-gpu-tools" - -#if [ ! -f "${IGT_DIR}/runner/igt_runner" ]; then -# ${TEST_SCRIPT} --help | grep -q '\-p' && TEST_SCRIPT="${TEST_SCRIPT} -p" -# download_piglit -#fi - if [ "${TEST_LIST}" == "CHAMELIUM" ]; then echo "Going to run igt Chamelium test" if [ ! -f "$HOME/.igtrc" ]; then @@ -89,5 +79,5 @@ fi # Run tests echo "Run ${TEST_LIST}" -${TEST_SCRIPT} --dmesg-warn-level 0 --test-list "${IGT_DIR}"/"${TEST_LIST}" --log-level verbose ${IGT_DIR}/results | tee tmp.log +${TEST_RUNNER} --dmesg-warn-level 0 --test-list "${IGT_DIR}"/"${TEST_LIST}" --log-level verbose "${IGT_DIR}"/results | tee tmp.log grep -e '^pass' -e '^skip' -e '^fail' tmp.log|awk -F':\ ' '{print $2" "$1}' > ${RESULT_LOG} |