From: Yeoh Ee Peng Date: Wed, 7 Nov 2018 07:08:31 +0000 (+0800) Subject: oeqa/selftest: Standardize json logging output directory X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1c3b40146df078a3c10d31b5a01334798951c7d;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git oeqa/selftest: Standardize json logging output directory Currently sdk & sdkext will output json file to LOG_DIR, while selftest will output json file to TOPDIR/log. Standardize selftest json output file to LOG_DIR. (From OE-Core rev: 2012d6b076fc833864a0254d56d78536314a6799) Signed-off-by: Yeoh Ee Peng Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 11d5877c5f6..302ff73bede 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -205,7 +205,7 @@ class OESelftestTestContextExecutor(OETestContextExecutor): runCmd("bitbake -e") def get_json_result_dir(self, args): - json_result_dir = os.path.join(os.path.dirname(os.path.abspath(args.output_log)), 'log', 'oeqa') + json_result_dir = os.path.join(self.tc.td["LOG_DIR"], 'oeqa') if "OEQA_JSON_RESULT_DIR" in self.tc.td: json_result_dir = self.tc.td["OEQA_JSON_RESULT_DIR"]