summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorLucian Musat <george.l.musat@intel.com>2015-06-26 13:36:40 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-27 22:42:00 +0100
commit0f5c2fb975010cf6e8154384b764a2c9da1b371e (patch)
tree8a80cd7a2ae6b5616a1c6148eed21654dcf21e5f /meta
parent72430a8db44eaab2704c0d828171d3c98a48fe2a (diff)
downloadopenembedded-core-0f5c2fb975010cf6e8154384b764a2c9da1b371e.tar.gz
openembedded-core-0f5c2fb975010cf6e8154384b764a2c9da1b371e.tar.bz2
openembedded-core-0f5c2fb975010cf6e8154384b764a2c9da1b371e.zip
oeqa/parselogs: Fixed a problem in parselogs
When the test passed it returned an error because grep did not return any error and the variable that held the results was being referenced but not assigned any value. Signed-off-by: Lucian Musat <george.l.musat@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/runtime/parselogs.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/lib/oeqa/runtime/parselogs.py b/meta/lib/oeqa/runtime/parselogs.py
index a9ab9a3462..7095a365b4 100644
--- a/meta/lib/oeqa/runtime/parselogs.py
+++ b/meta/lib/oeqa/runtime/parselogs.py
@@ -198,6 +198,7 @@ class ParseLogsTest(oeRuntimeTest):
def parse_logs(self, errors, ignore_errors, logs, lines_before = 10, lines_after = 10):
results = {}
rez = []
+ grep_output = ''
for log in logs:
result = None
thegrep = self.build_grepcmd(errors, ignore_errors, log)
@@ -211,10 +212,10 @@ class ParseLogsTest(oeRuntimeTest):
for xrez in rez:
command = "grep \"\\"+str(xrez)+"\" -B "+str(lines_before)+" -A "+str(lines_after)+" "+str(log)
try:
- yrez = subprocess.check_output(command, shell=True)
+ grep_output = subprocess.check_output(command, shell=True)
except:
pass
- results[log.replace('target_logs/','')][xrez]=yrez
+ results[log.replace('target_logs/','')][xrez]=grep_output
return results
#get the output of dmesg and write it in a file. This file is added to log_locations.