]> code.ossystems Code Review - openembedded-core.git/commitdiff
oeqa/runtime/cases/ptest: Make output content path absolute
authorAndrej Valek <andrej.valek@siemens.com>
Mon, 22 Jun 2020 17:33:07 +0000 (19:33 +0200)
committerSteve Sakoman <steve@sakoman.com>
Fri, 26 Jun 2020 21:53:05 +0000 (11:53 -1000)
The output content is created in current directory, because json content
has no defined absolute path to WORKDIR as in bitbake.

Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 14203b2cb9aa62f55cb12230ac8012b3cd995be7)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/lib/oeqa/runtime/cases/ptest.py

index 99a44f07670bb48dfbe229dca5068d15e2b837c7..ef0470da7ef8975b5beae4e283d46d7955cebce2 100644 (file)
@@ -42,6 +42,10 @@ class PtestRunnerTest(OERuntimeTestCase):
         # testdata.json is generated.
         if not test_log_dir:
             test_log_dir = os.path.join(self.td.get('WORKDIR', ''), 'testimage')
+        # Make the test output path absolute, otherwise the output content will be
+        # created relative to current directory
+        if not os.path.isabs(test_log_dir):
+            test_log_dir = os.path.join(self.td.get('TOPDIR', ''), test_log_dir)
         # Don't use self.td.get('DATETIME'), it's from testdata.json, not
         # up-to-date, and may cause "File exists" when re-reun.
         timestamp = datetime.datetime.now().strftime('%Y%m%d%H%M%S')