* [PATCH 1/1] libarchive: fix ALTERNATIVE_PRIORITY to avoid conflict
From: Chen Qi @ 2016-12-07 1:45 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481075044.git.Qi.Chen@windriver.com>
'tar' utility from tar and bsdtar has the same alternative priority.
'cpio' utility from cpio and bsdcpio has the same alternative priority.
Lower the ALTERNATIVE_PRIORITY to avoid conflict.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
meta/recipes-extended/libarchive/libarchive_3.2.2.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-extended/libarchive/libarchive_3.2.2.bb b/meta/recipes-extended/libarchive/libarchive_3.2.2.bb
index cf66e9d..7917ce7 100644
--- a/meta/recipes-extended/libarchive/libarchive_3.2.2.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.2.2.bb
@@ -48,7 +48,7 @@ do_configure_prepend() {
cp -R ${STAGING_INCDIR_NATIVE}/ext2fs ${WORKDIR}/extra-includes/
}
-ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE_PRIORITY = "80"
PACKAGES =+ "bsdtar"
FILES_bsdtar = "${bindir}/bsdtar"
--
1.9.1
^ permalink raw reply related
* [PATCH 0/1] libarchive: fix ALTERNATIVE_PRIORITY to avoid conflict
From: Chen Qi @ 2016-12-07 1:45 UTC (permalink / raw)
To: openembedded-core
The following changes since commit 11063a01d4511b2688ea7ba2d7359e4e07328c66:
ruby: upgrade to 2.3.1 (2016-11-30 15:47:17 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib ChenQi/libarchive-priority
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/libarchive-priority
Chen Qi (1):
libarchive: fix ALTERNATIVE_PRIORITY to avoid conflict
meta/recipes-extended/libarchive/libarchive_3.2.2.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
1.9.1
^ permalink raw reply
* Re: [PATCH 28/33] dpkg: update packages and files to match Debian more closely
From: Andreas Oberritter @ 2016-12-07 1:41 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
In-Reply-To: <CAJTo0LbmQkctYKqyYvbHyd+Jf-j8gkdUpH-hcPWwggWN-jinyQ@mail.gmail.com>
On 06.12.2016 21:13, Burton, Ross wrote:
>
> On 6 December 2016 at 11:49, Andreas Oberritter <obi@opendreambox.org
> <mailto:obi@opendreambox.org>> wrote:
>
> +RRECOMMENDS_dpkg-perl = "gnupg gpgv"
>
>
> With plain master this causes a build failure:
>
> ERROR: Multiple versions of gnupg are due to be built
> (/home/ross/Yocto/poky/meta/recipes-support/gnupg/gnupg_2.1.14.bb
> <http://gnupg_2.1.14.bb>
> /home/ross/Yocto/poky/meta/recipes-support/gnupg/gnupg_1.4.7.bb
> <http://gnupg_1.4.7.bb>). Only one version of a given PN should be built
> in any given build. You likely need to set PREFERRED_VERSION_gnupg to
> select the correct version or don't depend on multiple versions.
>
> As gnupg 1.4.7 provides gpgv, but 2.1.14 doesn't.
>
> No idea where 2.1.14 should, what gpgv is, or what the solution is, as
> it's late and I'm going to crash on the sofa. :)
Version 1.4.7 splits-out gpgv to its own package. It can be used to
verify signatures, but can't encrypt or sign anything. I'm using it in
an initramfs for its small size, unrelated to dpkg though.
I didn't notice this, because I have PREFERRED_VERSION_gnupg set to
1.4.7, which however RDEPENDS on gpgv, so the obvious fix is:
RRECOMMENDS_dpkg-perl = "gnupg"
I don't remember where it came from, maybe I took it from Debian.
Thank you for your review! I'm going to update my branch now (obi/deb on
openembedded-core-contrib) with all your comments addressed, hopefully.
Do you want me to submit v2 to the mailing list, too?
Regards,
Andreas
^ permalink raw reply
* Re: [PATCH 02/33] dpkg: update-alternatives-dpkg should conflict with other providers
From: Andreas Oberritter @ 2016-12-07 1:30 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
In-Reply-To: <CAJTo0LbsxuA6wMm8gY1LJJhxq15k10x9HoD0qBBHi4tSoQa8SA@mail.gmail.com>
On 06.12.2016 20:52, Burton, Ross wrote:
> This needs more than just RCONFLICTS:
>
> ERROR: dpkg-native-1.18.7-r0 do_populate_sysroot: The recipe dpkg-native
> is trying to install files into a shared area when those files already
> exist. Those files and their manifest location are:
>
> /data/poky-master/tmp-glibc/sysroots/x86_64-linux/usr/bin/update-alternatives
>
> I have both package_deb and package_rpm enabled, and have a build from
> master before trying your branch.
I'm going to address this in "dpkg: implement offline mode for update-
alternatives" with the following additions:
+PROVIDES = "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}"
[...]
+UA = "update-alternatives"
+UA_native = "${@['', 'update-alternatives'][d.getVar('PREFERRED_PROVIDER_virtual/update-alternatives-native', True) == 'dpkg-native']}"
+
+PACKAGECONFIG ??= "${UA}"
+PACKAGECONFIG[update-alternatives] = "--enable-update-alternatives,--disable-update-alternatives"
Because update-alternative-dpkg and update-alternatives-opkg are using
incompatible databases, I don't think there are much better ways to
avoid this conflict.
Regards,
Andreas
^ permalink raw reply
* Re: [PATCH 21/33] package_manager/deb: create Packages.xz
From: Andreas Oberritter @ 2016-12-07 1:24 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
In-Reply-To: <CAJTo0LZ_oxdqybeKNjM=LU6vUm_v5-+9GOVUamL8Vf7XZufB5w@mail.gmail.com>
On 06.12.2016 19:46, Burton, Ross wrote:
>
> On 6 December 2016 at 18:41, Andreas Oberritter <obi@opendreambox.org
> <mailto:obi@opendreambox.org>> wrote:
>
> That's a good question. I guess I didn't add anything, because there's
> no direct dependency in place for gzip-native either.
>
> I don't know if it counts, but there's a dependency on apt-native and
> apt's source tarball, like many others, is compressed with xz. By
> default, apt also depends on xz because of PACKAGECONFIG = "lzma", but
> that may obviously get changed by users.
>
>
> I guess the use of xz to create Packages.xz should depend on xz being
> present, and then package_deb should explicitly add dependencies to the
> relevant tasks (as it does for do_package and do_packageindex already).
I'd prefer to be deterministic and cause an error if xz is not available
for whatever reason. I'm going to add the necessary dependency to all
callers of write_index() for deb.
Regards,
Andreas
^ permalink raw reply
* Re: [PATCH 3/4] kern-tools: fix processing for no branch meta-data
From: Paul Barker @ 2016-12-06 23:02 UTC (permalink / raw)
To: Patrick Ohly; +Cc: Bruce Ashfield, openembedded-core
In-Reply-To: <1481058881.17535.58.camel@intel.com>
On Tue, 06 Dec 2016 22:14:41 +0100
Patrick Ohly <patrick.ohly@intel.com> wrote:
> On Fri, 2016-12-02 at 16:09 -0500, Bruce Ashfield wrote:
> > Lernel meta-data that has patches, but no branches, can trigger an
> > error due to no branch specific patch queue.
> >
> > This error then cascades to more issues since the tools are using
> > a named file in /tmp to store and display error messages to the
> > user.
> >
> > We fix both issues though the following kern tools tweaks:
> >
> > commit bd9e1d6c9b0a34ff3e19a06999aaf57ffadfd04c
> > Author: Bruce Ashfield <bruce.ashfield@windriver.com>
> > Date: Fri Dec 2 13:09:40 2016 -0500
> >
> > scc: use mktemp for consolidated output capture
> >
> > To provide useful error messages the tools dump pre-processed
> > files and messages to a temporary file. If multiple users are
> > doing builds, this means they either race, or can have permissions
> > issues.
> >
> > By creating the temporary file via mktemp, we avoid both issues.
> > (We also make sure to clean these up on exit, or /tmp will get
> > polluted quickly).
> >
> > commit a287da4bfe0b4acb8f2b0627bd8e7abd1a1dde26
> > Author: Bruce Ashfield <bruce.ashfield@windriver.com>
> > Date: Fri Dec 2 13:08:08 2016 -0500
> >
> > patch: do not assume a branch specific patch queue is needed
> >
> > When processing input files per-branch and global patch queues are
> > generated. If the meta-data has not created any branches in the
> > repo, no branch specific queue is required.
> >
> > The tools assumed that one is always valid, and hence would throw a
> > non-zero exit code and stop processing.
> >
> > By testing for a named per-branch queue, we avoid this issue.
>
> Ostro OS runs into the problem while trying to use current OE-core
> master:
>
> .../patch.cmd: line 29: : No such file or directory
>
> | ERROR: Function failed: do_kernel_metadata (log file is located ...)
>
> This commit here fixed it for me. I see that it is already in Ross' mut2
> branch, so hopefully that'll land in master soon.
>
Ditto for meta-raspberrypi, the kernel doesn't build with current
oe-core master as discussed on the yocto@ list. This patch is needed
to fix things.
Thanks,
Paul Barker
^ permalink raw reply
* Re: what is the closest alternative to red hat's ABRT in OE?
From: Randy MacLeod @ 2016-12-06 22:59 UTC (permalink / raw)
To: Maciej Borzęcki, Robert P. J. Day; +Cc: OE Core mailing list
In-Reply-To: <CAD4b0_+EACruAvA839=YTu8=FHAjGcuMzFbaLugJZQD6NOjf2Q@mail.gmail.com>
On 2016-12-06 11:02 AM, Maciej BorzD\x19cki wrote:
> On Tue, Dec 6, 2016 at 3:49 PM, Robert P. J. Day <rpjday@crashcourse.ca> wrote:
>>
>> as in:
>>
>> https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/6/html/Deployment_Guide/ch-abrt.html
>>
>> specifically, to manage core files? i would have thought judicious use
>> of "ulimit" would be the solution. others?
>>
>
> If you're using systemd there is systemd-coredump(8).
>
You could try minicoredumper:
https://linutronix.de/minicoredumper/
<quote>
The minicoredumper project provides a program that handles the
creation of core dump files on Linux. It can produce much smaller
core dump files by making use of sparse files, compression, and
allowing the user to configure what parts of the process memory
image should be dumped.
</quote>
There's even a slightly out of date meta-oe recipe:
http://cgit.openembedded.org/cgit.cgi/meta-openembedded/tree/meta-oe/recipes-kernel/minicoredumper/minicoredumper_1.0.2.bb?h=master
Oh and Ubuntu uses apport:
https://wiki.ubuntu.com/Apport
--
# Randy MacLeod. SMTS, Linux, Wind River
Direct: 613.963.1350 | 350 Terry Fox Drive, Suite 200, Ottawa, ON,
Canada, K2K 2W5
^ permalink raw reply
* Re: oetest.py construction of pkgmanifest is probably wrong
From: Slater, Joseph @ 2016-12-06 22:23 UTC (permalink / raw)
To: BURTON, ROSS; +Cc: openembedded-core@lists.openembedded.org
In-Reply-To: <CAJTo0LbJHGvB347RYZip+4w73opHMQpm_yKMsmDfdSFgYBXjdg@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 675 bytes --]
Hm, I see this whole thing is being re-written. Maybe that will fix it. Joe
From: Burton, Ross [mailto:ross.burton@intel.com]
Sent: Tuesday, December 06, 2016 1:52 AM
To: Slater, Joseph
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] oetest.py construction of pkgmanifest is probably wrong
On 6 December 2016 at 02:24, Slater, Joseph <joe.slater@windriver.com<mailto:joe.slater@windriver.com>> wrote:
This variable is a dictionary with entries based on package, but for multillib a package might exist in only some variants. Perhaps
each entry should be a dictionary of multilib variants?
Yeah, probably. Got a patch? :)
Ross
[-- Attachment #2: Type: text/html, Size: 3615 bytes --]
^ permalink raw reply
* Re: [PATCH 00/32] OEQA Framework Refactor & Improvements
From: Aníbal Limón @ 2016-12-06 21:56 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481059445.git.anibal.limon@linux.intel.com>
[-- Attachment #1: Type: text/plain, Size: 10984 bytes --]
On 12/06/2016 03:43 PM, Aníbal Limón wrote:
> This patchset is related to OEQA Framework for details read the RFC send to the
> Openembedded architecture ML.
Architecture thread,
http://lists.openembedded.org/pipermail/openembedded-architecture/2016-December/000351.html
>
> The following changes since commit 9e63f81c78e284c9b325fe04a1b59e61c7ad8a1a:
>
> bitbake: ast: remove BBVERSIONS support (2016-11-30 15:48:10 +0000)
>
> are available in the git repository at:
>
> git://git.yoctoproject.org/poky-contrib alimon/oeqa_sdk_migration
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=alimon/oeqa_sdk_migration
>
> Aníbal Limón (28):
> oeqa/core: Add base OEQA framework
> oeqa/core: Add loader, context and decorator modules
> oeqa/core/decorator: Add support for OETestDepends
> oeqa/core/decorator: Add support for OETestDataDepends and
> skipIfDataVar
> scripts/oe-test: Add new oe-test script
> oeqa/core/context: Add support of OETestContextExecutor
> oeqa/core/cases: Add example test cases
> oeqa/core: Add README
> oe/data: Add export2json function
> classes/rootfs-postcommands: Add write_image_test_data
> classes/populate_sdk_base: Add write_sdk_test_data to postprocess
> oeqa/core: Change name of d to td
> oeqa/utils/path: Add remove_safe function
> oeqa: Move common files to oeqa/files instead of runtime only
> oeqa/sdk: Move test cases inside cases directory
> oeqa/{runtime,sdk}/files: Move testsdkmakefile from runtime to sdk
> module
> oeqa/sdk: Add case and context modules for the SDK component
> classes/testsdk: Migrates testsdk.bbclass to use new OESDKTestContext
> oeqa/utils: Move targetbuild to buildproject module
> oeqa/utils: {Target,SDK,}BuildProject remove dependency of bb
> oeqa/sdk/cases: Migrate tests to the new OEQA framework
> classes/testsdk: Remove the need of TEST_LOG_DIR variable
> oeqa/sdkext: Move test cases inside cases directory
> oeqa/sdkext: Adds case and context modules.
> classes/testsdk: Migrate to use the new OESDKExtTestContext
> oeqa/sdkext/cases: Migrate test case to new OEQA framework
> oeqa/runtime: Fix TargetBuildProject instances
> oeqa: Fix files handling on runtime tests.
>
> Mariano Lopez (4):
> oeqa/core: Add utils module for OEQA framework
> oeqa/core/decorator: Add support for OETestID and OETestTag
> oeqa/core/decorator: Add support for OETimeout decorator
> oeqa/core: Add tests for the OEQA framework
>
> meta/classes/populate_sdk_base.bbclass | 9 +-
> meta/classes/rootfs-postcommands.bbclass | 18 ++
> meta/classes/testexport.bbclass | 5 +
> meta/classes/testimage.bbclass | 4 +
> meta/classes/testsdk.bbclass | 162 ++++++++------
> meta/lib/oe/data.py | 28 +++
> meta/lib/oeqa/core/README | 38 ++++
> meta/lib/oeqa/core/__init__.py | 0
> meta/lib/oeqa/core/case.py | 46 ++++
> meta/lib/oeqa/core/cases/__init__.py | 0
> meta/lib/oeqa/core/cases/example/data.json | 1 +
> meta/lib/oeqa/core/cases/example/test_basic.py | 20 ++
> meta/lib/oeqa/core/context.py | 225 ++++++++++++++++++++
> meta/lib/oeqa/core/decorator/__init__.py | 71 +++++++
> meta/lib/oeqa/core/decorator/data.py | 36 ++++
> meta/lib/oeqa/core/decorator/depends.py | 94 +++++++++
> meta/lib/oeqa/core/decorator/oeid.py | 23 ++
> meta/lib/oeqa/core/decorator/oetag.py | 24 +++
> meta/lib/oeqa/core/decorator/oetimeout.py | 25 +++
> meta/lib/oeqa/core/exception.py | 14 ++
> meta/lib/oeqa/core/loader.py | 235 +++++++++++++++++++++
> meta/lib/oeqa/core/runner.py | 76 +++++++
> meta/lib/oeqa/core/tests/__init__.py | 0
> meta/lib/oeqa/core/tests/cases/data.py | 20 ++
> meta/lib/oeqa/core/tests/cases/depends.py | 38 ++++
> .../oeqa/core/tests/cases/loader/invalid/oeid.py | 15 ++
> .../oeqa/core/tests/cases/loader/valid/another.py | 9 +
> meta/lib/oeqa/core/tests/cases/oeid.py | 18 ++
> meta/lib/oeqa/core/tests/cases/oetag.py | 18 ++
> meta/lib/oeqa/core/tests/cases/timeout.py | 18 ++
> meta/lib/oeqa/core/tests/common.py | 35 +++
> meta/lib/oeqa/core/tests/test_data.py | 51 +++++
> meta/lib/oeqa/core/tests/test_decorators.py | 135 ++++++++++++
> meta/lib/oeqa/core/tests/test_loader.py | 86 ++++++++
> meta/lib/oeqa/core/tests/test_runner.py | 38 ++++
> meta/lib/oeqa/core/utils/__init__.py | 0
> meta/lib/oeqa/core/utils/misc.py | 37 ++++
> meta/lib/oeqa/core/utils/path.py | 19 ++
> meta/lib/oeqa/core/utils/test.py | 71 +++++++
> meta/lib/oeqa/{runtime => }/files/test.c | 0
> meta/lib/oeqa/{runtime => }/files/test.cpp | 0
> meta/lib/oeqa/{runtime => }/files/test.pl | 0
> meta/lib/oeqa/{runtime => }/files/test.py | 0
> meta/lib/oeqa/oetest.py | 92 +-------
> meta/lib/oeqa/runtime/buildcvs.py | 9 +-
> meta/lib/oeqa/runtime/buildgalculator.py | 8 +-
> meta/lib/oeqa/runtime/buildiptables.py | 8 +-
> meta/lib/oeqa/runtime/gcc.py | 4 +-
> meta/lib/oeqa/runtime/perl.py | 2 +-
> meta/lib/oeqa/runtime/python.py | 2 +-
> meta/lib/oeqa/runtime/utils/__init__.py | 0
> meta/lib/oeqa/runtime/utils/targetbuildproject.py | 33 +++
> meta/lib/oeqa/sdk/__init__.py | 3 -
> meta/lib/oeqa/sdk/case.py | 12 ++
> meta/lib/oeqa/sdk/{ => cases}/buildcvs.py | 15 +-
> meta/lib/oeqa/sdk/{ => cases}/buildgalculator.py | 28 ++-
> meta/lib/oeqa/sdk/{ => cases}/buildiptables.py | 16 +-
> meta/lib/oeqa/sdk/cases/gcc.py | 43 ++++
> meta/lib/oeqa/sdk/cases/perl.py | 27 +++
> meta/lib/oeqa/sdk/{ => cases}/python.py | 25 ++-
> meta/lib/oeqa/sdk/context.py | 133 ++++++++++++
> .../oeqa/{runtime => sdk}/files/testsdkmakefile | 0
> meta/lib/oeqa/sdk/gcc.py | 36 ----
> meta/lib/oeqa/sdk/perl.py | 28 ---
> meta/lib/oeqa/sdk/utils/__init__.py | 0
> meta/lib/oeqa/sdk/utils/sdkbuildproject.py | 45 ++++
> meta/lib/oeqa/sdkext/__init__.py | 3 -
> meta/lib/oeqa/sdkext/case.py | 21 ++
> meta/lib/oeqa/sdkext/{ => cases}/devtool.py | 49 +++--
> meta/lib/oeqa/sdkext/{ => cases}/sdk_update.py | 14 +-
> meta/lib/oeqa/sdkext/context.py | 21 ++
> meta/lib/oeqa/utils/buildproject.py | 52 +++++
> meta/lib/oeqa/utils/targetbuild.py | 135 ------------
> scripts/oe-test | 98 +++++++++
> 74 files changed, 2282 insertions(+), 442 deletions(-)
> create mode 100644 meta/lib/oeqa/core/README
> create mode 100644 meta/lib/oeqa/core/__init__.py
> create mode 100644 meta/lib/oeqa/core/case.py
> create mode 100644 meta/lib/oeqa/core/cases/__init__.py
> create mode 100644 meta/lib/oeqa/core/cases/example/data.json
> create mode 100644 meta/lib/oeqa/core/cases/example/test_basic.py
> create mode 100644 meta/lib/oeqa/core/context.py
> create mode 100644 meta/lib/oeqa/core/decorator/__init__.py
> create mode 100644 meta/lib/oeqa/core/decorator/data.py
> create mode 100644 meta/lib/oeqa/core/decorator/depends.py
> create mode 100644 meta/lib/oeqa/core/decorator/oeid.py
> create mode 100644 meta/lib/oeqa/core/decorator/oetag.py
> create mode 100644 meta/lib/oeqa/core/decorator/oetimeout.py
> create mode 100644 meta/lib/oeqa/core/exception.py
> create mode 100644 meta/lib/oeqa/core/loader.py
> create mode 100644 meta/lib/oeqa/core/runner.py
> create mode 100644 meta/lib/oeqa/core/tests/__init__.py
> create mode 100644 meta/lib/oeqa/core/tests/cases/data.py
> create mode 100644 meta/lib/oeqa/core/tests/cases/depends.py
> create mode 100644 meta/lib/oeqa/core/tests/cases/loader/invalid/oeid.py
> create mode 100644 meta/lib/oeqa/core/tests/cases/loader/valid/another.py
> create mode 100644 meta/lib/oeqa/core/tests/cases/oeid.py
> create mode 100644 meta/lib/oeqa/core/tests/cases/oetag.py
> create mode 100644 meta/lib/oeqa/core/tests/cases/timeout.py
> create mode 100644 meta/lib/oeqa/core/tests/common.py
> create mode 100755 meta/lib/oeqa/core/tests/test_data.py
> create mode 100755 meta/lib/oeqa/core/tests/test_decorators.py
> create mode 100755 meta/lib/oeqa/core/tests/test_loader.py
> create mode 100755 meta/lib/oeqa/core/tests/test_runner.py
> create mode 100644 meta/lib/oeqa/core/utils/__init__.py
> create mode 100644 meta/lib/oeqa/core/utils/misc.py
> create mode 100644 meta/lib/oeqa/core/utils/path.py
> create mode 100644 meta/lib/oeqa/core/utils/test.py
> rename meta/lib/oeqa/{runtime => }/files/test.c (100%)
> rename meta/lib/oeqa/{runtime => }/files/test.cpp (100%)
> rename meta/lib/oeqa/{runtime => }/files/test.pl (100%)
> rename meta/lib/oeqa/{runtime => }/files/test.py (100%)
> create mode 100644 meta/lib/oeqa/runtime/utils/__init__.py
> create mode 100644 meta/lib/oeqa/runtime/utils/targetbuildproject.py
> create mode 100644 meta/lib/oeqa/sdk/case.py
> rename meta/lib/oeqa/sdk/{ => cases}/buildcvs.py (59%)
> rename meta/lib/oeqa/sdk/{ => cases}/buildgalculator.py (45%)
> rename meta/lib/oeqa/sdk/{ => cases}/buildiptables.py (58%)
> create mode 100644 meta/lib/oeqa/sdk/cases/gcc.py
> create mode 100644 meta/lib/oeqa/sdk/cases/perl.py
> rename meta/lib/oeqa/sdk/{ => cases}/python.py (46%)
> create mode 100644 meta/lib/oeqa/sdk/context.py
> rename meta/lib/oeqa/{runtime => sdk}/files/testsdkmakefile (100%)
> delete mode 100644 meta/lib/oeqa/sdk/gcc.py
> delete mode 100644 meta/lib/oeqa/sdk/perl.py
> create mode 100644 meta/lib/oeqa/sdk/utils/__init__.py
> create mode 100644 meta/lib/oeqa/sdk/utils/sdkbuildproject.py
> create mode 100644 meta/lib/oeqa/sdkext/case.py
> rename meta/lib/oeqa/sdkext/{ => cases}/devtool.py (73%)
> rename meta/lib/oeqa/sdkext/{ => cases}/sdk_update.py (69%)
> create mode 100644 meta/lib/oeqa/sdkext/context.py
> create mode 100644 meta/lib/oeqa/utils/buildproject.py
> delete mode 100644 meta/lib/oeqa/utils/targetbuild.py
> create mode 100755 scripts/oe-test
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* [PATCH 32/32] oeqa: Fix files handling on runtime tests.
From: Aníbal Limón @ 2016-12-06 21:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481059445.git.anibal.limon@linux.intel.com>
Common files was move to oeqa/files from oeqa/runtime/files
because the same files are used across Runtime,SDK,eSDK tests.
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
meta/classes/testexport.bbclass | 5 +++++
meta/lib/oeqa/oetest.py | 1 +
meta/lib/oeqa/runtime/gcc.py | 4 ++--
meta/lib/oeqa/runtime/perl.py | 2 +-
meta/lib/oeqa/runtime/python.py | 2 +-
5 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/meta/classes/testexport.bbclass b/meta/classes/testexport.bbclass
index 5147020..a3ccd63 100644
--- a/meta/classes/testexport.bbclass
+++ b/meta/classes/testexport.bbclass
@@ -87,6 +87,7 @@ def exportTests(d,tc):
# - the contents of oeqa/utils and oeqa/runtime/files
# - oeqa/oetest.py and oeqa/runexport.py (this will get copied to exportpath not exportpath/oeqa)
# - __init__.py files
+ bb.utils.mkdirhier(os.path.join(exportpath, "oeqa/files"))
bb.utils.mkdirhier(os.path.join(exportpath, "oeqa/runtime/files"))
bb.utils.mkdirhier(os.path.join(exportpath, "oeqa/utils"))
# copy test modules, this should cover tests in other layers too
@@ -124,6 +125,10 @@ def exportTests(d,tc):
for f in files:
if f.endswith(".py"):
shutil.copy2(os.path.join(root, f), os.path.join(exportpath, "oeqa/utils"))
+ # copy oeqa/files/*
+ for root, dirs, files in os.walk(os.path.join(oeqadir, "files")):
+ for f in files:
+ shutil.copy2(os.path.join(root, f), os.path.join(exportpath, "oeqa/files"))
# copy oeqa/runtime/files/*
for root, dirs, files in os.walk(os.path.join(oeqadir, "runtime/files")):
for f in files:
diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py
index f9e9025..48bcafc 100644
--- a/meta/lib/oeqa/oetest.py
+++ b/meta/lib/oeqa/oetest.py
@@ -201,6 +201,7 @@ class TestContext(object):
self.testsrequired = self._get_test_suites_required()
self.filesdir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "runtime/files")
+ self.corefilesdir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "files")
self.imagefeatures = d.getVar("IMAGE_FEATURES", True).split()
self.distrofeatures = d.getVar("DISTRO_FEATURES", True).split()
diff --git a/meta/lib/oeqa/runtime/gcc.py b/meta/lib/oeqa/runtime/gcc.py
index d90cd17..6edb89f 100644
--- a/meta/lib/oeqa/runtime/gcc.py
+++ b/meta/lib/oeqa/runtime/gcc.py
@@ -12,9 +12,9 @@ class GccCompileTest(oeRuntimeTest):
@classmethod
def setUpClass(self):
- oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.filesdir, "test.c"), "/tmp/test.c")
+ oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.corefilesdir, "test.c"), "/tmp/test.c")
oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.filesdir, "testmakefile"), "/tmp/testmakefile")
- oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.filesdir, "test.cpp"), "/tmp/test.cpp")
+ oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.corefilesdir, "test.cpp"), "/tmp/test.cpp")
@testcase(203)
def test_gcc_compile(self):
diff --git a/meta/lib/oeqa/runtime/perl.py b/meta/lib/oeqa/runtime/perl.py
index e044d0a..6bf98f1 100644
--- a/meta/lib/oeqa/runtime/perl.py
+++ b/meta/lib/oeqa/runtime/perl.py
@@ -12,7 +12,7 @@ class PerlTest(oeRuntimeTest):
@classmethod
def setUpClass(self):
- oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.filesdir, "test.pl"), "/tmp/test.pl")
+ oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.corefilesdir, "test.pl"), "/tmp/test.pl")
@testcase(1141)
def test_perl_exists(self):
diff --git a/meta/lib/oeqa/runtime/python.py b/meta/lib/oeqa/runtime/python.py
index 29a231c..93e822c 100644
--- a/meta/lib/oeqa/runtime/python.py
+++ b/meta/lib/oeqa/runtime/python.py
@@ -12,7 +12,7 @@ class PythonTest(oeRuntimeTest):
@classmethod
def setUpClass(self):
- oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.filesdir, "test.py"), "/tmp/test.py")
+ oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.corefilesdir, "test.py"), "/tmp/test.py")
@testcase(1145)
def test_python_exists(self):
--
2.1.4
^ permalink raw reply related
* [PATCH 31/32] oeqa/runtime: Fix TargetBuildProject instances
From: Aníbal Limón @ 2016-12-06 21:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481059445.git.anibal.limon@linux.intel.com>
TargetBuildProject was refactored to avoid bitbake dependency so
the instance don't allow to pass data store anymore.
classes/testimage: Export proxies before run tests
The TargetBuildProject based tests download archives from network.
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
meta/classes/testimage.bbclass | 4 ++++
meta/lib/oeqa/runtime/buildcvs.py | 9 +++++----
meta/lib/oeqa/runtime/buildgalculator.py | 8 +++++---
meta/lib/oeqa/runtime/buildiptables.py | 8 +++++---
4 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 6b6781d..89ed003 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -129,11 +129,15 @@ def testimage_main(d):
from oeqa.oetest import ImageTestContext
from oeqa.targetcontrol import get_target_controller
from oeqa.utils.dump import get_host_dumper
+ from bb.utils import export_proxies
pn = d.getVar("PN", True)
bb.utils.mkdirhier(d.getVar("TEST_LOG_DIR", True))
test_create_extract_dirs(d)
+ # runtime use network for download projects for build
+ export_proxies(d)
+
# we need the host dumper in test context
host_dumper = get_host_dumper(d)
diff --git a/meta/lib/oeqa/runtime/buildcvs.py b/meta/lib/oeqa/runtime/buildcvs.py
index fe6cbfb..a5ca3a5 100644
--- a/meta/lib/oeqa/runtime/buildcvs.py
+++ b/meta/lib/oeqa/runtime/buildcvs.py
@@ -1,6 +1,6 @@
from oeqa.oetest import oeRuntimeTest, skipModule
from oeqa.utils.decorators import *
-from oeqa.utils.targetbuild import TargetBuildProject
+from oeqa.runtime.utils.targetbuildproject import TargetBuildProject
def setUpModule():
if not oeRuntimeTest.hasFeature("tools-sdk"):
@@ -10,9 +10,10 @@ class BuildCvsTest(oeRuntimeTest):
@classmethod
def setUpClass(self):
- self.project = TargetBuildProject(oeRuntimeTest.tc.target, oeRuntimeTest.tc.d,
- "http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2")
- self.project.download_archive()
+ dl_dir = oeRuntimeTest.tc.d.getVar('DL_DIR', True)
+ self.project = TargetBuildProject(oeRuntimeTest.tc.target,
+ "http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2",
+ dl_dir=dl_dir)
@testcase(205)
@skipUnlessPassed("test_ssh")
diff --git a/meta/lib/oeqa/runtime/buildgalculator.py b/meta/lib/oeqa/runtime/buildgalculator.py
index 220101d..20f0a79 100644
--- a/meta/lib/oeqa/runtime/buildgalculator.py
+++ b/meta/lib/oeqa/runtime/buildgalculator.py
@@ -1,6 +1,6 @@
from oeqa.oetest import oeRuntimeTest, skipModule
from oeqa.utils.decorators import *
-from oeqa.utils.targetbuild import TargetBuildProject
+from oeqa.runtime.utils.targetbuildproject import TargetBuildProject
def setUpModule():
if not oeRuntimeTest.hasFeature("tools-sdk"):
@@ -10,9 +10,11 @@ class GalculatorTest(oeRuntimeTest):
@testcase(1526)
@skipUnlessPassed("test_ssh")
def test_galculator(self):
+ dl_dir = oeRuntimeTest.tc.d.getVar('DL_DIR', True)
try:
- project = TargetBuildProject(oeRuntimeTest.tc.target, oeRuntimeTest.tc.d,
- "http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2")
+ project = TargetBuildProject(oeRuntimeTest.tc.target,
+ "http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2",
+ dl_dir=dl_dir)
project.download_archive()
self.assertEqual(project.run_configure(), 0,
diff --git a/meta/lib/oeqa/runtime/buildiptables.py b/meta/lib/oeqa/runtime/buildiptables.py
index bc75d0a..a0e82f0 100644
--- a/meta/lib/oeqa/runtime/buildiptables.py
+++ b/meta/lib/oeqa/runtime/buildiptables.py
@@ -1,6 +1,6 @@
from oeqa.oetest import oeRuntimeTest, skipModule
from oeqa.utils.decorators import *
-from oeqa.utils.targetbuild import TargetBuildProject
+from oeqa.runtime.utils.targetbuildproject import TargetBuildProject
def setUpModule():
if not oeRuntimeTest.hasFeature("tools-sdk"):
@@ -10,8 +10,10 @@ class BuildIptablesTest(oeRuntimeTest):
@classmethod
def setUpClass(self):
- self.project = TargetBuildProject(oeRuntimeTest.tc.target, oeRuntimeTest.tc.d,
- "http://downloads.yoctoproject.org/mirror/sources/iptables-1.4.13.tar.bz2")
+ dl_dir = oeRuntimeTest.tc.d.getVar('DL_DIR', True)
+ self.project = TargetBuildProject(oeRuntimeTest.tc.target,
+ "http://downloads.yoctoproject.org/mirror/sources/iptables-1.4.13.tar.bz2",
+ dl_dir=dl_dir)
self.project.download_archive()
@testcase(206)
--
2.1.4
^ permalink raw reply related
* [PATCH 30/32] oeqa/sdkext/cases: Migrate test case to new OEQA framework
From: Aníbal Limón @ 2016-12-06 21:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481059445.git.anibal.limon@linux.intel.com>
Summary,
- Changes base case class to OESDKExtTest.
- Changes decorator classes to new ones.
- Chnages variable names sdktestdir -> sdk_dir.
- Added missing license to MIT.
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
meta/lib/oeqa/sdk/cases/buildgalculator.py | 2 +-
meta/lib/oeqa/sdk/cases/gcc.py | 2 +-
meta/lib/oeqa/sdkext/cases/devtool.py | 49 ++++++++++++++++--------------
meta/lib/oeqa/sdkext/cases/sdk_update.py | 14 +++++----
4 files changed, 36 insertions(+), 31 deletions(-)
diff --git a/meta/lib/oeqa/sdk/cases/buildgalculator.py b/meta/lib/oeqa/sdk/cases/buildgalculator.py
index bdc8b6a..b9b24ee 100644
--- a/meta/lib/oeqa/sdk/cases/buildgalculator.py
+++ b/meta/lib/oeqa/sdk/cases/buildgalculator.py
@@ -10,7 +10,7 @@ class GalculatorTest(OESDKTestCase):
def setUpClass(self):
if not (self.tc.hasTargetPackage("gtk+3") or\
self.tc.hasTargetPackage("libgtk-3.0")):
- raise unittest.SkipTest("%s class: SDK don't support gtk+3" % self.__name__)
+ raise unittest.SkipTest("%s class: SDK don't support gtk+3" % self.__class__.__name__)
def test_galculator(self):
dl_dir = self.td.get('DL_DIR', None)
diff --git a/meta/lib/oeqa/sdk/cases/gcc.py b/meta/lib/oeqa/sdk/cases/gcc.py
index e06af4c..36725e3 100644
--- a/meta/lib/oeqa/sdk/cases/gcc.py
+++ b/meta/lib/oeqa/sdk/cases/gcc.py
@@ -20,7 +20,7 @@ class GccCompileTest(OESDKTestCase):
machine = self.td.get("MACHINE")
if not self.tc.hasHostPackage("packagegroup-cross-canadian-%s" % machine):
raise unittest.SkipTest("%s class: SDK doesn't contain a cross-canadian toolchain",
- self.__name__)
+ self.__class__.__name__)
def test_gcc_compile(self):
self._run('$CC %s/test.c -o %s/test -lm' % (self.tc.sdk_dir, self.tc.sdk_dir))
diff --git a/meta/lib/oeqa/sdkext/cases/devtool.py b/meta/lib/oeqa/sdkext/cases/devtool.py
index 65f41f6..da0050c 100644
--- a/meta/lib/oeqa/sdkext/cases/devtool.py
+++ b/meta/lib/oeqa/sdkext/cases/devtool.py
@@ -1,18 +1,22 @@
+# Copyright (C) 2016 Intel Corporation
+# Released under the MIT license (see COPYING.MIT)
+
import shutil
import subprocess
-import urllib.request
-from oeqa.oetest import oeSDKExtTest
-from oeqa.utils.decorators import *
-class DevtoolTest(oeSDKExtTest):
+from oeqa.sdkext.case import OESDKExtTestCase
+from oeqa.core.decorator.depends import OETestDepends
+from oeqa.core.decorator.oeid import OETestID
+
+class DevtoolTest(OESDKExtTestCase):
@classmethod
def setUpClass(self):
- self.myapp_src = os.path.join(self.tc.sdkextfilesdir, "myapp")
- self.myapp_dst = os.path.join(self.tc.sdktestdir, "myapp")
+ self.myapp_src = os.path.join(self.tc.esdk_files_dir, "myapp")
+ self.myapp_dst = os.path.join(self.tc.sdk_dir, "myapp")
shutil.copytree(self.myapp_src, self.myapp_dst)
- self.myapp_cmake_src = os.path.join(self.tc.sdkextfilesdir, "myapp_cmake")
- self.myapp_cmake_dst = os.path.join(self.tc.sdktestdir, "myapp_cmake")
+ self.myapp_cmake_src = os.path.join(self.tc.esdk_files_dir, "myapp_cmake")
+ self.myapp_cmake_dst = os.path.join(self.tc.sdk_dir, "myapp_cmake")
shutil.copytree(self.myapp_cmake_src, self.myapp_cmake_dst)
def _test_devtool_build(self, directory):
@@ -37,31 +41,31 @@ class DevtoolTest(oeSDKExtTest):
def test_devtool_location(self):
output = self._run('which devtool')
- self.assertEqual(output.startswith(self.tc.sdktestdir), True, \
+ self.assertEqual(output.startswith(self.tc.sdk_dir), True, \
msg="Seems that devtool isn't the eSDK one: %s" % output)
- @skipUnlessPassed('test_devtool_location')
+ @OETestDepends(['test_devtool_location'])
def test_devtool_add_reset(self):
self._run('devtool add myapp %s' % self.myapp_dst)
self._run('devtool reset myapp')
- @testcase(1473)
- @skipUnlessPassed('test_devtool_location')
+ @OETestID(1473)
+ @OETestDepends(['test_devtool_location'])
def test_devtool_build_make(self):
self._test_devtool_build(self.myapp_dst)
- @testcase(1474)
- @skipUnlessPassed('test_devtool_location')
+ @OETestID(1474)
+ @OETestDepends(['test_devtool_location'])
def test_devtool_build_esdk_package(self):
self._test_devtool_build_package(self.myapp_dst)
- @testcase(1479)
- @skipUnlessPassed('test_devtool_location')
+ @OETestID(1479)
+ @OETestDepends(['test_devtool_location'])
def test_devtool_build_cmake(self):
self._test_devtool_build(self.myapp_cmake_dst)
- @testcase(1482)
- @skipUnlessPassed('test_devtool_location')
+ @OETestID(1482)
+ @OETestDepends(['test_devtool_location'])
def test_extend_autotools_recipe_creation(self):
req = 'https://github.com/rdfa/librdfa'
recipe = "bbexample"
@@ -74,8 +78,8 @@ class DevtoolTest(oeSDKExtTest):
raise e
self._run('devtool reset %s' % recipe)
- @testcase(1484)
- @skipUnlessPassed('test_devtool_location')
+ @OETestID(1484)
+ @OETestDepends(['test_devtool_location'])
def test_devtool_kernelmodule(self):
docfile = 'https://github.com/umlaeute/v4l2loopback.git'
recipe = 'v4l2loopback-driver'
@@ -88,8 +92,8 @@ class DevtoolTest(oeSDKExtTest):
raise e
self._run('devtool reset %s' % recipe)
- @testcase(1478)
- @skipUnlessPassed('test_devtool_location')
+ @OETestID(1478)
+ @OETestDepends(['test_devtool_location'])
def test_recipes_for_nodejs(self):
package_nodejs = "npm://registry.npmjs.org;name=winston;version=2.2.0"
self._run('devtool add %s ' % package_nodejs)
@@ -101,7 +105,6 @@ class DevtoolTest(oeSDKExtTest):
raise e
self._run('devtool reset %s '% package_nodejs)
-
@classmethod
def tearDownClass(self):
shutil.rmtree(self.myapp_dst)
diff --git a/meta/lib/oeqa/sdkext/cases/sdk_update.py b/meta/lib/oeqa/sdkext/cases/sdk_update.py
index 2ade839..4e70c8f 100644
--- a/meta/lib/oeqa/sdkext/cases/sdk_update.py
+++ b/meta/lib/oeqa/sdkext/cases/sdk_update.py
@@ -1,21 +1,23 @@
+# Copyright (C) 2016 Intel Corporation
+# Released under the MIT license (see COPYING.MIT)
+
import os
import shutil
import subprocess
-from oeqa.oetest import oeSDKExtTest
+from oeqa.sdkext.case import OESDKExtTestCase
from oeqa.utils.httpserver import HTTPService
-class SdkUpdateTest(oeSDKExtTest):
-
+class SdkUpdateTest(OESDKExtTestCase):
@classmethod
def setUpClass(self):
- self.publish_dir = os.path.join(self.tc.sdktestdir, 'esdk_publish')
+ self.publish_dir = os.path.join(self.tc.sdk_dir, 'esdk_publish')
if os.path.exists(self.publish_dir):
shutil.rmtree(self.publish_dir)
os.mkdir(self.publish_dir)
- tcname_new = self.tc.d.expand(
- "${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}-new.sh")
+ tcname_new = "%s/%s-new.sh" % (self.td.get("SDK_DEPLOY", ''),
+ self.td.get("TOOLCHAINEXT_OUTPUTNAME", ''))
if not os.path.exists(tcname_new):
tcname_new = self.tc.tcname
--
2.1.4
^ permalink raw reply related
* [PATCH 29/32] classes/testsdk: Migrate to use the new OESDKExtTestContext
From: Aníbal Limón @ 2016-12-06 21:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481059445.git.anibal.limon@linux.intel.com>
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
meta/classes/testsdk.bbclass | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass
index 24529ca..1d6547a 100644
--- a/meta/classes/testsdk.bbclass
+++ b/meta/classes/testsdk.bbclass
@@ -100,7 +100,7 @@ def testsdkext_main(d):
from bb.utils import export_proxies
from oeqa.utils import avoid_paths_in_environ
- from oeqa.sdk.context import OESDKExtTestContext, OESDKExtTestContextExecutor
+ from oeqa.sdkext.context import OESDKExtTestContext, OESDKExtTestContextExecutor
pn = d.getVar("PN", True)
logger = logging.getLogger("BitBake")
@@ -119,13 +119,13 @@ def testsdkext_main(d):
bb.fatal("The toolchain ext %s is not built. Build it before running the" \
" tests: 'bitbake <image> -c populate_sdk_ext' ." % tcname)
- tdname = d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.testdata.json")
+ tdname = d.expand("${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.testdata.json")
test_data = json.load(open(tdname, "r"))
target_pkg_manifest = OESDKExtTestContextExecutor._load_manifest(
- d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.target.manifest"))
+ d.expand("${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.target.manifest"))
host_pkg_manifest = OESDKExtTestContextExecutor._load_manifest(
- d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.host.manifest"))
+ d.expand("${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.host.manifest"))
sdk_dir = d.expand("${WORKDIR}/testsdkext/")
bb.utils.remove(sdk_dir, True)
@@ -134,7 +134,7 @@ def testsdkext_main(d):
subprocess.check_output("%s -y -d %s" % (tcname, sdk_dir), shell=True)
except subprocess.CalledProcessError as e:
msg = "Couldn't install the extensible SDK:\n%s" % e.output.decode("utf-8")
- logfn = os.path.join(sdkdir, 'preparing_build_system.log')
+ logfn = os.path.join(sdk_dir, 'preparing_build_system.log')
if os.path.exists(logfn):
msg += '\n\nContents of preparing_build_system.log:\n'
with open(logfn, 'r') as f:
--
2.1.4
^ permalink raw reply related
* [PATCH 28/32] oeqa/sdkext: Adds case and context modules.
From: Aníbal Limón @ 2016-12-06 21:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481059445.git.anibal.limon@linux.intel.com>
The extensible sdk context and case modules extends the sdk ones,
this means that the tests from sdk are run also the sdkext tests.
Enables support in context for use oe-test esdk command for run
the test suites, the same options of sdk are required for run esdk tests.
Removes old related to case and context inside oetest.py.
[YOCTO #10599]
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
meta/classes/testsdk.bbclass | 99 +++++++++++++++++++----------------------
meta/lib/oeqa/oetest.py | 40 -----------------
meta/lib/oeqa/sdkext/case.py | 21 +++++++++
meta/lib/oeqa/sdkext/context.py | 21 +++++++++
4 files changed, 88 insertions(+), 93 deletions(-)
create mode 100644 meta/lib/oeqa/sdkext/case.py
create mode 100644 meta/lib/oeqa/sdkext/context.py
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass
index 4c4df10..24529ca 100644
--- a/meta/classes/testsdk.bbclass
+++ b/meta/classes/testsdk.bbclass
@@ -16,37 +16,6 @@
TESTSDKLOCK = "${TMPDIR}/testsdk.lock"
-def run_test_context(CTestContext, d, testdir, tcname, pn, *args):
- import glob
- import time
-
- targets = glob.glob(d.expand(testdir + "/tc/environment-setup-*"))
- for sdkenv in targets:
- bb.plain("Testing %s" % sdkenv)
- tc = CTestContext(d, testdir, sdkenv, tcname, args)
-
- # this is a dummy load of tests
- # we are doing that to find compile errors in the tests themselves
- # before booting the image
- try:
- tc.loadTests()
- except Exception as e:
- import traceback
- bb.fatal("Loading tests failed:\n%s" % traceback.format_exc())
-
- starttime = time.time()
- result = tc.runTests()
- stoptime = time.time()
- if result.wasSuccessful():
- bb.plain("%s SDK(%s):%s - Ran %d test%s in %.3fs" % (pn, os.path.basename(tcname), os.path.basename(sdkenv),result.testsRun, result.testsRun != 1 and "s" or "", stoptime - starttime))
- msg = "%s - OK - All required tests passed" % pn
- skipped = len(result.skipped)
- if skipped:
- msg += " (skipped=%d)" % skipped
- bb.plain(msg)
- else:
- bb.fatal("%s - FAILED - check the task log and the commands log" % pn)
-
def testsdk_main(d):
import os
import subprocess
@@ -121,16 +90,20 @@ addtask testsdk
do_testsdk[nostamp] = "1"
do_testsdk[lockfiles] += "${TESTSDKLOCK}"
-TEST_LOG_SDKEXT_DIR ?= "${WORKDIR}/testsdkext"
TESTSDKEXTLOCK = "${TMPDIR}/testsdkext.lock"
def testsdkext_main(d):
import os
- import oeqa.sdkext
+ import json
import subprocess
+ import logging
+
from bb.utils import export_proxies
- from oeqa.oetest import SDKTestContext, SDKExtTestContext
from oeqa.utils import avoid_paths_in_environ
+ from oeqa.sdk.context import OESDKExtTestContext, OESDKExtTestContextExecutor
+
+ pn = d.getVar("PN", True)
+ logger = logging.getLogger("BitBake")
# extensible sdk use network
export_proxies(d)
@@ -141,20 +114,24 @@ def testsdkext_main(d):
d.getVar('BASE_WORKDIR', True)]
os.environ['PATH'] = avoid_paths_in_environ(paths_to_avoid)
- pn = d.getVar("PN", True)
- bb.utils.mkdirhier(d.getVar("TEST_LOG_SDKEXT_DIR", True))
-
tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.sh")
if not os.path.exists(tcname):
bb.fatal("The toolchain ext %s is not built. Build it before running the" \
" tests: 'bitbake <image> -c populate_sdk_ext' ." % tcname)
- testdir = d.expand("${WORKDIR}/testsdkext/")
- bb.utils.remove(testdir, True)
- bb.utils.mkdirhier(testdir)
- sdkdir = os.path.join(testdir, 'tc')
+ tdname = d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.testdata.json")
+ test_data = json.load(open(tdname, "r"))
+
+ target_pkg_manifest = OESDKExtTestContextExecutor._load_manifest(
+ d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.target.manifest"))
+ host_pkg_manifest = OESDKExtTestContextExecutor._load_manifest(
+ d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.host.manifest"))
+
+ sdk_dir = d.expand("${WORKDIR}/testsdkext/")
+ bb.utils.remove(sdk_dir, True)
+ bb.utils.mkdirhier(sdk_dir)
try:
- subprocess.check_output("%s -y -d %s" % (tcname, sdkdir), shell=True)
+ subprocess.check_output("%s -y -d %s" % (tcname, sdk_dir), shell=True)
except subprocess.CalledProcessError as e:
msg = "Couldn't install the extensible SDK:\n%s" % e.output.decode("utf-8")
logfn = os.path.join(sdkdir, 'preparing_build_system.log')
@@ -165,19 +142,35 @@ def testsdkext_main(d):
msg += line
bb.fatal(msg)
- try:
- bb.plain("Running SDK Compatibility tests ...")
- run_test_context(SDKExtTestContext, d, testdir, tcname, pn, True)
- finally:
- pass
+ fail = False
+ sdk_envs = OESDKExtTestContextExecutor._get_sdk_environs(sdk_dir)
+ for s in sdk_envs:
+ bb.plain("Extensible SDK testing environment: %s" % s)
- try:
- bb.plain("Running Extensible SDK tests ...")
- run_test_context(SDKExtTestContext, d, testdir, tcname, pn)
- finally:
- pass
+ sdk_env = sdk_envs[s]
+ tc = OESDKExtTestContext(td=test_data, logger=logger, sdk_dir=sdk_dir,
+ sdk_env=sdk_env, target_pkg_manifest=target_pkg_manifest,
+ host_pkg_manifest=host_pkg_manifest)
- bb.utils.remove(testdir, True)
+ try:
+ tc.loadTests(OESDKExtTestContextExecutor.default_cases)
+ except Exception as e:
+ import traceback
+ bb.fatal("Loading tests failed:\n%s" % traceback.format_exc())
+
+ result = tc.runTests()
+
+ component = "%s %s" % (pn, OESDKExtTestContextExecutor.name)
+ context_msg = "%s:%s" % (os.path.basename(tcname), os.path.basename(sdk_env))
+
+ tc.logSummary(result, component, context_msg)
+ tc.logDetails()
+
+ if not result.wasSuccessful():
+ fail = True
+
+ if fail:
+ bb.fatal("%s - FAILED - check the task log and the commands log" % pn)
testsdkext_main[vardepsexclude] =+ "BB_ORIGENV"
diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py
index 4a98b0f1..f9e9025 100644
--- a/meta/lib/oeqa/oetest.py
+++ b/meta/lib/oeqa/oetest.py
@@ -27,7 +27,6 @@ try:
except ImportError:
pass
from oeqa.utils.decorators import LogResults, gettag, getResults
-from oeqa.utils import avoid_paths_in_environ
logger = logging.getLogger("BitBake")
@@ -145,18 +144,6 @@ class OETestCalledProcessError(subprocess.CalledProcessError):
subprocess.CalledProcessError = OETestCalledProcessError
-class oeSDKExtTest(oeSDKTest):
- def _run(self, cmd):
- # extensible sdk shows a warning if found bitbake in the path
- # because can cause contamination, i.e. use devtool from
- # poky/scripts instead of eSDK one.
- env = os.environ.copy()
- paths_to_avoid = ['bitbake/bin', 'poky/scripts']
- env['PATH'] = avoid_paths_in_environ(paths_to_avoid)
-
- return subprocess.check_output(". %s > /dev/null;"\
- " %s;" % (self.tc.sdkenv, cmd), stderr=subprocess.STDOUT, shell=True, env=env).decode("utf-8")
-
def getmodule(pos=2):
# stack returns a list of tuples containg frame information
# First element of the list the is current frame, caller is 1
@@ -642,30 +629,3 @@ class ExportTestContext(RuntimeTestContext):
extracted_dir = self.d.getVar("TEST_EXPORT_EXTRACTED_DIR", True)
pkg_dir = os.path.join(export_dir, extracted_dir)
super(ExportTestContext, self).install_uninstall_packages(test_id, pkg_dir, install)
-
-class SDKExtTestContext(SDKTestContext):
- def __init__(self, d, sdktestdir, sdkenv, tcname, *args):
- self.target_manifest = d.getVar("SDK_EXT_TARGET_MANIFEST", True)
- self.host_manifest = d.getVar("SDK_EXT_HOST_MANIFEST", True)
- if args:
- self.cm = args[0] # Compatibility mode for run SDK tests
- else:
- self.cm = False
-
- super(SDKExtTestContext, self).__init__(d, sdktestdir, sdkenv, tcname)
-
- self.sdkextfilesdir = os.path.join(os.path.dirname(os.path.abspath(
- oeqa.sdkext.__file__)), "files")
-
- def _get_test_namespace(self):
- if self.cm:
- return "sdk"
- else:
- return "sdkext"
-
- def _get_test_suites(self):
- return (self.d.getVar("TEST_SUITES_SDK_EXT", True) or "auto").split()
-
- def _get_test_suites_required(self):
- return [t for t in (self.d.getVar("TEST_SUITES_SDK_EXT", True) or \
- "auto").split() if t != "auto"]
diff --git a/meta/lib/oeqa/sdkext/case.py b/meta/lib/oeqa/sdkext/case.py
new file mode 100644
index 0000000..6f708aa
--- /dev/null
+++ b/meta/lib/oeqa/sdkext/case.py
@@ -0,0 +1,21 @@
+# Copyright (C) 2016 Intel Corporation
+# Released under the MIT license (see COPYING.MIT)
+
+import os
+import subprocess
+
+from oeqa.utils import avoid_paths_in_environ
+from oeqa.sdk.case import OESDKTestCase
+
+class OESDKExtTestCase(OESDKTestCase):
+ def _run(self, cmd):
+ # extensible sdk shows a warning if found bitbake in the path
+ # because can cause contamination, i.e. use devtool from
+ # poky/scripts instead of eSDK one.
+ env = os.environ.copy()
+ paths_to_avoid = ['bitbake/bin', 'poky/scripts']
+ env['PATH'] = avoid_paths_in_environ(paths_to_avoid)
+
+ return subprocess.check_output(". %s > /dev/null;"\
+ " %s;" % (self.tc.sdk_env, cmd), stderr=subprocess.STDOUT,
+ shell=True, env=env).decode("utf-8")
diff --git a/meta/lib/oeqa/sdkext/context.py b/meta/lib/oeqa/sdkext/context.py
new file mode 100644
index 0000000..8dbcd80
--- /dev/null
+++ b/meta/lib/oeqa/sdkext/context.py
@@ -0,0 +1,21 @@
+# Copyright (C) 2016 Intel Corporation
+# Released under the MIT license (see COPYING.MIT)
+
+import os
+from oeqa.sdk.context import OESDKTestContext, OESDKTestContextExecutor
+
+class OESDKExtTestContext(OESDKTestContext):
+ esdk_files_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "files")
+
+class OESDKExtTestContextExecutor(OESDKTestContextExecutor):
+ _context_class = OESDKExtTestContext
+
+ name = 'esdk'
+ help = 'esdk test component'
+ description = 'executes esdk tests'
+
+ default_cases = [OESDKTestContextExecutor.default_cases[0],
+ os.path.join(os.path.abspath(os.path.dirname(__file__)), 'cases')]
+ default_test_data = None
+
+_executor_class = OESDKExtTestContextExecutor
--
2.1.4
^ permalink raw reply related
* [PATCH 27/32] oeqa/sdkext: Move test cases inside cases directory
From: Aníbal Limón @ 2016-12-06 21:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481059445.git.anibal.limon@linux.intel.com>
For match with the new structure of the OEQA framework.
In the new framework Test component base directory in this case
sdk module will contain case and context implementations.
[YOCTO #10599]
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
meta/lib/oeqa/sdkext/__init__.py | 3 ---
meta/lib/oeqa/sdkext/{ => cases}/devtool.py | 0
meta/lib/oeqa/sdkext/{ => cases}/sdk_update.py | 0
3 files changed, 3 deletions(-)
rename meta/lib/oeqa/sdkext/{ => cases}/devtool.py (100%)
rename meta/lib/oeqa/sdkext/{ => cases}/sdk_update.py (100%)
diff --git a/meta/lib/oeqa/sdkext/__init__.py b/meta/lib/oeqa/sdkext/__init__.py
index 4cf3fa7..e69de29 100644
--- a/meta/lib/oeqa/sdkext/__init__.py
+++ b/meta/lib/oeqa/sdkext/__init__.py
@@ -1,3 +0,0 @@
-# Enable other layers to have tests in the same named directory
-from pkgutil import extend_path
-__path__ = extend_path(__path__, __name__)
diff --git a/meta/lib/oeqa/sdkext/devtool.py b/meta/lib/oeqa/sdkext/cases/devtool.py
similarity index 100%
rename from meta/lib/oeqa/sdkext/devtool.py
rename to meta/lib/oeqa/sdkext/cases/devtool.py
diff --git a/meta/lib/oeqa/sdkext/sdk_update.py b/meta/lib/oeqa/sdkext/cases/sdk_update.py
similarity index 100%
rename from meta/lib/oeqa/sdkext/sdk_update.py
rename to meta/lib/oeqa/sdkext/cases/sdk_update.py
--
2.1.4
^ permalink raw reply related
* [PATCH 26/32] classes/testsdk: Remove the need of TEST_LOG_DIR variable
From: Aníbal Limón @ 2016-12-06 21:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481059445.git.anibal.limon@linux.intel.com>
The TEST_LOG_DIR was used for store sdk_target_log this log
contains the output of the run of build commands now that information
could be found also on log.do_testsdk under WORKDIR.
The log will continue to store into SDK_DIR instead of TEST_LOG_DIR.
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
meta/classes/testsdk.bbclass | 6 ------
meta/lib/oeqa/sdk/cases/buildcvs.py | 4 ++--
meta/lib/oeqa/sdk/cases/buildgalculator.py | 4 ++--
meta/lib/oeqa/sdk/cases/buildiptables.py | 4 ++--
4 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass
index 959fb38..4c4df10 100644
--- a/meta/classes/testsdk.bbclass
+++ b/meta/classes/testsdk.bbclass
@@ -14,7 +14,6 @@
#
# where "<image-name>" is an image like core-image-sato.
-TEST_LOG_DIR ?= "${WORKDIR}/testimage"
TESTSDKLOCK = "${TMPDIR}/testsdk.lock"
def run_test_context(CTestContext, d, testdir, tcname, pn, *args):
@@ -64,17 +63,12 @@ def testsdk_main(d):
# sdk use network for download projects for build
export_proxies(d)
- test_log_dir = d.getVar("TEST_LOG_DIR", True)
-
- bb.utils.mkdirhier(test_log_dir)
-
tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh")
if not os.path.exists(tcname):
bb.fatal("The toolchain %s is not built. Build it before running the tests: 'bitbake <image> -c populate_sdk' ." % tcname)
tdname = d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.testdata.json")
test_data = json.load(open(tdname, "r"))
- test_data['TEST_LOG_DIR'] = test_log_dir
target_pkg_manifest = OESDKTestContextExecutor._load_manifest(
d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.target.manifest"))
diff --git a/meta/lib/oeqa/sdk/cases/buildcvs.py b/meta/lib/oeqa/sdk/cases/buildcvs.py
index ee7fb73..6222a8e 100644
--- a/meta/lib/oeqa/sdk/cases/buildcvs.py
+++ b/meta/lib/oeqa/sdk/cases/buildcvs.py
@@ -2,7 +2,7 @@ from oeqa.sdk.case import OESDKTestCase
from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject
class BuildCvsTest(OESDKTestCase):
- td_vars = ['TEST_LOG_DIR', 'DATETIME']
+ td_vars = ['DATETIME']
@classmethod
def setUpClass(self):
@@ -10,7 +10,7 @@ class BuildCvsTest(OESDKTestCase):
self.project = SDKBuildProject(self.tc.sdk_dir + "/cvs/", self.tc.sdk_env,
"http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2",
- self.td['TEST_LOG_DIR'], self.td['DATETIME'], dl_dir=dl_dir)
+ self.tc.sdk_dir, self.td['DATETIME'], dl_dir=dl_dir)
self.project.download_archive()
def test_cvs(self):
diff --git a/meta/lib/oeqa/sdk/cases/buildgalculator.py b/meta/lib/oeqa/sdk/cases/buildgalculator.py
index d2c1189..bdc8b6a 100644
--- a/meta/lib/oeqa/sdk/cases/buildgalculator.py
+++ b/meta/lib/oeqa/sdk/cases/buildgalculator.py
@@ -4,7 +4,7 @@ from oeqa.sdk.case import OESDKTestCase
from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject
class GalculatorTest(OESDKTestCase):
- td_vars = ['TEST_LOG_DIR', 'DATETIME']
+ td_vars = ['DATETIME']
@classmethod
def setUpClass(self):
@@ -19,7 +19,7 @@ class GalculatorTest(OESDKTestCase):
project = SDKBuildProject(self.tc.sdk_dir + "/galculator/",
self.tc.sdk_env,
"http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2",
- self.td['TEST_LOG_DIR'], self.td['DATETIME'], dl_dir=dl_dir)
+ self.tc.sdk_dir, self.td['DATETIME'], dl_dir=dl_dir)
project.download_archive()
diff --git a/meta/lib/oeqa/sdk/cases/buildiptables.py b/meta/lib/oeqa/sdk/cases/buildiptables.py
index a50fb5d..532b5de 100644
--- a/meta/lib/oeqa/sdk/cases/buildiptables.py
+++ b/meta/lib/oeqa/sdk/cases/buildiptables.py
@@ -2,7 +2,7 @@ from oeqa.sdk.case import OESDKTestCase
from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject
class BuildIptablesTest(OESDKTestCase):
- td_vars = ['TEST_LOG_DIR', 'DATETIME']
+ td_vars = ['DATETIME']
@classmethod
def setUpClass(self):
@@ -10,7 +10,7 @@ class BuildIptablesTest(OESDKTestCase):
self.project = SDKBuildProject(self.tc.sdk_dir + "/iptables/", self.tc.sdk_env,
"http://downloads.yoctoproject.org/mirror/sources/iptables-1.4.13.tar.bz2",
- self.td['TEST_LOG_DIR'], self.td['DATETIME'], dl_dir=dl_dir)
+ self.tc.sdk_dir, self.td['DATETIME'], dl_dir=dl_dir)
self.project.download_archive()
def test_iptables(self):
--
2.1.4
^ permalink raw reply related
* [PATCH 25/32] oeqa/sdk/cases: Migrate tests to the new OEQA framework
From: Aníbal Limón @ 2016-12-06 21:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481059445.git.anibal.limon@linux.intel.com>
Summary of the changes:
- Remove auto extend_path using pkgutil at __init__, is not needed.
- Change base class to OESDKTestCase.
- Add td_vars attr to set dependencies of certain variables in test
data.
- Change skips from module level to class level because Test context
(tc)
now isn't at module level.
- Variable names changes to be consistent (i.e. sdktestdir ->
sdk_dir).
[YOCTO #10599]
- Don't use bb.utils functions use instead remove_safe and shutil
for copy files.
- SDKBuildProject pass test data variables instead of call getVar
inside.
[YOCTO #10231]
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
---
meta/lib/oeqa/sdk/cases/__init__.py | 3 ---
meta/lib/oeqa/sdk/cases/buildcvs.py | 15 ++++++-----
meta/lib/oeqa/sdk/cases/buildgalculator.py | 28 ++++++++++++--------
meta/lib/oeqa/sdk/cases/buildiptables.py | 16 +++++++-----
meta/lib/oeqa/sdk/cases/gcc.py | 41 +++++++++++++++++-------------
meta/lib/oeqa/sdk/cases/perl.py | 25 +++++++++---------
meta/lib/oeqa/sdk/cases/python.py | 25 +++++++++---------
7 files changed, 84 insertions(+), 69 deletions(-)
delete mode 100644 meta/lib/oeqa/sdk/cases/__init__.py
diff --git a/meta/lib/oeqa/sdk/cases/__init__.py b/meta/lib/oeqa/sdk/cases/__init__.py
deleted file mode 100644
index 4cf3fa7..0000000
--- a/meta/lib/oeqa/sdk/cases/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Enable other layers to have tests in the same named directory
-from pkgutil import extend_path
-__path__ = extend_path(__path__, __name__)
diff --git a/meta/lib/oeqa/sdk/cases/buildcvs.py b/meta/lib/oeqa/sdk/cases/buildcvs.py
index c7146fa..ee7fb73 100644
--- a/meta/lib/oeqa/sdk/cases/buildcvs.py
+++ b/meta/lib/oeqa/sdk/cases/buildcvs.py
@@ -1,13 +1,16 @@
-from oeqa.oetest import oeSDKTest, skipModule
-from oeqa.utils.decorators import *
-from oeqa.utils.targetbuild import SDKBuildProject
+from oeqa.sdk.case import OESDKTestCase
+from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject
-class BuildCvsTest(oeSDKTest):
+class BuildCvsTest(OESDKTestCase):
+ td_vars = ['TEST_LOG_DIR', 'DATETIME']
@classmethod
def setUpClass(self):
- self.project = SDKBuildProject(oeSDKTest.tc.sdktestdir + "/cvs/", oeSDKTest.tc.sdkenv, oeSDKTest.tc.d,
- "http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2")
+ dl_dir = self.td.get('DL_DIR', None)
+
+ self.project = SDKBuildProject(self.tc.sdk_dir + "/cvs/", self.tc.sdk_env,
+ "http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2",
+ self.td['TEST_LOG_DIR'], self.td['DATETIME'], dl_dir=dl_dir)
self.project.download_archive()
def test_cvs(self):
diff --git a/meta/lib/oeqa/sdk/cases/buildgalculator.py b/meta/lib/oeqa/sdk/cases/buildgalculator.py
index dc2fa9c..d2c1189 100644
--- a/meta/lib/oeqa/sdk/cases/buildgalculator.py
+++ b/meta/lib/oeqa/sdk/cases/buildgalculator.py
@@ -1,17 +1,25 @@
-from oeqa.oetest import oeSDKTest, skipModule
-from oeqa.utils.decorators import *
-from oeqa.utils.targetbuild import SDKBuildProject
+import unittest
-def setUpModule():
- if not (oeSDKTest.hasPackage("gtk+3") or oeSDKTest.hasPackage("libgtk-3.0")):
- skipModule("Image doesn't have gtk+3 in manifest")
+from oeqa.sdk.case import OESDKTestCase
+from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject
+
+class GalculatorTest(OESDKTestCase):
+ td_vars = ['TEST_LOG_DIR', 'DATETIME']
+
+ @classmethod
+ def setUpClass(self):
+ if not (self.tc.hasTargetPackage("gtk+3") or\
+ self.tc.hasTargetPackage("libgtk-3.0")):
+ raise unittest.SkipTest("%s class: SDK don't support gtk+3" % self.__name__)
-class GalculatorTest(oeSDKTest):
def test_galculator(self):
+ dl_dir = self.td.get('DL_DIR', None)
+ project = None
try:
- project = SDKBuildProject(oeSDKTest.tc.sdktestdir + "/galculator/",
- oeSDKTest.tc.sdkenv, oeSDKTest.tc.d,
- "http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2")
+ project = SDKBuildProject(self.tc.sdk_dir + "/galculator/",
+ self.tc.sdk_env,
+ "http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2",
+ self.td['TEST_LOG_DIR'], self.td['DATETIME'], dl_dir=dl_dir)
project.download_archive()
diff --git a/meta/lib/oeqa/sdk/cases/buildiptables.py b/meta/lib/oeqa/sdk/cases/buildiptables.py
index f0cb8a4..a50fb5d 100644
--- a/meta/lib/oeqa/sdk/cases/buildiptables.py
+++ b/meta/lib/oeqa/sdk/cases/buildiptables.py
@@ -1,14 +1,16 @@
-from oeqa.oetest import oeSDKTest
-from oeqa.utils.decorators import *
-from oeqa.utils.targetbuild import SDKBuildProject
+from oeqa.sdk.case import OESDKTestCase
+from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject
-
-class BuildIptablesTest(oeSDKTest):
+class BuildIptablesTest(OESDKTestCase):
+ td_vars = ['TEST_LOG_DIR', 'DATETIME']
@classmethod
def setUpClass(self):
- self.project = SDKBuildProject(oeSDKTest.tc.sdktestdir + "/iptables/", oeSDKTest.tc.sdkenv, oeSDKTest.tc.d,
- "http://downloads.yoctoproject.org/mirror/sources/iptables-1.4.13.tar.bz2")
+ dl_dir = self.td.get('DL_DIR', None)
+
+ self.project = SDKBuildProject(self.tc.sdk_dir + "/iptables/", self.tc.sdk_env,
+ "http://downloads.yoctoproject.org/mirror/sources/iptables-1.4.13.tar.bz2",
+ self.td['TEST_LOG_DIR'], self.td['DATETIME'], dl_dir=dl_dir)
self.project.download_archive()
def test_iptables(self):
diff --git a/meta/lib/oeqa/sdk/cases/gcc.py b/meta/lib/oeqa/sdk/cases/gcc.py
index 8395b9b..e06af4c 100644
--- a/meta/lib/oeqa/sdk/cases/gcc.py
+++ b/meta/lib/oeqa/sdk/cases/gcc.py
@@ -1,36 +1,43 @@
-import unittest
import os
import shutil
-from oeqa.oetest import oeSDKTest, skipModule
-from oeqa.utils.decorators import *
-
-def setUpModule():
- machine = oeSDKTest.tc.d.getVar("MACHINE", True)
- if not oeSDKTest.hasHostPackage("packagegroup-cross-canadian-" + machine):
- skipModule("SDK doesn't contain a cross-canadian toolchain")
+import unittest
+from oeqa.core.utils.path import remove_safe
+from oeqa.sdk.case import OESDKTestCase
-class GccCompileTest(oeSDKTest):
+class GccCompileTest(OESDKTestCase):
+ td_vars = ['MACHINE']
@classmethod
def setUpClass(self):
- for f in ['test.c', 'test.cpp', 'testsdkmakefile']:
- shutil.copyfile(os.path.join(self.tc.filesdir, f), self.tc.sdktestdir + f)
+ files = {'test.c' : self.tc.files_dir, 'test.cpp' : self.tc.files_dir,
+ 'testsdkmakefile' : self.tc.sdk_files_dir}
+ for f in files:
+ shutil.copyfile(os.path.join(files[f], f),
+ os.path.join(self.tc.sdk_dir, f))
+
+ def setUp(self):
+ machine = self.td.get("MACHINE")
+ if not self.tc.hasHostPackage("packagegroup-cross-canadian-%s" % machine):
+ raise unittest.SkipTest("%s class: SDK doesn't contain a cross-canadian toolchain",
+ self.__name__)
def test_gcc_compile(self):
- self._run('$CC %s/test.c -o %s/test -lm' % (self.tc.sdktestdir, self.tc.sdktestdir))
+ self._run('$CC %s/test.c -o %s/test -lm' % (self.tc.sdk_dir, self.tc.sdk_dir))
def test_gpp_compile(self):
- self._run('$CXX %s/test.c -o %s/test -lm' % (self.tc.sdktestdir, self.tc.sdktestdir))
+ self._run('$CXX %s/test.c -o %s/test -lm' % (self.tc.sdk_dir, self.tc.sdk_dir))
def test_gpp2_compile(self):
- self._run('$CXX %s/test.cpp -o %s/test -lm' % (self.tc.sdktestdir, self.tc.sdktestdir))
+ self._run('$CXX %s/test.cpp -o %s/test -lm' % (self.tc.sdk_dir, self.tc.sdk_dir))
def test_make(self):
- self._run('cd %s; make -f testsdkmakefile' % self.tc.sdktestdir)
+ self._run('cd %s; make -f testsdkmakefile' % self.tc.sdk_dir)
@classmethod
def tearDownClass(self):
- files = [self.tc.sdktestdir + f for f in ['test.c', 'test.cpp', 'test.o', 'test', 'testsdkmakefile']]
+ files = [os.path.join(self.tc.sdk_dir, f) \
+ for f in ['test.c', 'test.cpp', 'test.o', 'test',
+ 'testsdkmakefile']]
for f in files:
- bb.utils.remove(f)
+ remove_safe(f)
diff --git a/meta/lib/oeqa/sdk/cases/perl.py b/meta/lib/oeqa/sdk/cases/perl.py
index 45f422e..e1bded2 100644
--- a/meta/lib/oeqa/sdk/cases/perl.py
+++ b/meta/lib/oeqa/sdk/cases/perl.py
@@ -1,28 +1,27 @@
-import unittest
import os
import shutil
-from oeqa.oetest import oeSDKTest, skipModule
-from oeqa.utils.decorators import *
-
-def setUpModule():
- if not oeSDKTest.hasHostPackage("nativesdk-perl"):
- skipModule("No perl package in the SDK")
-
+import unittest
-class PerlTest(oeSDKTest):
+from oeqa.core.utils.path import remove_safe
+from oeqa.sdk.case import OESDKTestCase
+class PerlTest(OESDKTestCase):
@classmethod
def setUpClass(self):
+ if not self.tc.hasHostPackage("nativesdk-perl"):
+ raise unittest.SkipTest("No perl package in the SDK")
+
for f in ['test.pl']:
- shutil.copyfile(os.path.join(self.tc.filesdir, f), self.tc.sdktestdir + f)
- self.testfile = self.tc.sdktestdir + "test.pl"
+ shutil.copyfile(os.path.join(self.tc.files_dir, f),
+ os.path.join(self.tc.sdk_dir, f))
+ self.testfile = os.path.join(self.tc.sdk_dir, "test.pl")
def test_perl_exists(self):
self._run('which perl')
def test_perl_works(self):
- self._run('perl %s/test.pl' % self.tc.sdktestdir)
+ self._run('perl %s' % self.testfile)
@classmethod
def tearDownClass(self):
- bb.utils.remove("%s/test.pl" % self.tc.sdktestdir)
+ remove_safe(self.testfile)
diff --git a/meta/lib/oeqa/sdk/cases/python.py b/meta/lib/oeqa/sdk/cases/python.py
index 896fab4..94a296f 100644
--- a/meta/lib/oeqa/sdk/cases/python.py
+++ b/meta/lib/oeqa/sdk/cases/python.py
@@ -1,26 +1,25 @@
-import unittest
import os
import shutil
-from oeqa.oetest import oeSDKTest, skipModule
-from oeqa.utils.decorators import *
-
-def setUpModule():
- if not oeSDKTest.hasHostPackage("nativesdk-python"):
- skipModule("No python package in the SDK")
-
+import unittest
-class PythonTest(oeSDKTest):
+from oeqa.core.utils.path import remove_safe
+from oeqa.sdk.case import OESDKTestCase
+class PythonTest(OESDKTestCase):
@classmethod
def setUpClass(self):
+ if not self.tc.hasHostPackage("nativesdk-python"):
+ raise unittest.SkipTest("No python package in the SDK")
+
for f in ['test.py']:
- shutil.copyfile(os.path.join(self.tc.filesdir, f), self.tc.sdktestdir + f)
+ shutil.copyfile(os.path.join(self.tc.files_dir, f),
+ os.path.join(self.tc.sdk_dir, f))
def test_python_exists(self):
self._run('which python')
def test_python_stdout(self):
- output = self._run('python %s/test.py' % self.tc.sdktestdir)
+ output = self._run('python %s/test.py' % self.tc.sdk_dir)
self.assertEqual(output.strip(), "the value of a is 0.01", msg="Incorrect output: %s" % output)
def test_python_testfile(self):
@@ -28,5 +27,5 @@ class PythonTest(oeSDKTest):
@classmethod
def tearDownClass(self):
- bb.utils.remove("%s/test.py" % self.tc.sdktestdir)
- bb.utils.remove("/tmp/testfile.python")
+ remove_safe("%s/test.py" % self.tc.sdk_dir)
+ remove_safe("/tmp/testfile.python")
--
2.1.4
^ permalink raw reply related
* [PATCH 24/32] oeqa/utils: {Target, SDK, }BuildProject remove dependency of bb
From: Aníbal Limón @ 2016-12-06 21:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481059445.git.anibal.limon@linux.intel.com>
Don't use bitbake references inside utils modules, in order todo
that changes getVar calls for arguments in the __init__ method like
dl_dir for all the classes and testlogdir, builddatetime in
SDKBUildProject.
Also don't export proxies inside _download_archive method, a good
practice is to setup the proxies at init of the process instead of
do it in this helper module.
[YOCTO #10231]
[YOCTO #10599]
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
meta/lib/oeqa/runtime/utils/targetbuildproject.py | 6 ++---
meta/lib/oeqa/sdk/utils/sdkbuildproject.py | 14 +++++-----
meta/lib/oeqa/utils/buildproject.py | 31 +++++------------------
3 files changed, 17 insertions(+), 34 deletions(-)
diff --git a/meta/lib/oeqa/runtime/utils/targetbuildproject.py b/meta/lib/oeqa/runtime/utils/targetbuildproject.py
index 138b5ef..006d4d4 100644
--- a/meta/lib/oeqa/runtime/utils/targetbuildproject.py
+++ b/meta/lib/oeqa/runtime/utils/targetbuildproject.py
@@ -5,13 +5,13 @@ from oeqa.utils.buildproject import BuildProject
class TargetBuildProject(BuildProject):
- def __init__(self, target, d, uri, foldername=None):
+ def __init__(self, target, uri, foldername=None, dl_dir=None):
self.target = target
self.targetdir = "~/"
- BuildProject.__init__(self, d, uri, foldername, tmpdir="/tmp")
+ BuildProject.__init__(self, uri, foldername, tmpdir="/tmp",
+ dl_dir=dl_dir)
def download_archive(self):
-
self._download_archive()
(status, output) = self.target.copy_to(self.localarchive, self.targetdir)
diff --git a/meta/lib/oeqa/sdk/utils/sdkbuildproject.py b/meta/lib/oeqa/sdk/utils/sdkbuildproject.py
index 1aa8a69..cc34e0c 100644
--- a/meta/lib/oeqa/sdk/utils/sdkbuildproject.py
+++ b/meta/lib/oeqa/sdk/utils/sdkbuildproject.py
@@ -7,17 +7,17 @@ import subprocess
from oeqa.utils.buildproject import BuildProject
class SDKBuildProject(BuildProject):
-
- def __init__(self, testpath, sdkenv, d, uri, foldername=None):
+ def __init__(self, testpath, sdkenv, uri, testlogdir, builddatetime,
+ foldername=None, dl_dir=None):
self.sdkenv = sdkenv
self.testdir = testpath
self.targetdir = testpath
- bb.utils.mkdirhier(testpath)
- self.datetime = d.getVar('DATETIME', True)
- self.testlogdir = d.getVar("TEST_LOG_DIR", True)
- bb.utils.mkdirhier(self.testlogdir)
+ os.makedirs(testpath, exist_ok=True)
+ self.datetime = builddatetime
+ self.testlogdir = testlogdir
+ os.makedirs(self.testlogdir, exist_ok=True)
self.logfile = os.path.join(self.testlogdir, "sdk_target_log.%s" % self.datetime)
- BuildProject.__init__(self, d, uri, foldername, tmpdir=testpath)
+ BuildProject.__init__(self, uri, foldername, tmpdir=testpath, dl_dir=dl_dir)
def download_archive(self):
diff --git a/meta/lib/oeqa/utils/buildproject.py b/meta/lib/oeqa/utils/buildproject.py
index 0e1ed8a..386a927 100644
--- a/meta/lib/oeqa/utils/buildproject.py
+++ b/meta/lib/oeqa/utils/buildproject.py
@@ -6,17 +6,17 @@
import os
import re
-import bb.utils
import subprocess
+import shutil
+
from abc import ABCMeta, abstractmethod
class BuildProject(metaclass=ABCMeta):
-
- def __init__(self, d, uri, foldername=None, tmpdir="/tmp/"):
- self.d = d
+ def __init__(self, uri, foldername=None, tmpdir="/tmp/", dl_dir=None):
self.uri = uri
self.archive = os.path.basename(uri)
self.localarchive = os.path.join(tmpdir,self.archive)
+ self.dl_dir = dl_dir
if foldername:
self.fname = foldername
else:
@@ -24,27 +24,11 @@ class BuildProject(metaclass=ABCMeta):
# Download self.archive to self.localarchive
def _download_archive(self):
-
- dl_dir = self.d.getVar("DL_DIR", True)
- if dl_dir and os.path.exists(os.path.join(dl_dir, self.archive)):
- bb.utils.copyfile(os.path.join(dl_dir, self.archive), self.localarchive)
+ if self.dl_dir and os.path.exists(os.path.join(self.dl_dir, self.archive)):
+ shutil.copyfile(os.path.join(self.dl_dir, self.archive), self.localarchive)
return
- exportvars = ['HTTP_PROXY', 'http_proxy',
- 'HTTPS_PROXY', 'https_proxy',
- 'FTP_PROXY', 'ftp_proxy',
- 'FTPS_PROXY', 'ftps_proxy',
- 'NO_PROXY', 'no_proxy',
- 'ALL_PROXY', 'all_proxy',
- 'SOCKS5_USER', 'SOCKS5_PASSWD']
-
- cmd = ''
- for var in exportvars:
- val = self.d.getVar(var, True)
- if val:
- cmd = 'export ' + var + '=\"%s\"; %s' % (val, cmd)
-
- cmd = cmd + "wget -O %s %s" % (self.localarchive, self.uri)
+ cmd = "wget -O %s %s" % (self.localarchive, self.uri)
subprocess.check_call(cmd, shell=True)
# This method should provide a way to run a command in the desired environment.
@@ -66,4 +50,3 @@ class BuildProject(metaclass=ABCMeta):
def clean(self):
self._run('rm -rf %s' % self.targetdir)
subprocess.call('rm -f %s' % self.localarchive, shell=True)
- pass
--
2.1.4
^ permalink raw reply related
* [PATCH 23/32] oeqa/utils: Move targetbuild to buildproject module
From: Aníbal Limón @ 2016-12-06 21:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481059445.git.anibal.limon@linux.intel.com>
The new buildproject module will contain only BuildProject class
a helper class for build source code.
The remaining classes TargetBuildProject and SDKBuildProject was
move to runtime and sdk respectively.
[YOCTO #10599]
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
---
meta/lib/oeqa/runtime/utils/__init__.py | 0
meta/lib/oeqa/runtime/utils/targetbuildproject.py | 33 +++++++++++
meta/lib/oeqa/sdk/utils/__init__.py | 0
meta/lib/oeqa/sdk/utils/sdkbuildproject.py | 45 ++++++++++++++
.../oeqa/utils/{targetbuild.py => buildproject.py} | 68 +---------------------
5 files changed, 79 insertions(+), 67 deletions(-)
create mode 100644 meta/lib/oeqa/runtime/utils/__init__.py
create mode 100644 meta/lib/oeqa/runtime/utils/targetbuildproject.py
create mode 100644 meta/lib/oeqa/sdk/utils/__init__.py
create mode 100644 meta/lib/oeqa/sdk/utils/sdkbuildproject.py
rename meta/lib/oeqa/utils/{targetbuild.py => buildproject.py} (48%)
diff --git a/meta/lib/oeqa/runtime/utils/__init__.py b/meta/lib/oeqa/runtime/utils/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/meta/lib/oeqa/runtime/utils/targetbuildproject.py b/meta/lib/oeqa/runtime/utils/targetbuildproject.py
new file mode 100644
index 0000000..138b5ef
--- /dev/null
+++ b/meta/lib/oeqa/runtime/utils/targetbuildproject.py
@@ -0,0 +1,33 @@
+# Copyright (C) 2016 Intel Corporation
+# Released under the MIT license (see COPYING.MIT)
+
+from oeqa.utils.buildproject import BuildProject
+
+class TargetBuildProject(BuildProject):
+
+ def __init__(self, target, d, uri, foldername=None):
+ self.target = target
+ self.targetdir = "~/"
+ BuildProject.__init__(self, d, uri, foldername, tmpdir="/tmp")
+
+ def download_archive(self):
+
+ self._download_archive()
+
+ (status, output) = self.target.copy_to(self.localarchive, self.targetdir)
+ if status != 0:
+ raise Exception("Failed to copy archive to target, output: %s" % output)
+
+ (status, output) = self.target.run('tar xf %s%s -C %s' % (self.targetdir, self.archive, self.targetdir))
+ if status != 0:
+ raise Exception("Failed to extract archive, output: %s" % output)
+
+ #Change targetdir to project folder
+ self.targetdir = self.targetdir + self.fname
+
+ # The timeout parameter of target.run is set to 0 to make the ssh command
+ # run with no timeout.
+ def _run(self, cmd):
+ return self.target.run(cmd, 0)[0]
+
+
diff --git a/meta/lib/oeqa/sdk/utils/__init__.py b/meta/lib/oeqa/sdk/utils/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/meta/lib/oeqa/sdk/utils/sdkbuildproject.py b/meta/lib/oeqa/sdk/utils/sdkbuildproject.py
new file mode 100644
index 0000000..1aa8a69
--- /dev/null
+++ b/meta/lib/oeqa/sdk/utils/sdkbuildproject.py
@@ -0,0 +1,45 @@
+# Copyright (C) 2016 Intel Corporation
+# Released under the MIT license (see COPYING.MIT)
+
+import os
+import subprocess
+
+from oeqa.utils.buildproject import BuildProject
+
+class SDKBuildProject(BuildProject):
+
+ def __init__(self, testpath, sdkenv, d, uri, foldername=None):
+ self.sdkenv = sdkenv
+ self.testdir = testpath
+ self.targetdir = testpath
+ bb.utils.mkdirhier(testpath)
+ self.datetime = d.getVar('DATETIME', True)
+ self.testlogdir = d.getVar("TEST_LOG_DIR", True)
+ bb.utils.mkdirhier(self.testlogdir)
+ self.logfile = os.path.join(self.testlogdir, "sdk_target_log.%s" % self.datetime)
+ BuildProject.__init__(self, d, uri, foldername, tmpdir=testpath)
+
+ def download_archive(self):
+
+ self._download_archive()
+
+ cmd = 'tar xf %s%s -C %s' % (self.targetdir, self.archive, self.targetdir)
+ subprocess.check_call(cmd, shell=True)
+
+ #Change targetdir to project folder
+ self.targetdir = os.path.join(self.targetdir, self.fname)
+
+ def run_configure(self, configure_args='', extra_cmds=' gnu-configize; '):
+ return super(SDKBuildProject, self).run_configure(configure_args=(configure_args or '$CONFIGURE_FLAGS'), extra_cmds=extra_cmds)
+
+ def run_install(self, install_args=''):
+ return super(SDKBuildProject, self).run_install(install_args=(install_args or "DESTDIR=%s/../install" % self.targetdir))
+
+ def log(self, msg):
+ if self.logfile:
+ with open(self.logfile, "a") as f:
+ f.write("%s\n" % msg)
+
+ def _run(self, cmd):
+ self.log("Running . %s; " % self.sdkenv + cmd)
+ return subprocess.call(". %s; " % self.sdkenv + cmd, shell=True)
diff --git a/meta/lib/oeqa/utils/targetbuild.py b/meta/lib/oeqa/utils/buildproject.py
similarity index 48%
rename from meta/lib/oeqa/utils/targetbuild.py
rename to meta/lib/oeqa/utils/buildproject.py
index 59593f5..0e1ed8a 100644
--- a/meta/lib/oeqa/utils/targetbuild.py
+++ b/meta/lib/oeqa/utils/buildproject.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2013 Intel Corporation
+# Copyright (C) 2013-2016 Intel Corporation
#
# Released under the MIT license (see COPYING.MIT)
@@ -67,69 +67,3 @@ class BuildProject(metaclass=ABCMeta):
self._run('rm -rf %s' % self.targetdir)
subprocess.call('rm -f %s' % self.localarchive, shell=True)
pass
-
-class TargetBuildProject(BuildProject):
-
- def __init__(self, target, d, uri, foldername=None):
- self.target = target
- self.targetdir = "~/"
- BuildProject.__init__(self, d, uri, foldername, tmpdir="/tmp")
-
- def download_archive(self):
-
- self._download_archive()
-
- (status, output) = self.target.copy_to(self.localarchive, self.targetdir)
- if status != 0:
- raise Exception("Failed to copy archive to target, output: %s" % output)
-
- (status, output) = self.target.run('tar xf %s%s -C %s' % (self.targetdir, self.archive, self.targetdir))
- if status != 0:
- raise Exception("Failed to extract archive, output: %s" % output)
-
- #Change targetdir to project folder
- self.targetdir = self.targetdir + self.fname
-
- # The timeout parameter of target.run is set to 0 to make the ssh command
- # run with no timeout.
- def _run(self, cmd):
- return self.target.run(cmd, 0)[0]
-
-
-class SDKBuildProject(BuildProject):
-
- def __init__(self, testpath, sdkenv, d, uri, foldername=None):
- self.sdkenv = sdkenv
- self.testdir = testpath
- self.targetdir = testpath
- bb.utils.mkdirhier(testpath)
- self.datetime = d.getVar('DATETIME', True)
- self.testlogdir = d.getVar("TEST_LOG_DIR", True)
- bb.utils.mkdirhier(self.testlogdir)
- self.logfile = os.path.join(self.testlogdir, "sdk_target_log.%s" % self.datetime)
- BuildProject.__init__(self, d, uri, foldername, tmpdir=testpath)
-
- def download_archive(self):
-
- self._download_archive()
-
- cmd = 'tar xf %s%s -C %s' % (self.targetdir, self.archive, self.targetdir)
- subprocess.check_call(cmd, shell=True)
-
- #Change targetdir to project folder
- self.targetdir = os.path.join(self.targetdir, self.fname)
-
- def run_configure(self, configure_args='', extra_cmds=' gnu-configize; '):
- return super(SDKBuildProject, self).run_configure(configure_args=(configure_args or '$CONFIGURE_FLAGS'), extra_cmds=extra_cmds)
-
- def run_install(self, install_args=''):
- return super(SDKBuildProject, self).run_install(install_args=(install_args or "DESTDIR=%s/../install" % self.targetdir))
-
- def log(self, msg):
- if self.logfile:
- with open(self.logfile, "a") as f:
- f.write("%s\n" % msg)
-
- def _run(self, cmd):
- self.log("Running . %s; " % self.sdkenv + cmd)
- return subprocess.call(". %s; " % self.sdkenv + cmd, shell=True)
--
2.1.4
^ permalink raw reply related
* [PATCH 22/32] classes/testsdk: Migrates testsdk.bbclass to use new OESDKTestContext
From: Aníbal Limón @ 2016-12-06 21:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481059445.git.anibal.limon@linux.intel.com>
The functionality provided is the same with imporvements on code
reuse and better interfaces.
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
meta/classes/testsdk.bbclass | 67 ++++++++++++++++++++++++++++++++++++--------
1 file changed, 55 insertions(+), 12 deletions(-)
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass
index 06b4c50..959fb38 100644
--- a/meta/classes/testsdk.bbclass
+++ b/meta/classes/testsdk.bbclass
@@ -50,30 +50,74 @@ def run_test_context(CTestContext, d, testdir, tcname, pn, *args):
def testsdk_main(d):
import os
- import oeqa.sdk
import subprocess
- from oeqa.oetest import SDKTestContext
+ import json
+ import logging
+
+ from bb.utils import export_proxies
+ from oeqa.core.runner import OEStreamLogger
+ from oeqa.sdk.context import OESDKTestContext, OESDKTestContextExecutor
pn = d.getVar("PN", True)
- bb.utils.mkdirhier(d.getVar("TEST_LOG_DIR", True))
+ logger = logging.getLogger("BitBake")
+
+ # sdk use network for download projects for build
+ export_proxies(d)
+
+ test_log_dir = d.getVar("TEST_LOG_DIR", True)
+
+ bb.utils.mkdirhier(test_log_dir)
tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh")
if not os.path.exists(tcname):
bb.fatal("The toolchain %s is not built. Build it before running the tests: 'bitbake <image> -c populate_sdk' ." % tcname)
- sdktestdir = d.expand("${WORKDIR}/testimage-sdk/")
- bb.utils.remove(sdktestdir, True)
- bb.utils.mkdirhier(sdktestdir)
+ tdname = d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.testdata.json")
+ test_data = json.load(open(tdname, "r"))
+ test_data['TEST_LOG_DIR'] = test_log_dir
+
+ target_pkg_manifest = OESDKTestContextExecutor._load_manifest(
+ d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.target.manifest"))
+ host_pkg_manifest = OESDKTestContextExecutor._load_manifest(
+ d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.host.manifest"))
+
+ sdk_dir = d.expand("${WORKDIR}/testimage-sdk/")
+ bb.utils.remove(sdk_dir, True)
+ bb.utils.mkdirhier(sdk_dir)
try:
- subprocess.check_output("cd %s; %s <<EOF\n./tc\nY\nEOF" % (sdktestdir, tcname), shell=True)
+ subprocess.check_output("cd %s; %s <<EOF\n./\nY\nEOF" % (sdk_dir, tcname), shell=True)
except subprocess.CalledProcessError as e:
bb.fatal("Couldn't install the SDK:\n%s" % e.output.decode("utf-8"))
- try:
- run_test_context(SDKTestContext, d, sdktestdir, tcname, pn)
- finally:
- bb.utils.remove(sdktestdir, True)
+ fail = False
+ sdk_envs = OESDKTestContextExecutor._get_sdk_environs(sdk_dir)
+ for s in sdk_envs:
+ sdk_env = sdk_envs[s]
+ bb.plain("SDK testing environment: %s" % s)
+ tc = OESDKTestContext(td=test_data, logger=logger, sdk_dir=sdk_dir,
+ sdk_env=sdk_env, target_pkg_manifest=target_pkg_manifest,
+ host_pkg_manifest=host_pkg_manifest)
+ try:
+ tc.loadTests(OESDKTestContextExecutor.default_cases)
+ except Exception as e:
+ import traceback
+ bb.fatal("Loading tests failed:\n%s" % traceback.format_exc())
+
+ result = tc.runTests()
+
+ component = "%s %s" % (pn, OESDKTestContextExecutor.name)
+ context_msg = "%s:%s" % (os.path.basename(tcname), os.path.basename(sdk_env))
+
+ tc.logSummary(result, component, context_msg)
+ tc.logDetails()
+
+ if not result.wasSuccessful():
+ fail = True
+
+ if fail:
+ bb.fatal("%s - FAILED - check the task log and the commands log" % pn)
+
testsdk_main[vardepsexclude] =+ "BB_ORIGENV"
python do_testsdk() {
@@ -94,7 +138,6 @@ def testsdkext_main(d):
from oeqa.oetest import SDKTestContext, SDKExtTestContext
from oeqa.utils import avoid_paths_in_environ
-
# extensible sdk use network
export_proxies(d)
--
2.1.4
^ permalink raw reply related
* [PATCH 21/32] oeqa/sdk: Add case and context modules for the SDK component
From: Aníbal Limón @ 2016-12-06 21:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481059445.git.anibal.limon@linux.intel.com>
Adds case and context modules for SDK based on oetest.py old code.
Enables SDK Test component usage with oe-test, the SDK Test component
adds command line options for specify sdk installed dir, sdk environment
and target/hosts maniftest.
[YOCTO #10599]
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
---
meta/lib/oeqa/oetest.py | 51 ----------------
meta/lib/oeqa/sdk/__init__.py | 0
meta/lib/oeqa/sdk/case.py | 12 ++++
meta/lib/oeqa/sdk/context.py | 133 ++++++++++++++++++++++++++++++++++++++++++
4 files changed, 145 insertions(+), 51 deletions(-)
create mode 100644 meta/lib/oeqa/sdk/__init__.py
create mode 100644 meta/lib/oeqa/sdk/case.py
create mode 100644 meta/lib/oeqa/sdk/context.py
diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py
index 95d3bf7..4a98b0f1 100644
--- a/meta/lib/oeqa/oetest.py
+++ b/meta/lib/oeqa/oetest.py
@@ -145,20 +145,6 @@ class OETestCalledProcessError(subprocess.CalledProcessError):
subprocess.CalledProcessError = OETestCalledProcessError
-class oeSDKTest(oeTest):
- def __init__(self, methodName='runTest'):
- self.sdktestdir = oeSDKTest.tc.sdktestdir
- super(oeSDKTest, self).__init__(methodName)
-
- @classmethod
- def hasHostPackage(self, pkg):
- if re.search(pkg, oeTest.tc.hostpkgmanifest):
- return True
- return False
-
- def _run(self, cmd):
- return subprocess.check_output(". %s > /dev/null; %s;" % (self.tc.sdkenv, cmd), shell=True, stderr=subprocess.STDOUT).decode("utf-8")
-
class oeSDKExtTest(oeSDKTest):
def _run(self, cmd):
# extensible sdk shows a warning if found bitbake in the path
@@ -657,43 +643,6 @@ class ExportTestContext(RuntimeTestContext):
pkg_dir = os.path.join(export_dir, extracted_dir)
super(ExportTestContext, self).install_uninstall_packages(test_id, pkg_dir, install)
-class SDKTestContext(TestContext):
- def __init__(self, d, sdktestdir, sdkenv, tcname, *args):
- super(SDKTestContext, self).__init__(d)
-
- self.sdktestdir = sdktestdir
- self.sdkenv = sdkenv
- self.tcname = tcname
-
- if not hasattr(self, 'target_manifest'):
- self.target_manifest = d.getVar("SDK_TARGET_MANIFEST", True)
- try:
- self.pkgmanifest = {}
- with open(self.target_manifest) as f:
- for line in f:
- (pkg, arch, version) = line.strip().split()
- self.pkgmanifest[pkg] = (version, arch)
- except IOError as e:
- bb.fatal("No package manifest file found. Did you build the sdk image?\n%s" % e)
-
- if not hasattr(self, 'host_manifest'):
- self.host_manifest = d.getVar("SDK_HOST_MANIFEST", True)
- try:
- with open(self.host_manifest) as f:
- self.hostpkgmanifest = f.read()
- except IOError as e:
- bb.fatal("No host package manifest file found. Did you build the sdk image?\n%s" % e)
-
- def _get_test_namespace(self):
- return "sdk"
-
- def _get_test_suites(self):
- return (self.d.getVar("TEST_SUITES_SDK", True) or "auto").split()
-
- def _get_test_suites_required(self):
- return [t for t in (self.d.getVar("TEST_SUITES_SDK", True) or \
- "auto").split() if t != "auto"]
-
class SDKExtTestContext(SDKTestContext):
def __init__(self, d, sdktestdir, sdkenv, tcname, *args):
self.target_manifest = d.getVar("SDK_EXT_TARGET_MANIFEST", True)
diff --git a/meta/lib/oeqa/sdk/__init__.py b/meta/lib/oeqa/sdk/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/meta/lib/oeqa/sdk/case.py b/meta/lib/oeqa/sdk/case.py
new file mode 100644
index 0000000..782db8b
--- /dev/null
+++ b/meta/lib/oeqa/sdk/case.py
@@ -0,0 +1,12 @@
+# Copyright (C) 2016 Intel Corporation
+# Released under the MIT license (see COPYING.MIT)
+
+import subprocess
+
+from oeqa.core.case import OETestCase
+
+class OESDKTestCase(OETestCase):
+ def _run(self, cmd):
+ return subprocess.check_output(". %s > /dev/null; %s;" % \
+ (self.tc.sdk_env, cmd), shell=True,
+ stderr=subprocess.STDOUT).decode("utf-8")
diff --git a/meta/lib/oeqa/sdk/context.py b/meta/lib/oeqa/sdk/context.py
new file mode 100644
index 0000000..0189ed8
--- /dev/null
+++ b/meta/lib/oeqa/sdk/context.py
@@ -0,0 +1,133 @@
+# Copyright (C) 2016 Intel Corporation
+# Released under the MIT license (see COPYING.MIT)
+
+import os
+import sys
+import glob
+import re
+
+from oeqa.core.context import OETestContext, OETestContextExecutor
+
+class OESDKTestContext(OETestContext):
+ sdk_files_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "files")
+
+ def __init__(self, td=None, logger=None, sdk_dir=None, sdk_env=None,
+ target_pkg_manifest=None, host_pkg_manifest=None):
+ super(OESDKTestContext, self).__init__(td, logger)
+
+ self.sdk_dir = sdk_dir
+ self.sdk_env = sdk_env
+ self.target_pkg_manifest = target_pkg_manifest
+ self.host_pkg_manifest = host_pkg_manifest
+
+ def _hasPackage(self, manifest, pkg):
+ for host_pkg in manifest.keys():
+ if re.search(pkg, host_pkg):
+ return True
+ return False
+
+ def hasHostPackage(self, pkg):
+ return self._hasPackage(self.host_pkg_manifest, pkg)
+
+ def hasTargetPackage(self, pkg):
+ return self._hasPackage(self.target_pkg_manifest, pkg)
+
+class OESDKTestContextExecutor(OETestContextExecutor):
+ _context_class = OESDKTestContext
+
+ name = 'sdk'
+ help = 'sdk test component'
+ description = 'executes sdk tests'
+
+ default_cases = [os.path.join(os.path.abspath(os.path.dirname(__file__)),
+ 'cases')]
+ default_test_data = None
+
+ def register_commands(self, logger, subparsers):
+ import argparse_oe
+
+ super(OESDKTestContextExecutor, self).register_commands(logger, subparsers)
+
+ sdk_group = self.parser.add_argument_group('sdk options')
+ sdk_group.add_argument('--sdk-env', action='store',
+ help='sdk environment')
+ sdk_group.add_argument('--target-manifest', action='store',
+ help='sdk target manifest')
+ sdk_group.add_argument('--host-manifest', action='store',
+ help='sdk host manifest')
+
+ sdk_dgroup = self.parser.add_argument_group('sdk display options')
+ sdk_dgroup.add_argument('--list-sdk-env', action='store_true',
+ default=False, help='sdk list available environment')
+
+ # XXX this option is required but argparse_oe has a bug handling
+ # required options, seems that don't keep track of already parsed
+ # options
+ sdk_rgroup = self.parser.add_argument_group('sdk required options')
+ sdk_rgroup.add_argument('--sdk-dir', required=False, action='store',
+ help='sdk installed directory')
+
+ @staticmethod
+ def _load_manifest(manifest):
+ pkg_manifest = {}
+ if manifest:
+ with open(manifest) as f:
+ for line in f:
+ (pkg, arch, version) = line.strip().split()
+ pkg_manifest[pkg] = (version, arch)
+
+ return pkg_manifest
+
+ def _process_args(self, logger, args):
+ super(OESDKTestContextExecutor, self)._process_args(logger, args)
+
+ self.tc_kwargs['init']['sdk_dir'] = args.sdk_dir
+ self.tc_kwargs['init']['sdk_env'] = self.sdk_env
+ self.tc_kwargs['init']['target_pkg_manifest'] = \
+ OESDKTestContextExecutor._load_manifest(args.target_manifest)
+ self.tc_kwargs['init']['host_pkg_manifest'] = \
+ OESDKTestContextExecutor._load_manifest(args.host_manifest)
+
+ @staticmethod
+ def _get_sdk_environs(sdk_dir):
+ sdk_env = {}
+
+ environ_pattern = sdk_dir + '/environment-setup-*'
+ full_sdk_env = glob.glob(sdk_dir + '/environment-setup-*')
+ for env in full_sdk_env:
+ m = re.search('environment-setup-(.*)', env)
+ if m:
+ sdk_env[m.group(1)] = env
+
+ return sdk_env
+
+ def _display_sdk_envs(self, log, args, sdk_envs):
+ log("Available SDK environments at directory %s:" \
+ % args.sdk_dir)
+ log("")
+ for env in sdk_envs:
+ log(env)
+
+ def run(self, logger, args):
+ if not args.sdk_dir:
+ raise argparse_oe.ArgumentUsageError("No SDK directory "\
+ "specified please do, --sdk-dir SDK_DIR", self.name)
+
+ sdk_envs = OESDKTestContextExecutor._get_sdk_environs(args.sdk_dir)
+ if not sdk_envs:
+ raise argparse_oe.ArgumentUsageError("No available SDK "\
+ "enviroments found at %s" % args.sdk_dir, self.name)
+
+ if args.list_sdk_env:
+ self._display_sdk_envs(logger.info, args, sdk_envs)
+ sys.exit(0)
+
+ if not args.sdk_env in sdk_envs:
+ self._display_sdk_envs(logger.error, args, sdk_envs)
+ raise argparse_oe.ArgumentUsageError("No valid SDK "\
+ "environment (%s) specified" % args.sdk_env, self.name)
+
+ self.sdk_env = sdk_envs[args.sdk_env]
+ super(OESDKTestContextExecutor, self).run(logger, args)
+
+_executor_class = OESDKTestContextExecutor
--
2.1.4
^ permalink raw reply related
* [PATCH 20/32] oeqa/{runtime, sdk}/files: Move testsdkmakefile from runtime to sdk module
From: Aníbal Limón @ 2016-12-06 21:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481059445.git.anibal.limon@linux.intel.com>
It doesn't make sense to have files related to sdk module into runtime
module.
[YOCTO #10599]
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
---
meta/lib/oeqa/{runtime => sdk}/files/testsdkmakefile | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta/lib/oeqa/{runtime => sdk}/files/testsdkmakefile (100%)
diff --git a/meta/lib/oeqa/runtime/files/testsdkmakefile b/meta/lib/oeqa/sdk/files/testsdkmakefile
similarity index 100%
rename from meta/lib/oeqa/runtime/files/testsdkmakefile
rename to meta/lib/oeqa/sdk/files/testsdkmakefile
--
2.1.4
^ permalink raw reply
* [PATCH 19/32] oeqa/sdk: Move test cases inside cases directory
From: Aníbal Limón @ 2016-12-06 21:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481059445.git.anibal.limon@linux.intel.com>
For match with the new structure of the OEQA framework.
In the new framework Test component base directory in this case
sdk module will contain case and context implementations.
[YOCTO #10599]
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
---
meta/lib/oeqa/sdk/{ => cases}/__init__.py | 0
meta/lib/oeqa/sdk/{ => cases}/buildcvs.py | 0
meta/lib/oeqa/sdk/{ => cases}/buildgalculator.py | 0
meta/lib/oeqa/sdk/{ => cases}/buildiptables.py | 0
meta/lib/oeqa/sdk/{ => cases}/gcc.py | 0
meta/lib/oeqa/sdk/{ => cases}/perl.py | 0
meta/lib/oeqa/sdk/{ => cases}/python.py | 0
7 files changed, 0 insertions(+), 0 deletions(-)
rename meta/lib/oeqa/sdk/{ => cases}/__init__.py (100%)
rename meta/lib/oeqa/sdk/{ => cases}/buildcvs.py (100%)
rename meta/lib/oeqa/sdk/{ => cases}/buildgalculator.py (100%)
rename meta/lib/oeqa/sdk/{ => cases}/buildiptables.py (100%)
rename meta/lib/oeqa/sdk/{ => cases}/gcc.py (100%)
rename meta/lib/oeqa/sdk/{ => cases}/perl.py (100%)
rename meta/lib/oeqa/sdk/{ => cases}/python.py (100%)
diff --git a/meta/lib/oeqa/sdk/__init__.py b/meta/lib/oeqa/sdk/cases/__init__.py
similarity index 100%
rename from meta/lib/oeqa/sdk/__init__.py
rename to meta/lib/oeqa/sdk/cases/__init__.py
diff --git a/meta/lib/oeqa/sdk/buildcvs.py b/meta/lib/oeqa/sdk/cases/buildcvs.py
similarity index 100%
rename from meta/lib/oeqa/sdk/buildcvs.py
rename to meta/lib/oeqa/sdk/cases/buildcvs.py
diff --git a/meta/lib/oeqa/sdk/buildgalculator.py b/meta/lib/oeqa/sdk/cases/buildgalculator.py
similarity index 100%
rename from meta/lib/oeqa/sdk/buildgalculator.py
rename to meta/lib/oeqa/sdk/cases/buildgalculator.py
diff --git a/meta/lib/oeqa/sdk/buildiptables.py b/meta/lib/oeqa/sdk/cases/buildiptables.py
similarity index 100%
rename from meta/lib/oeqa/sdk/buildiptables.py
rename to meta/lib/oeqa/sdk/cases/buildiptables.py
diff --git a/meta/lib/oeqa/sdk/gcc.py b/meta/lib/oeqa/sdk/cases/gcc.py
similarity index 100%
rename from meta/lib/oeqa/sdk/gcc.py
rename to meta/lib/oeqa/sdk/cases/gcc.py
diff --git a/meta/lib/oeqa/sdk/perl.py b/meta/lib/oeqa/sdk/cases/perl.py
similarity index 100%
rename from meta/lib/oeqa/sdk/perl.py
rename to meta/lib/oeqa/sdk/cases/perl.py
diff --git a/meta/lib/oeqa/sdk/python.py b/meta/lib/oeqa/sdk/cases/python.py
similarity index 100%
rename from meta/lib/oeqa/sdk/python.py
rename to meta/lib/oeqa/sdk/cases/python.py
--
2.1.4
^ permalink raw reply
* [PATCH 18/32] oeqa: Move common files to oeqa/files instead of runtime only
From: Aníbal Limón @ 2016-12-06 21:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481059445.git.anibal.limon@linux.intel.com>
Those files are used by runtime and sdk test cases, so move to
base directory of oeqa module.
[YOCTO #10599]
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
---
meta/lib/oeqa/{runtime => }/files/test.c | 0
meta/lib/oeqa/{runtime => }/files/test.cpp | 0
meta/lib/oeqa/{runtime => }/files/test.pl | 0
meta/lib/oeqa/{runtime => }/files/test.py | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename meta/lib/oeqa/{runtime => }/files/test.c (100%)
rename meta/lib/oeqa/{runtime => }/files/test.cpp (100%)
rename meta/lib/oeqa/{runtime => }/files/test.pl (100%)
rename meta/lib/oeqa/{runtime => }/files/test.py (100%)
diff --git a/meta/lib/oeqa/runtime/files/test.c b/meta/lib/oeqa/files/test.c
similarity index 100%
rename from meta/lib/oeqa/runtime/files/test.c
rename to meta/lib/oeqa/files/test.c
diff --git a/meta/lib/oeqa/runtime/files/test.cpp b/meta/lib/oeqa/files/test.cpp
similarity index 100%
rename from meta/lib/oeqa/runtime/files/test.cpp
rename to meta/lib/oeqa/files/test.cpp
diff --git a/meta/lib/oeqa/runtime/files/test.pl b/meta/lib/oeqa/files/test.pl
similarity index 100%
rename from meta/lib/oeqa/runtime/files/test.pl
rename to meta/lib/oeqa/files/test.pl
diff --git a/meta/lib/oeqa/runtime/files/test.py b/meta/lib/oeqa/files/test.py
similarity index 100%
rename from meta/lib/oeqa/runtime/files/test.py
rename to meta/lib/oeqa/files/test.py
--
2.1.4
^ permalink raw reply
* [PATCH 16/32] oeqa/core: Change name of d to td
From: Aníbal Limón @ 2016-12-06 21:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1481059445.git.anibal.limon@linux.intel.com>
The d variable references the test data into a test context, so
makes a more sense to call it: td (test data).
[YOCTO #10231]
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
meta/lib/oeqa/core/case.py | 22 ++++++++++----------
meta/lib/oeqa/core/cases/example/test_basic.py | 8 ++++----
meta/lib/oeqa/core/context.py | 28 +++++++++++++-------------
meta/lib/oeqa/core/decorator/data.py | 10 ++++-----
meta/lib/oeqa/core/loader.py | 2 +-
meta/lib/oeqa/core/tests/cases/data.py | 6 +++---
6 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/meta/lib/oeqa/core/case.py b/meta/lib/oeqa/core/case.py
index a47cb19..d2dbf20 100644
--- a/meta/lib/oeqa/core/case.py
+++ b/meta/lib/oeqa/core/case.py
@@ -5,30 +5,30 @@ import unittest
from oeqa.core.exception import OEQAMissingVariable
-def _validate_data_vars(d, data_vars, type_msg):
- if data_vars:
- for v in data_vars:
- if not v in d:
+def _validate_td_vars(td, td_vars, type_msg):
+ if td_vars:
+ for v in td_vars:
+ if not v in td:
raise OEQAMissingVariable("Test %s need %s variable but"\
- " isn't into d" % (type_msg, v))
+ " isn't into td" % (type_msg, v))
class OETestCase(unittest.TestCase):
# TestContext and Logger instance set by OETestLoader.
tc = None
logger = None
- # d has all the variables needed by the test cases
+ # td has all the variables needed by the test cases
# is the same across all the test cases.
- d = None
+ td = None
- # data_vars has the variables needed by a test class
- # or test case instance, if some var isn't into d a
+ # td_vars has the variables needed by a test class
+ # or test case instance, if some var isn't into td a
# OEMissingVariable exception is raised
- data_vars = None
+ td_vars = None
@classmethod
def _oeSetUpClass(clss):
- _validate_data_vars(clss.d, clss.data_vars, "class")
+ _validate_td_vars(clss.td, clss.td_vars, "class")
clss.setUpClassMethod()
@classmethod
diff --git a/meta/lib/oeqa/core/cases/example/test_basic.py b/meta/lib/oeqa/core/cases/example/test_basic.py
index 8b404fe..11cf380 100644
--- a/meta/lib/oeqa/core/cases/example/test_basic.py
+++ b/meta/lib/oeqa/core/cases/example/test_basic.py
@@ -6,10 +6,10 @@ from oeqa.core.decorator.depends import OETestDepends
class OETestExample(OETestCase):
def test_example(self):
- self.logger.info('IMAGE: %s' % self.d.get('IMAGE'))
- self.assertEqual('core-image-minimal', self.d.get('IMAGE'))
- self.logger.info('ARCH: %s' % self.d.get('ARCH'))
- self.assertEqual('x86', self.d.get('ARCH'))
+ self.logger.info('IMAGE: %s' % self.td.get('IMAGE'))
+ self.assertEqual('core-image-minimal', self.td.get('IMAGE'))
+ self.logger.info('ARCH: %s' % self.td.get('ARCH'))
+ self.assertEqual('x86', self.td.get('ARCH'))
class OETestExampleDepend(OETestCase):
@OETestDepends(['OETestExample.test_example'])
diff --git a/meta/lib/oeqa/core/context.py b/meta/lib/oeqa/core/context.py
index c7d6db3..316f90f 100644
--- a/meta/lib/oeqa/core/context.py
+++ b/meta/lib/oeqa/core/context.py
@@ -20,11 +20,11 @@ class OETestContext(object):
files_dir = os.path.abspath(os.path.join(os.path.dirname(
os.path.abspath(__file__)), "../files"))
- def __init__(self, d=None, logger=None):
- if not type(d) is dict:
- raise TypeError("d isn't dictionary type")
+ def __init__(self, td=None, logger=None):
+ if not type(td) is dict:
+ raise TypeError("td isn't dictionary type")
- self.d = d
+ self.td = td
self.logger = logger
self._registry = {}
self._registry['cases'] = collections.OrderedDict()
@@ -148,7 +148,7 @@ class OETestContextExecutor(object):
default_cases = [os.path.join(os.path.abspath(os.path.dirname(__file__)),
'cases/example')]
- default_data = os.path.join(default_cases[0], 'data.json')
+ default_test_data = os.path.join(default_cases[0], 'data.json')
def register_commands(self, logger, subparsers):
self.parser = subparsers.add_parser(self.name, help=self.help,
@@ -160,12 +160,12 @@ class OETestContextExecutor(object):
default=self.default_output_log,
help="results output log, default: %s" % self.default_output_log)
- if self.default_data:
- self.parser.add_argument('--data-file', action='store',
- default=self.default_data,
- help="data file to load, default: %s" % self.default_data)
+ if self.default_test_data:
+ self.parser.add_argument('--test-data-file', action='store',
+ default=self.default_test_data,
+ help="data file to load, default: %s" % self.default_test_data)
else:
- self.parser.add_argument('--data-file', action='store',
+ self.parser.add_argument('--test-data-file', action='store',
help="data file to load")
if self.default_cases:
@@ -197,11 +197,11 @@ class OETestContextExecutor(object):
self.tc_kwargs['run'] = {}
self.tc_kwargs['init']['logger'] = self._setup_logger(logger, args)
- if args.data_file:
- self.tc_kwargs['init']['d'] = json.load(
- open(args.data_file, "r"))
+ if args.test_data_file:
+ self.tc_kwargs['init']['td'] = json.load(
+ open(args.test_data_file, "r"))
else:
- self.tc_kwargs['init']['d'] = {}
+ self.tc_kwargs['init']['td'] = {}
self.module_paths = args.CASES_PATHS
diff --git a/meta/lib/oeqa/core/decorator/data.py b/meta/lib/oeqa/core/decorator/data.py
index 51ef6fe..73cca88 100644
--- a/meta/lib/oeqa/core/decorator/data.py
+++ b/meta/lib/oeqa/core/decorator/data.py
@@ -20,17 +20,17 @@ class skipIfDataVar(OETestDecorator):
def setUpDecorator(self):
msg = 'Checking if %r value is %r to skip test' % (self.var, self.value)
self.logger.debug(msg)
- if self.case.tc.d.get(self.var) == self.value:
+ if self.case.td.get(self.var) == self.value:
self.case.skipTest(self.msg)
@registerDecorator
class OETestDataDepends(OETestDecorator):
- attrs = ('data_depends',)
+ attrs = ('td_depends',)
def setUpDecorator(self):
- for v in self.data_depends:
+ for v in self.td_depends:
try:
- value = self.case.d[v]
+ value = self.case.td[v]
except KeyError:
raise OEQAMissingVariable("Test case need %s variable but"\
- " isn't into d" % v)
+ " isn't into td" % v)
diff --git a/meta/lib/oeqa/core/loader.py b/meta/lib/oeqa/core/loader.py
index 94f71ba..c73ef9a 100644
--- a/meta/lib/oeqa/core/loader.py
+++ b/meta/lib/oeqa/core/loader.py
@@ -66,7 +66,7 @@ class OETestLoader(unittest.TestLoader):
def _patchCaseClass(self, testCaseClass):
# Adds custom attributes to the OETestCase class
setattr(testCaseClass, 'tc', self.tc)
- setattr(testCaseClass, 'd', self.tc.d)
+ setattr(testCaseClass, 'td', self.tc.td)
setattr(testCaseClass, 'logger', self.tc.logger)
def _validateFilters(self, filters, decorator_filters):
diff --git a/meta/lib/oeqa/core/tests/cases/data.py b/meta/lib/oeqa/core/tests/cases/data.py
index 4d8fad0..88003a6 100644
--- a/meta/lib/oeqa/core/tests/cases/data.py
+++ b/meta/lib/oeqa/core/tests/cases/data.py
@@ -11,9 +11,9 @@ class DataTest(OETestCase):
@OETestDataDepends(['MACHINE',])
@OETestTag('dataTestOk')
def testDataOk(self):
- self.assertEqual(self.d.get('IMAGE'), 'core-image-minimal')
- self.assertEqual(self.d.get('ARCH'), 'x86')
- self.assertEqual(self.d.get('MACHINE'), 'qemuarm')
+ self.assertEqual(self.td.get('IMAGE'), 'core-image-minimal')
+ self.assertEqual(self.td.get('ARCH'), 'x86')
+ self.assertEqual(self.td.get('MACHINE'), 'qemuarm')
@OETestTag('dataTestFail')
def testDataFail(self):
--
2.1.4
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox