From c610d310e74e916aef97de2ed9832f49b7aac60b Mon Sep 17 00:00:00 2001 From: Paulo Neves Date: Tue, 7 Aug 2018 15:01:17 -0700 Subject: dev-manual, ref-manual: Updated available names for TEST_TARGET The documentation of available names for TEST_TARGET has been updated to match the convention of using the class names of controllers. This commit was modified some to make it work. Fixed some formatting errors and isolated and changed missed instances. (From yocto-docs rev: 1bec1dc38cdd1746ce6dd539f9c3e5665d12ab8e) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- .../dev-manual/dev-manual-common-tasks.xml | 22 ++++++++++----------- documentation/ref-manual/ref-variables.xml | 23 ++++++---------------- 2 files changed, 17 insertions(+), 28 deletions(-) (limited to 'documentation') diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml index afda0a439d..4bb9d7113b 100644 --- a/documentation/dev-manual/dev-manual-common-tasks.xml +++ b/documentation/dev-manual/dev-manual-common-tasks.xml @@ -11400,8 +11400,8 @@ within a separately started QEMU or any other virtual machine manager. - "Systemd-bootTarget": - Choose "Systemd-bootTarget" if your hardware is + "SystemdbootTarget": + Choose "SystemdbootTarget" if your hardware is an EFI-based machine with systemd-boot as bootloader and core-image-testmaster @@ -11409,10 +11409,10 @@ Also, your hardware under test must be in a DHCP-enabled network that gives it the same IP address for each reboot. - If you choose "Systemd-bootTarget", there are + If you choose "SystemdbootTarget", there are additional requirements and considerations. See the - "Selecting Systemd-bootTarget" + "Selecting SystemdbootTarget" section, which follows, for more information. "BeagleBoneTarget": @@ -11458,12 +11458,12 @@ -
- Selecting Systemd-bootTarget +
+ Selecting SystemdbootTarget If you did not set TEST_TARGET to - "Systemd-bootTarget", then you do not need any information + "SystemdbootTarget", then you do not need any information in this section. You can skip down to the "Running Tests" @@ -11472,7 +11472,7 @@ If you did set TEST_TARGET to - "Systemd-bootTarget", you also need to perform a one-time + "SystemdbootTarget", you also need to perform a one-time setup of your master image by doing the following: Set EFI_PROVIDER: @@ -11543,7 +11543,7 @@ The final thing you need to do when setting - TEST_TARGET to "Systemd-bootTarget" is + TEST_TARGET to "SystemdbootTarget" is to set up the test image: Set up your local.conf file: @@ -11552,7 +11552,7 @@ IMAGE_FSTYPES += "tar.gz" INHERIT += "testimage" - TEST_TARGET = "Systemd-bootTarget" + TEST_TARGET = "SystemdbootTarget" TEST_TARGET_IP = "192.168.2.3" @@ -11969,7 +11969,7 @@ The target controller object used to deploy and start an image on a particular target (e.g. QemuTarget, SimpleRemote, and - Systemd-bootTarget). + SystemdbootTarget). Tests usually use the following: ip: diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml index 346090f0d4..206a77012d 100644 --- a/documentation/ref-manual/ref-variables.xml +++ b/documentation/ref-manual/ref-variables.xml @@ -15285,9 +15285,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" Specifies the target controller to use when running tests against a test image. - The default controller to use is "qemu": + The default controller to use is "QemuTarget": - TEST_TARGET = "qemu" + TEST_TARGET = "QemuTarget" @@ -15306,35 +15306,24 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" You can provide the following arguments with TEST_TARGET: - "qemu" and "QemuTarget": + "QemuTarget": Boots a QEMU image and runs the tests. See the "Enabling Runtime Tests on QEMU" section in the Yocto Project Development Tasks Manual for more information. - "simpleremote" and "SimpleRemoteTarget": + "SimpleRemoteTarget": Runs the tests on target hardware that is already up and running. The hardware can be on the network or it can be a device running an image on QEMU. You must also set TEST_TARGET_IP - when you use "simpleremote" or "SimpleRemoteTarget". + when you use "SimpleRemoteTarget". This argument is defined in - meta/lib/oeqa/targetcontrol.py. - The small caps names are kept for compatibility - reasons. - - - "GummibootTarget": - Automatically deploys and runs tests on an - EFI-enabled machine that has a master image - installed. - - This argument is defined in - meta/lib/oeqa/controllers/masterimage.py. + meta/lib/oeqa/controllers/simpleremote.py. -- cgit v1.2.3-54-g00ecf