diff options
| author | Arthur She <arthur.she@linaro.org> | 2020-05-26 15:36:21 -0700 |
|---|---|---|
| committer | Arthur She <arthur.she@linaro.org> | 2020-05-26 15:36:21 -0700 |
| commit | 7060089d869c98328629ca8873d123c2448bdc12 (patch) | |
| tree | 3045ebe07003eaf56820d95fcb474a546e1c014b /automated/linux/igt | |
| parent | c39d698eb5a820dc04d30b61f099c06962f2adf1 (diff) | |
igt: skip Chamelium test when running a given test list
igt-gpu-tools could run tests other than Chamelium test.
If we run a given test list, we don't need to check Chamelium status.
Signed-off-by: Arthur She <arthur.she@linaro.org>
Diffstat (limited to 'automated/linux/igt')
| -rwxr-xr-x | automated/linux/igt/igt-test.sh | 6 | ||||
| -rw-r--r-- | automated/linux/igt/igt-test.yaml | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/automated/linux/igt/igt-test.sh b/automated/linux/igt/igt-test.sh index c770e44..961cf18 100755 --- a/automated/linux/igt/igt-test.sh +++ b/automated/linux/igt/igt-test.sh @@ -57,8 +57,10 @@ if [ -z "${IGT_DIR}" ] || [ -z "${TEST_LIST}" ]; then usage fi -if [ "${TEST_LIST}" == "CHAMELIUM" ] && [ -z "${CHAMELIUM_IP}" ] || [ -z "${HDMI_DEV_NAME}" ]; then - usage +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" diff --git a/automated/linux/igt/igt-test.yaml b/automated/linux/igt/igt-test.yaml index 12cfcc6..c84c083 100644 --- a/automated/linux/igt/igt-test.yaml +++ b/automated/linux/igt/igt-test.yaml @@ -26,10 +26,11 @@ params: run: steps: - cd ./automated/linux/igt + - OPT="-d ${IGT_DIR} -t ${TEST_LIST}" + - if [ "${TEST_LIST}" = "CHAMELIUM" ]; then # Check if Chamelium is available - while [ ${CHAMELIUM_PING_RETRY} -gt 0 ]; do PC=`ping -c 2 ${CHAMELIUM_IP}|grep '100% packet loss'`||true; if [ -n "${PC}" ]; then ./control_chamelium.sh ${CHAMELIUM_REBOOT_ARG}; sleep 30; (( CHAMELIUM_PING_RETRY-- )); else break; fi; done - test ${CHAMELIUM_PING_RETRY} -gt 0 && lava-test-case "Ping-Chamelium" --result pass || lava-test-raise "Ping-Chamelium" - - OPT="-d ${IGT_DIR} -t ${TEST_LIST}" # Check Chamelium uboot console status - ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@${CHAMELIUM_IP} /usr/bin/lock_u_boot_console # Showing the uptime of Chamelium @@ -37,6 +38,7 @@ run: # ${CHAMELIUM_IP} is from LAVA device dictionary - if [ -n "${CHAMELIUM_IP}" ]; then OPT="${OPT} -c ${CHAMELIUM_IP}"; fi - if [ -n "${HDMI_DEV_NAME}" ]; then OPT="${OPT} -h ${HDMI_DEV_NAME}"; fi + - fi - ./igt-test.sh ${OPT} # Delete Chameliumd log - ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@${CHAMELIUM_IP} /usr/bin/uptime |