[oe-commits] Richard Purdie : Revert "meta-yocto-bsp: oeqa/controllers: add GrubTarget"

git at git.openembedded.org git at git.openembedded.org
Mon Jul 7 23:38:47 UTC 2014


Module: openembedded-core.git
Branch: master-next
Commit: c452b098b4c021d4cbeddf5bf13f7fd9b1cc9224
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c452b098b4c021d4cbeddf5bf13f7fd9b1cc9224

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Fri Jul  4 08:43:33 2014 +0100

Revert "meta-yocto-bsp: oeqa/controllers: add GrubTarget"

This reverts commit 01968e9244d0cf3deb1ec5cfb8e562d3b364add6.

Wrong repo

---

 meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py | 71 -----------------------
 1 file changed, 71 deletions(-)

diff --git a/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py b/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py
deleted file mode 100644
index 02ada65..0000000
--- a/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright (C) 2014 Intel Corporation
-#
-# Released under the MIT license (see COPYING.MIT)
-
-# This module adds support to testimage.bbclass to deploy images and run
-# tests on a Generic PC that boots using grub bootloader. The device must
-# be set up as per README.hardware and the master image should be deployed
-# onto the harddisk so that it boots into it by default.For booting into the
-# image under test we interact with grub over serial, so for the
-# Generic PC you will need an additional serial cable and device under test
-# needs to have a serial interface. The separate ext3
-# partition that will contain the image to be tested must be labelled
-# "testrootfs" so that the deployment code below can find it.
-
-import os
-import bb
-import time
-import subprocess
-import sys
-import pexpect
-
-import oeqa.utils.sshcontrol as sshcontrol
-from oeqa.controllers.masterimage import MasterImageHardwareTarget
-
-class GrubTarget(MasterImageHardwareTarget):
-
-    def __init__(self, d):
-        super(GrubTarget, self).__init__(d)
-        self.deploy_cmds = [
-                'mount -L boot /boot',
-                'mkdir -p /mnt/testrootfs',
-                'mount -L testrootfs /mnt/testrootfs',
-                'cp ~/test-kernel /boot',
-                'rm -rf /mnt/testrootfs/*',
-                'tar xvf ~/test-rootfs.%s -C /mnt/testrootfs' % self.image_fstype,
-                ]
-
-        if not self.serialcontrol_cmd:
-            bb.fatal("This TEST_TARGET needs a TEST_SERIALCONTROL_CMD defined in local.conf.")
-
-
-    def _deploy(self):
-        # make sure these aren't mounted
-        self.master.run("umount /boot; umount /mnt/testrootfs;")
-        self.master.ignore_status = False
-        # Kernel files may not be in the image, so copy them just in case
-        self.master.copy_to(self.rootfs, "~/test-rootfs." + self.image_fstype)
-        self.master.copy_to(self.kernel, "~/test-kernel")
-        for cmd in self.deploy_cmds:
-            self.master.run(cmd)
-
-    def _start(self, params=None):
-        self.power_cycle(self.master)
-        try:
-            serialconn = pexpect.spawn(self.serialcontrol_cmd, env=self.origenv, logfile=sys.stdout)
-            serialconn.expect("GNU GRUB  version 2.00")
-            serialconn.expect("Linux")
-            serialconn.sendline("OB\r")
-            serialconn.expect("login:", timeout=120)
-            serialconn.close()
-        except pexpect.ExceptionPexpect as e:
-            bb.fatal('Serial interaction failed: %s' % str(e))
-
-    def _wait_until_booted(self):
-        try:
-            serialconn = pexpect.spawn(self.serialcontrol_cmd, env=self.origenv, logfile=sys.stdout)
-            serialconn.expect("login:", timeout=120)
-            serialconn.close()
-        except pexpect.ExceptionPexpect as e:
-            bb.fatal('Serial interaction failed: %s' % str(e))
-



More information about the Openembedded-commits mailing list