diff options
Diffstat (limited to 'meta/lib/oeqa/targetcontrol.py')
-rw-r--r-- | meta/lib/oeqa/targetcontrol.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py index 3209ef0430..24669f461d 100644 --- a/meta/lib/oeqa/targetcontrol.py +++ b/meta/lib/oeqa/targetcontrol.py | |||
@@ -119,8 +119,7 @@ class QemuTarget(BaseTarget): | |||
119 | 119 | ||
120 | self.image_fstype = self.get_image_fstype(d) | 120 | self.image_fstype = self.get_image_fstype(d) |
121 | self.qemulog = os.path.join(self.testdir, "qemu_boot_log.%s" % self.datetime) | 121 | self.qemulog = os.path.join(self.testdir, "qemu_boot_log.%s" % self.datetime) |
122 | self.origrootfs = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("IMAGE_LINK_NAME", True) + '.' + self.image_fstype) | 122 | self.rootfs = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("IMAGE_LINK_NAME", True) + '.' + self.image_fstype) |
123 | self.rootfs = os.path.join(self.testdir, d.getVar("IMAGE_LINK_NAME", True) + '-testimage.' + self.image_fstype) | ||
124 | self.kernel = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("KERNEL_IMAGETYPE", False) + '-' + d.getVar('MACHINE', False) + '.bin') | 123 | self.kernel = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("KERNEL_IMAGETYPE", False) + '-' + d.getVar('MACHINE', False) + '.bin') |
125 | dump_target_cmds = d.getVar("testimage_dump_target", True) | 124 | dump_target_cmds = d.getVar("testimage_dump_target", True) |
126 | dump_host_cmds = d.getVar("testimage_dump_host", True) | 125 | dump_host_cmds = d.getVar("testimage_dump_host", True) |
@@ -166,11 +165,7 @@ class QemuTarget(BaseTarget): | |||
166 | self.target_dumper = TargetDumper(dump_target_cmds, dump_dir, self.runner) | 165 | self.target_dumper = TargetDumper(dump_target_cmds, dump_dir, self.runner) |
167 | 166 | ||
168 | def deploy(self): | 167 | def deploy(self): |
169 | try: | 168 | bb.utils.mkdirhier(self.testdir) |
170 | bb.utils.mkdirhier(self.testdir) | ||
171 | shutil.copyfile(self.origrootfs, self.rootfs) | ||
172 | except Exception as e: | ||
173 | bb.fatal("Error copying rootfs: %s" % e) | ||
174 | 169 | ||
175 | qemuloglink = os.path.join(self.testdir, "qemu_boot_log") | 170 | qemuloglink = os.path.join(self.testdir, "qemu_boot_log") |
176 | if os.path.islink(qemuloglink): | 171 | if os.path.islink(qemuloglink): |