diff options
Diffstat (limited to 'poky/meta/lib')
| -rw-r--r-- | poky/meta/lib/oeqa/selftest/cases/recipetool.py | 4 | ||||
| -rw-r--r-- | poky/meta/lib/oeqa/selftest/cases/wic.py | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/poky/meta/lib/oeqa/selftest/cases/recipetool.py b/poky/meta/lib/oeqa/selftest/cases/recipetool.py index 754ea9498..437eb2a73 100644 --- a/poky/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/poky/meta/lib/oeqa/selftest/cases/recipetool.py @@ -431,12 +431,12 @@ class RecipetoolTests(RecipetoolBase): temprecipe = os.path.join(self.tempdir, 'recipe') os.makedirs(temprecipe) recipefile = os.path.join(temprecipe, 'navit_0.5.0.bb') - srcuri = 'http://downloads.sourceforge.net/project/navit/v0.5.0/navit-0.5.0.tar.gz' + srcuri = 'http://downloads.yoctoproject.org/mirror/sources/navit-0.5.0.tar.gz' result = runCmd('recipetool create -o %s %s' % (temprecipe, srcuri)) self.assertTrue(os.path.isfile(recipefile)) checkvars = {} checkvars['LICENSE'] = set(['Unknown', 'GPLv2', 'LGPLv2']) - checkvars['SRC_URI'] = 'http://downloads.sourceforge.net/project/navit/v${PV}/navit-${PV}.tar.gz' + checkvars['SRC_URI'] = 'http://downloads.yoctoproject.org/mirror/sources/navit-${PV}.tar.gz' checkvars['SRC_URI[md5sum]'] = '242f398e979a6b8c0f3c802b63435b68' checkvars['SRC_URI[sha256sum]'] = '13353481d7fc01a4f64e385dda460b51496366bba0fd2cc85a89a0747910e94d' checkvars['DEPENDS'] = set(['freetype', 'zlib', 'openssl', 'glib-2.0', 'virtual/libgl', 'virtual/egl', 'gtk+', 'libpng', 'libsdl', 'freeglut', 'dbus-glib']) diff --git a/poky/meta/lib/oeqa/selftest/cases/wic.py b/poky/meta/lib/oeqa/selftest/cases/wic.py index b84466d9a..baf3af6eb 100644 --- a/poky/meta/lib/oeqa/selftest/cases/wic.py +++ b/poky/meta/lib/oeqa/selftest/cases/wic.py @@ -64,13 +64,13 @@ def only_for_arch(archs, image='core-image-minimal'): class Wic(OESelftestTestCase): """Wic test class.""" - resultdir = "/var/tmp/wic.oe-selftest/" image_is_ready = False native_sysroot = None wicenv_cache = {} def setUpLocal(self): """This code is executed before each test method.""" + self.resultdir = self.builddir + "/wic-tmp/" super(Wic, self).setUpLocal() if not self.native_sysroot: Wic.native_sysroot = get_bb_var('STAGING_DIR_NATIVE', 'wic-tools') @@ -191,7 +191,7 @@ class Wic(OESelftestTestCase): 'MACHINE_FEATURES_append = " efi"\n'\ 'DEPENDS_pn-core-image-minimal += "syslinux"\n' self.append_config(config) - bitbake('core-image-minimal') + bitbake('core-image-minimal core-image-minimal-initramfs') self.remove_config(config) cmd = "wic create mkhybridiso --image-name core-image-minimal -o %s" % self.resultdir self.assertEqual(0, runCmd(cmd).status) @@ -691,9 +691,7 @@ part /etc --source rootfs --ondisk mmcblk0 --fstype=ext4 --exclude-path bin/ --r # verify partition size with wic res = runCmd("parted -m %s unit mib p 2>/dev/null" % wicimg, - ignore_status=True, native_sysroot=self.native_sysroot) - self.assertEqual(0, res.status) # parse parted output which looks like this: # BYT;\n |