diff options
author | Konrad Weihmann <kweihmann@outlook.com> | 2020-09-21 16:29:44 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-21 23:54:39 +0100 |
commit | cf9fd0e770d2edb7bcc11623f5adfac5856df9b8 (patch) | |
tree | 41cc46724406e52a25c7b2af72f23741cc7938d7 /meta/classes | |
parent | d48416574749bdcbf83510bfaa8899209f09bf7e (diff) | |
download | poky-cf9fd0e770d2edb7bcc11623f5adfac5856df9b8.tar.gz |
testexport: rename create_tarball method
as otherwise when using it in combination with archiver.bbclass we would
have 2 methods of the same name but with different signatures
leading to various hard to understand exceptions
(From OE-Core rev: ce0c1cb2fc67881d2edcbe269ea934917ccfb48a)
Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/testexport.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/testexport.bbclass b/meta/classes/testexport.bbclass index 59cbaefbf9..1b0fb44a4a 100644 --- a/meta/classes/testexport.bbclass +++ b/meta/classes/testexport.bbclass | |||
@@ -137,7 +137,7 @@ def copy_needed_files(d, tc): | |||
137 | shutil.rmtree(os.path.join(subdir, dir)) | 137 | shutil.rmtree(os.path.join(subdir, dir)) |
138 | 138 | ||
139 | # Create tar file for common parts of testexport | 139 | # Create tar file for common parts of testexport |
140 | create_tarball(d, "testexport.tar.gz", d.getVar("TEST_EXPORT_DIR")) | 140 | testexport_create_tarball(d, "testexport.tar.gz", d.getVar("TEST_EXPORT_DIR")) |
141 | 141 | ||
142 | # Copy packages needed for runtime testing | 142 | # Copy packages needed for runtime testing |
143 | package_extraction(d, tc.suites) | 143 | package_extraction(d, tc.suites) |
@@ -146,7 +146,7 @@ def copy_needed_files(d, tc): | |||
146 | export_pkg_dir = os.path.join(d.getVar("TEST_EXPORT_DIR"), "packages") | 146 | export_pkg_dir = os.path.join(d.getVar("TEST_EXPORT_DIR"), "packages") |
147 | oe.path.copytree(test_pkg_dir, export_pkg_dir) | 147 | oe.path.copytree(test_pkg_dir, export_pkg_dir) |
148 | # Create tar file for packages needed by the DUT | 148 | # Create tar file for packages needed by the DUT |
149 | create_tarball(d, "testexport_packages_%s.tar.gz" % d.getVar("MACHINE"), export_pkg_dir) | 149 | testexport_create_tarball(d, "testexport_packages_%s.tar.gz" % d.getVar("MACHINE"), export_pkg_dir) |
150 | 150 | ||
151 | # Copy SDK | 151 | # Copy SDK |
152 | if d.getVar("TEST_EXPORT_SDK_ENABLED") == "1": | 152 | if d.getVar("TEST_EXPORT_SDK_ENABLED") == "1": |
@@ -159,11 +159,11 @@ def copy_needed_files(d, tc): | |||
159 | shutil.copy2(tarball_path, export_sdk_dir) | 159 | shutil.copy2(tarball_path, export_sdk_dir) |
160 | 160 | ||
161 | # Create tar file for the sdk | 161 | # Create tar file for the sdk |
162 | create_tarball(d, "testexport_sdk_%s.tar.gz" % d.getVar("SDK_ARCH"), export_sdk_dir) | 162 | testexport_create_tarball(d, "testexport_sdk_%s.tar.gz" % d.getVar("SDK_ARCH"), export_sdk_dir) |
163 | 163 | ||
164 | bb.plain("Exported tests to: %s" % export_path) | 164 | bb.plain("Exported tests to: %s" % export_path) |
165 | 165 | ||
166 | def create_tarball(d, tar_name, src_dir): | 166 | def testexport_create_tarball(d, tar_name, src_dir): |
167 | 167 | ||
168 | import tarfile | 168 | import tarfile |
169 | 169 | ||