From 3614844650da910a947e0ed8566ac635e4f03576 Mon Sep 17 00:00:00 2001 From: Burak Hancerli <burak.hancerli@qt.io> Date: Tue, 4 Jun 2024 11:42:35 +0200 Subject: [PATCH] cicd: fix the app name in the tests --- cicd/stages/test.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cicd/stages/test.yml b/cicd/stages/test.yml index b72431d..3b2cce3 100644 --- a/cicd/stages/test.yml +++ b/cicd/stages/test.yml @@ -20,11 +20,11 @@ test-x86_64: - cd ${QDS_CI_ARTIFACTS_PATH}/x86_64/test || exit 1 - mkdir -p ${QDS_CI_JOB_TEST_RESULTS_PATH} - adb install -r -g android-build-release.apk - - adb shell "run-as io.qt.qtuiviewer.test rm -rf /data/data/io.qt.qtuiviewer.test/files/output.junitxml" - - adb shell am start -e applicationArguments "'-o output.junitxml,junitxml'" -n io.qt.qtuiviewer.test/org.qtproject.qt.android.bindings.QtActivity + - adb shell "run-as io.qt.qtdesignviewer.test rm -rf /data/data/io.qt.qtdesignviewer.test/files/output.junitxml" + - adb shell am start -e applicationArguments "'-o output.junitxml,junitxml'" -n io.qt.qtdesignviewer.test/org.qtproject.qt.android.bindings.QtActivity - | counter=0 - while [ -z "$(adb shell pidof -s io.qt.qtuiviewer.test)" ]; do + while [ -z "$(adb shell pidof -s io.qt.qtdesignviewer.test)" ]; do echo "Waiting for test to start" sleep 0.1 counter=$((counter+1)) @@ -33,11 +33,11 @@ test-x86_64: exit 1 fi done - - PID_OF_TEST=$(adb shell pidof -s io.qt.qtuiviewer.test) + - PID_OF_TEST=$(adb shell pidof -s io.qt.qtdesignviewer.test) - 'echo "PID of test: ${PID_OF_TEST}"' - | counter=0 - while [ -n "$(adb shell pidof -s io.qt.qtuiviewer.test)" ]; do + while [ -n "$(adb shell pidof -s io.qt.qtdesignviewer.test)" ]; do echo "Waiting for test to finish" sleep 0.1 counter=$((counter+1)) @@ -47,8 +47,8 @@ test-x86_64: fi done - adb logcat -d --pid=${PID_OF_TEST} > ${QDS_CI_JOB_TEST_RESULTS_PATH}/logcat.txt - - adb shell "run-as io.qt.qtuiviewer.test cat /data/data/io.qt.qtuiviewer.test/files/output.junitxml" > output.junit.xml - - adb uninstall io.qt.qtuiviewer.test + - adb shell "run-as io.qt.qtdesignviewer.test cat /data/data/io.qt.qtdesignviewer.test/files/output.junitxml" > output.junit.xml + - adb uninstall io.qt.qtdesignviewer.test - mv output.junit.xml ${QDS_CI_JOB_TEST_RESULTS_PATH}/test.junit.xml artifacts: paths: -- GitLab