diff options
| author | Aníbal Limón <anibal.limon@linux.intel.com> | 2016-12-05 17:04:42 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-23 12:03:55 +0000 |
| commit | f099302efe8f222c3e4ae3604429f5ede4fd8c67 (patch) | |
| tree | 9386bb02b74d3e50a7598147c172c65a2cf888bf /meta | |
| parent | e275f29de500a338a02402ecc570405309963b35 (diff) | |
| download | openembedded-core-f099302efe8f222c3e4ae3604429f5ede4fd8c67.tar.gz openembedded-core-f099302efe8f222c3e4ae3604429f5ede4fd8c67.tar.bz2 openembedded-core-f099302efe8f222c3e4ae3604429f5ede4fd8c67.zip | |
oeqa: Fix files handling on runtime tests.
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>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/testexport.bbclass | 5 | ||||
| -rw-r--r-- | meta/lib/oeqa/oetest.py | 1 | ||||
| -rw-r--r-- | meta/lib/oeqa/runtime/gcc.py | 4 | ||||
| -rw-r--r-- | meta/lib/oeqa/runtime/perl.py | 2 | ||||
| -rw-r--r-- | 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 e287f5a913..00cf24e735 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 503f6fc10f..b886130d0e 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").split() self.distrofeatures = d.getVar("DISTRO_FEATURES").split() diff --git a/meta/lib/oeqa/runtime/gcc.py b/meta/lib/oeqa/runtime/gcc.py index d90cd1799a..6edb89f6f2 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 e044d0a5fe..6bf98f1ccb 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 29a231c7c3..93e822c71c 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): |