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:05:19 +0000 |
commit | ba1aec3407e38f4dc4141e4d6300b3d538dc9dd3 (patch) | |
tree | 43114a5dafed2bc67ca451ff31432f5b98065780 /meta/lib | |
parent | e5f05409d073f089f4e1a78197e5c6cae6e04809 (diff) | |
download | poky-ba1aec3407e38f4dc4141e4d6300b3d538dc9dd3.tar.gz |
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.
(From OE-Core rev: f099302efe8f222c3e4ae3604429f5ede4fd8c67)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-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 |
4 files changed, 5 insertions, 4 deletions
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): | |||
201 | self.testsrequired = self._get_test_suites_required() | 201 | self.testsrequired = self._get_test_suites_required() |
202 | 202 | ||
203 | self.filesdir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "runtime/files") | 203 | self.filesdir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "runtime/files") |
204 | self.corefilesdir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "files") | ||
204 | self.imagefeatures = d.getVar("IMAGE_FEATURES").split() | 205 | self.imagefeatures = d.getVar("IMAGE_FEATURES").split() |
205 | self.distrofeatures = d.getVar("DISTRO_FEATURES").split() | 206 | self.distrofeatures = d.getVar("DISTRO_FEATURES").split() |
206 | 207 | ||
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): | |||
12 | 12 | ||
13 | @classmethod | 13 | @classmethod |
14 | def setUpClass(self): | 14 | def setUpClass(self): |
15 | oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.filesdir, "test.c"), "/tmp/test.c") | 15 | oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.corefilesdir, "test.c"), "/tmp/test.c") |
16 | oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.filesdir, "testmakefile"), "/tmp/testmakefile") | 16 | oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.filesdir, "testmakefile"), "/tmp/testmakefile") |
17 | oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.filesdir, "test.cpp"), "/tmp/test.cpp") | 17 | oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.corefilesdir, "test.cpp"), "/tmp/test.cpp") |
18 | 18 | ||
19 | @testcase(203) | 19 | @testcase(203) |
20 | def test_gcc_compile(self): | 20 | 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): | |||
12 | 12 | ||
13 | @classmethod | 13 | @classmethod |
14 | def setUpClass(self): | 14 | def setUpClass(self): |
15 | oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.filesdir, "test.pl"), "/tmp/test.pl") | 15 | oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.corefilesdir, "test.pl"), "/tmp/test.pl") |
16 | 16 | ||
17 | @testcase(1141) | 17 | @testcase(1141) |
18 | def test_perl_exists(self): | 18 | 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): | |||
12 | 12 | ||
13 | @classmethod | 13 | @classmethod |
14 | def setUpClass(self): | 14 | def setUpClass(self): |
15 | oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.filesdir, "test.py"), "/tmp/test.py") | 15 | oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.corefilesdir, "test.py"), "/tmp/test.py") |
16 | 16 | ||
17 | @testcase(1145) | 17 | @testcase(1145) |
18 | def test_python_exists(self): | 18 | def test_python_exists(self): |