From 90d8a7bed6f5e3a27d3a908911d2b80ea83b646f Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 16 Aug 2021 12:58:28 +0300 Subject: [PATCH] Add note on selecting the device which is used to run tests on Android Pick-to: 6.2 5.15 Change-Id: I9bcff18ca11fbbfdff968e29190cae488de56263 Reviewed-by: Edward Welbourne --- doc/global/externalsites/external-resources.qdoc | 4 ++++ src/testlib/doc/src/qttestlib-manual.qdoc | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc index 9c181336280..f3682e593a8 100644 --- a/doc/global/externalsites/external-resources.qdoc +++ b/doc/global/externalsites/external-resources.qdoc @@ -40,6 +40,10 @@ \externalpage https://developer.android.com/studio/publish/versioning#appversioning \title Android: App Versioning */ +/*! + \externalpage https://developer.android.com/studio/command-line/adb#devicestatus + \title Android: Query for devices +*/ /*! \externalpage http://www.freedesktop.org/ \title freedesktop.org diff --git a/src/testlib/doc/src/qttestlib-manual.qdoc b/src/testlib/doc/src/qttestlib-manual.qdoc index ff02ab876d2..d969cb1e0ac 100644 --- a/src/testlib/doc/src/qttestlib-manual.qdoc +++ b/src/testlib/doc/src/qttestlib-manual.qdoc @@ -153,6 +153,12 @@ All labeled targets will be run when \c {test} target is called on the command line. + \note On Android, if you have one connected device or emulator, tests will + run on that device. If you have more than one device connected, set the + environment variable \c {ANDROID_DEVICE_SERIAL} to the + \l {Android: Query for devices}{ADB serial number} of the device that + you want to run tests on. + There are several other advantages with CMake. For example, the result of a test run can be published on a web server using CDash with virtually no effort.