mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

oeqa/selftest: don't use cleanall in selftests

Browse Source 
* devtool: oeqa.selftest.devtool.DevtoolTests is taking 4 or more hours on the
  autobuilder because the cleanall call deletes the tarball of the kernel
  source, forcing a large clone which is especially long on an NFS mount.

  The cleanall invocation isn't really required here and switching to clean
  instead should avoid hours of re-cloning the same repository each time we
  run oe-selftest on the autobuilder.
* buildoptions: We only need to ensure the first image isn't an incremental
  image, clean will suffice here.
* runtime-test: no need to clean up the artefacts generated during the test,
  let's leave that to a higher level process rather than using the cleanall
  hammer.

(From OE-Core rev: 9c948d3de08f158387e08a17cdc0cedc7d26bb54)

Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joshua Lock
2017-03-27 11:21:32 +01:00
committed by Richard Purdie
parent 8fdbf9fcf2
commit 58a02e73d0
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oeqa/selftest/buildoptions.py
+1 -1
View File
@@ -16,7 +16,7 @@ class ImageOptionsTests(oeSelfTest):
image_pkgtype = get_bb_var("IMAGE_PKGTYPE") image_pkgtype = get_bb_var("IMAGE_PKGTYPE")
if image_pkgtype != 'rpm': if image_pkgtype != 'rpm':
self.skipTest('Not using RPM as main package format') self.skipTest('Not using RPM as main package format')
bitbake("-c cleanall core-image-minimal") bitbake("-c clean core-image-minimal")
self.write_config('INC_RPM_IMAGE_GEN = "1"') self.write_config('INC_RPM_IMAGE_GEN = "1"')
self.append_config('IMAGE_FEATURES += "ssh-server-openssh"') self.append_config('IMAGE_FEATURES += "ssh-server-openssh"')
bitbake("core-image-minimal") bitbake("core-image-minimal")
meta/lib/oeqa/selftest/devtool.py
+1 -1
View File
@@ -1654,7 +1654,7 @@ class DevtoolTests(DevtoolBase):
tmpconfig = os.path.join(buildir, '.config') tmpconfig = os.path.join(buildir, '.config')
#Step 3 #Step 3
bitbake('linux-yocto -c cleanall') bitbake('linux-yocto -c clean')
#Step 4.1 #Step 4.1
runCmd('devtool modify virtual/kernel -x %s' % tempdir) runCmd('devtool modify virtual/kernel -x %s' % tempdir)
self.assertTrue(os.path.exists(os.path.join(tempdir, 'Makefile')), self.assertTrue(os.path.exists(os.path.join(tempdir, 'Makefile')),
meta/lib/oeqa/selftest/runtime-test.py
-6
View File
@@ -193,8 +193,6 @@ postinst-delayed-t \
present on rootfs dir. present on rootfs dir.
4. Boot the image created on qemu and verify that the file 4. Boot the image created on qemu and verify that the file
created by postinst_boot recipe is present on image. created by postinst_boot recipe is present on image.
5. Clean the packages and image created to test with
different package managers
Expected: The files are successfully created during rootfs and boot Expected: The files are successfully created during rootfs and boot
time for 3 different package managers: rpm,ipk,deb and time for 3 different package managers: rpm,ipk,deb and
for initialization managers: sysvinit and systemd. for initialization managers: sysvinit and systemd.
@@ -237,7 +235,3 @@ postinst-delayed-t \
sshargs = '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' sshargs = '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
result = runCmd('ssh %s root@%s %s' % (sshargs, qemu.ip, testcommand)) result = runCmd('ssh %s root@%s %s' % (sshargs, qemu.ip, testcommand))
self.assertEqual(result.status, 0, 'File %s was not created at firts boot'% fileboot_name) self.assertEqual(result.status, 0, 'File %s was not created at firts boot'% fileboot_name)
#Step 5
bitbake(' %s %s -c cleanall' % (rootfs_pkg, boot_pkg))
bitbake('core-image-minimal -c cleanall')