Signed-off-by: Costin Constantin <costin.c.constan...@intel.com> --- meta/lib/oeqa/selftest/buildoptions.py | 36 ++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-)
diff --git a/meta/lib/oeqa/selftest/buildoptions.py b/meta/lib/oeqa/selftest/buildoptions.py index 8cacd1e..257122a 100644 --- a/meta/lib/oeqa/selftest/buildoptions.py +++ b/meta/lib/oeqa/selftest/buildoptions.py @@ -124,18 +124,30 @@ class BuildhistoryTests(BuildhistoryBase): self.run_buildhistory_operation(target, target_config="PR = \"r0\"", change_bh_location=False, expect_error=True, error_regex=error) class ArchiverTest(oeSelfTest): - @testcase(926) - def test_arch_work_dir_and_export_source(self): + @testcase(929) + def test_gpl_licenses(self): """ - Test for archiving the work directory and exporting the source files. + Test for checking that correct GPL licenses are used when explicitly required. """ self.add_command_to_tearDown('cleanup-workdir') - self.write_config("INHERIT += \"archiver\"\nARCHIVER_MODE[src] = \"original\"\nARCHIVER_MODE[srpm] = \"1\"") - self.res = bitbake("xcursor-transparent-theme").status - self.remove_config("INHERIT += \"archiver\"\nARCHIVER_MODE[src] = \"original\"\nARCHIVER_MODE[srpm] = \"1\"") - self.assertEqual(self.res, 0, "\nCouldn't build xcursor-transparent-theme.\n") - self.pkgs_path = g.glob(str(self.builddir) + "/tmp/deploy/sources/allarch*/xcurs*") - self.src_file_glob = str(self.pkgs_path[0]) + "/xcursor*.src.rpm" - self.tar_file_glob = str(self.pkgs_path[0]) + "/xcursor*.tar.gz" - if (g.glob(self.src_file_glob) and g.glob(self.tar_file_glob)): - self.assertTrue(True, "Couldn't find .src.rpm and .tar.gz files under tmp/deploy/sources/allarch*/xcursor*") \ No newline at end of file + self.write_config("MACHINE = \"qemux86\"\nINHERIT += \"archiver\"\nARCHIVER_MODE[src] = \"original\"\nCOPYLEFT_LICENSE_INCLUDE = \"GPLv2* GPLv3*\"") + self.res = bitbake("core-image-minimal").status + self.remove_config("MACHINE = \"qemux86\"\nINHERIT += \"archiver\"\nARCHIVER_MODE[src] = \"original\"\nCOPYLEFT_LICENSE_INCLUDE = \"GPLv2* GPLv3*\"") + self.assertEqual(self.res, 0, "core-image-minimal didn't build. Please check logs for further details") + self.built_pkgs_list = os.listdir(self.builddir + "/tmp/deploy/sources/i586-poky-linux/")# the list containing built pkgs with ver. + self.pkg_name_split = [i.split("-") for i in self.built_pkgs_list] + self.pkgs = [] # this will contain the pkgs name as found in tmp/deploy/licenses + for i in self.pkg_name_split: + self.name = "" + for j in i: + if i.index(j) == 0: + self.name = j + elif j.isalpha() and i.index(j) != 0: + self.name = self.name + "-" + j + else: + self.pkgs.append(self.name) + break + self.license_dir = self.builddir + "/tmp/deploy/licenses/" + for i in self.pkgs: + if os.path.isdir(self.license_dir + i): + self.assertTrue(g.glob(self.license_dir + i + "/*GPL*"), "couldn't find GPL license in " + self.license_dir + i) \ No newline at end of file -- 2.1.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core