diff options
Diffstat (limited to 'meta/lib/oeqa/controllers/masterimage.py')
-rw-r--r-- | meta/lib/oeqa/controllers/masterimage.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/controllers/masterimage.py b/meta/lib/oeqa/controllers/masterimage.py index 311f0cf68c..522f9ebd76 100644 --- a/meta/lib/oeqa/controllers/masterimage.py +++ b/meta/lib/oeqa/controllers/masterimage.py | |||
@@ -52,7 +52,7 @@ class MasterImageHardwareTarget(oeqa.targetcontrol.BaseTarget): | |||
52 | # test rootfs + kernel | 52 | # test rootfs + kernel |
53 | self.image_fstype = self.get_image_fstype(d) | 53 | self.image_fstype = self.get_image_fstype(d) |
54 | self.rootfs = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("IMAGE_LINK_NAME", True) + '.' + self.image_fstype) | 54 | self.rootfs = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("IMAGE_LINK_NAME", True) + '.' + self.image_fstype) |
55 | self.kernel = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("KERNEL_IMAGETYPE") + '-' + d.getVar('MACHINE') + '.bin') | 55 | self.kernel = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("KERNEL_IMAGETYPE", False) + '-' + d.getVar('MACHINE', False) + '.bin') |
56 | if not os.path.isfile(self.rootfs): | 56 | if not os.path.isfile(self.rootfs): |
57 | # we could've checked that IMAGE_FSTYPES contains tar.gz but the config for running testimage might not be | 57 | # we could've checked that IMAGE_FSTYPES contains tar.gz but the config for running testimage might not be |
58 | # the same as the config with which the image was build, ie | 58 | # the same as the config with which the image was build, ie |
@@ -73,10 +73,10 @@ class MasterImageHardwareTarget(oeqa.targetcontrol.BaseTarget): | |||
73 | # e.g: TEST_POWERCONTROL_CMD = "/home/user/myscripts/powercontrol.py ${MACHINE} what-ever-other-args-the-script-wants" | 73 | # e.g: TEST_POWERCONTROL_CMD = "/home/user/myscripts/powercontrol.py ${MACHINE} what-ever-other-args-the-script-wants" |
74 | # the command should take as the last argument "off" and "on" and "cycle" (off, on) | 74 | # the command should take as the last argument "off" and "on" and "cycle" (off, on) |
75 | self.powercontrol_cmd = d.getVar("TEST_POWERCONTROL_CMD", True) or None | 75 | self.powercontrol_cmd = d.getVar("TEST_POWERCONTROL_CMD", True) or None |
76 | self.powercontrol_args = d.getVar("TEST_POWERCONTROL_EXTRA_ARGS") or "" | 76 | self.powercontrol_args = d.getVar("TEST_POWERCONTROL_EXTRA_ARGS", False) or "" |
77 | 77 | ||
78 | self.serialcontrol_cmd = d.getVar("TEST_SERIALCONTROL_CMD", True) or None | 78 | self.serialcontrol_cmd = d.getVar("TEST_SERIALCONTROL_CMD", True) or None |
79 | self.serialcontrol_args = d.getVar("TEST_SERIALCONTROL_EXTRA_ARGS") or "" | 79 | self.serialcontrol_args = d.getVar("TEST_SERIALCONTROL_EXTRA_ARGS", False) or "" |
80 | 80 | ||
81 | self.origenv = os.environ | 81 | self.origenv = os.environ |
82 | if self.powercontrol_cmd or self.serialcontrol_cmd: | 82 | if self.powercontrol_cmd or self.serialcontrol_cmd: |