mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
oeqa: make it work for multiple users
There are failures when multiple users run oe-selftest on the same
host:
PermissionError: [Errno 13] Permission denied: '/tmp/oe-saved-
tests/201812250324_qemu'
This is because /tmp/oe-saved-tests was created by user A, while user B tries
to write data in it, then the error will happen. This patch can fix the
problem.
Move the dumped data to ${LOG_DIR}/runtime-hostdump/ rather than
/tmp/oe-saved-tests/ to fix the problem.
(From OE-Core rev: e219fe5329599cd6c3682f521eaee3852a2c8980)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
c5f7615505
commit
c856ed29df
@@ -77,7 +77,7 @@ TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'deb', 'apt-native:do
|
|||||||
TESTIMAGELOCK = "${TMPDIR}/testimage.lock"
|
TESTIMAGELOCK = "${TMPDIR}/testimage.lock"
|
||||||
TESTIMAGELOCK_qemuall = ""
|
TESTIMAGELOCK_qemuall = ""
|
||||||
|
|
||||||
TESTIMAGE_DUMP_DIR ?= "/tmp/oe-saved-tests/"
|
TESTIMAGE_DUMP_DIR ?= "${LOG_DIR}/runtime-hostdump/"
|
||||||
|
|
||||||
TESTIMAGE_UPDATE_VARS ?= "DL_DIR WORKDIR DEPLOY_DIR"
|
TESTIMAGE_UPDATE_VARS ?= "DL_DIR WORKDIR DEPLOY_DIR"
|
||||||
|
|
||||||
@@ -249,6 +249,7 @@ def testimage_main(d):
|
|||||||
'bootlog' : bootlog,
|
'bootlog' : bootlog,
|
||||||
'kvm' : kvm,
|
'kvm' : kvm,
|
||||||
'slirp' : slirp,
|
'slirp' : slirp,
|
||||||
|
'dump_dir' : d.getVar("TESTIMAGE_DUMP_DIR"),
|
||||||
}
|
}
|
||||||
|
|
||||||
# TODO: Currently BBPATH is needed for custom loading of targets.
|
# TODO: Currently BBPATH is needed for custom loading of targets.
|
||||||
|
|||||||
@@ -49,7 +49,6 @@ class OERuntimeTestContextExecutor(OETestContextExecutor):
|
|||||||
default_manifest = 'data/manifest'
|
default_manifest = 'data/manifest'
|
||||||
default_server_ip = '192.168.7.1'
|
default_server_ip = '192.168.7.1'
|
||||||
default_target_ip = '192.168.7.2'
|
default_target_ip = '192.168.7.2'
|
||||||
default_host_dumper_dir = '/tmp/oe-saved-tests'
|
|
||||||
default_extract_dir = 'packages/extracted'
|
default_extract_dir = 'packages/extracted'
|
||||||
|
|
||||||
def register_commands(self, logger, subparsers):
|
def register_commands(self, logger, subparsers):
|
||||||
@@ -71,9 +70,7 @@ class OERuntimeTestContextExecutor(OETestContextExecutor):
|
|||||||
% self.default_server_ip)
|
% self.default_server_ip)
|
||||||
|
|
||||||
runtime_group.add_argument('--host-dumper-dir', action='store',
|
runtime_group.add_argument('--host-dumper-dir', action='store',
|
||||||
default=self.default_host_dumper_dir,
|
help="Directory where host status is dumped, if tests fails")
|
||||||
help="Directory where host status is dumped, if tests fails, default: %s" \
|
|
||||||
% self.default_host_dumper_dir)
|
|
||||||
|
|
||||||
runtime_group.add_argument('--packages-manifest', action='store',
|
runtime_group.add_argument('--packages-manifest', action='store',
|
||||||
default=self.default_manifest,
|
default=self.default_manifest,
|
||||||
|
|||||||
@@ -107,6 +107,8 @@ class QemuTarget(BaseTarget):
|
|||||||
dump_target_cmds = d.getVar("testimage_dump_target")
|
dump_target_cmds = d.getVar("testimage_dump_target")
|
||||||
dump_host_cmds = d.getVar("testimage_dump_host")
|
dump_host_cmds = d.getVar("testimage_dump_host")
|
||||||
dump_dir = d.getVar("TESTIMAGE_DUMP_DIR")
|
dump_dir = d.getVar("TESTIMAGE_DUMP_DIR")
|
||||||
|
if not dump_dir:
|
||||||
|
dump_dir = os.path.join(d.getVar('LOG_DIR'), 'runtime-hostdump')
|
||||||
use_kvm = oe.types.qemu_use_kvm(d.getVar('QEMU_USE_KVM'), d.getVar('TARGET_ARCH'))
|
use_kvm = oe.types.qemu_use_kvm(d.getVar('QEMU_USE_KVM'), d.getVar('TARGET_ARCH'))
|
||||||
|
|
||||||
# Log QemuRunner log output to a file
|
# Log QemuRunner log output to a file
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ class BaseDumper(object):
|
|||||||
self.cmds = []
|
self.cmds = []
|
||||||
# Some testing doesn't inherit testimage, so it is needed
|
# Some testing doesn't inherit testimage, so it is needed
|
||||||
# to set some defaults.
|
# to set some defaults.
|
||||||
self.parent_dir = parent_dir or "/tmp/oe-saved-tests"
|
self.parent_dir = parent_dir
|
||||||
dft_cmds = """ top -bn1
|
dft_cmds = """ top -bn1
|
||||||
iostat -x -z -N -d -p ALL 20 2
|
iostat -x -z -N -d -p ALL 20 2
|
||||||
ps -ef
|
ps -ef
|
||||||
|
|||||||
Reference in New Issue
Block a user