From: Lucian Musat Date: Thu, 24 Sep 2015 09:14:44 +0000 (+0300) Subject: oeqa/testimage: Remove absolute path to oeqa from json X-Git-Tag: 2015-10~242 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=94057ccc70aa3fe29d774f571a65f56fd1285d4c;p=openembedded-core.git oeqa/testimage: Remove absolute path to oeqa from json In the json file the whole datastore is serialized which contains absolute path to the oeqa folder. This breaks the functionality when trying to run the tests from other machines. Signed-off-by: Lucian Musat Signed-off-by: Ross Burton --- diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index c62e391ec2..2efab29d2b 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -198,9 +198,18 @@ def exportTests(d,tc): savedata["host_dumper"]["parent_dir"] = tc.host_dumper.parent_dir savedata["host_dumper"]["cmds"] = tc.host_dumper.cmds - with open(os.path.join(exportpath, "testdata.json"), "w") as f: + json_file = os.path.join(exportpath, "testdata.json") + with open(json_file, "w") as f: json.dump(savedata, f, skipkeys=True, indent=4, sort_keys=True) + # Replace absolute path with relative in the file + exclude_path = os.path.join(d.getVar("COREBASE", True),'meta','lib','oeqa') + f1 = open(json_file,'r').read() + f2 = open(json_file,'w') + m = f1.replace(exclude_path,'oeqa') + f2.write(m) + f2.close() + # now start copying files # we'll basically copy everything under meta/lib/oeqa, with these exceptions # - oeqa/targetcontrol.py - not needed