diff options
| author |   Joshua Lock <joshua.g.lock@intel.com> | 2017-03-27 11:21:32 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-27 20:22:43 +0100 |
| commit | 9c948d3de08f158387e08a17cdc0cedc7d26bb54 (patch) | |
| tree | 64e7e702ba4c8e66bd93b5c2ee0f920933c94e10 /meta/lib | |
| parent | 4e6bf6ea766a0d47f96b3c4682d4f7e81a5763e7 (diff) | |
| download | openembedded-core-contrib-9c948d3de08f158387e08a17cdc0cedc7d26bb54.tar.gz | |
oeqa/selftest: don't use cleanall in selftests
* 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.
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oeqa/selftest/buildoptions.py | 2 | ||||
| -rw-r--r-- | meta/lib/oeqa/selftest/devtool.py | 2 | ||||
| -rw-r--r-- | meta/lib/oeqa/selftest/runtime-test.py | 6 |
3 files changed, 2 insertions, 8 deletions
diff --git a/meta/lib/oeqa/selftest/buildoptions.py b/meta/lib/oeqa/selftest/buildoptions.py index 7ace7474ea..d155f64978 100644 --- a/meta/lib/oeqa/selftest/buildoptions.py +++ b/meta/lib/oeqa/selftest/buildoptions.py @@ -16,7 +16,7 @@ class ImageOptionsTests(oeSelfTest): image_pkgtype = get_bb_var("IMAGE_PKGTYPE") if image_pkgtype != 'rpm': 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.append_config('IMAGE_FEATURES += "ssh-server-openssh"') bitbake("core-image-minimal") diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py index a160c8328c..7f9efe6368 100644 --- a/meta/lib/oeqa/selftest/devtool.py +++ b/meta/lib/oeqa/selftest/devtool.py @@ -1654,7 +1654,7 @@ class DevtoolTests(DevtoolBase): tmpconfig = os.path.join(buildir, '.config') #Step 3 - bitbake('linux-yocto -c cleanall') + bitbake('linux-yocto -c clean') #Step 4.1 runCmd('devtool modify virtual/kernel -x %s' % tempdir) self.assertTrue(os.path.exists(os.path.join(tempdir, 'Makefile')), diff --git a/meta/lib/oeqa/selftest/runtime-test.py b/meta/lib/oeqa/selftest/runtime-test.py index ea31c18229..e498d046cf 100644 --- a/meta/lib/oeqa/selftest/runtime-test.py +++ b/meta/lib/oeqa/selftest/runtime-test.py @@ -193,8 +193,6 @@ postinst-delayed-t \ present on rootfs dir. 4. Boot the image created on qemu and verify that the file 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 time for 3 different package managers: rpm,ipk,deb and for initialization managers: sysvinit and systemd. @@ -237,7 +235,3 @@ postinst-delayed-t \ sshargs = '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' 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) - - #Step 5 - bitbake(' %s %s -c cleanall' % (rootfs_pkg, boot_pkg)) - bitbake('core-image-minimal -c cleanall') |