summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2013-11-15 13:34:46 +0200
committerAlexandru DAMIAN <alexandru.damian@intel.com>2013-11-15 12:17:50 +0000
commit6302d1baf516d5cff5d2b65cc734ca5098a26894 (patch)
treed9c3b30e4e4b251da882423c3277c1550df9e0e6
parent3390674247b426f107be8cb94d45fc7e8cb969ec (diff)
downloadpoky-6302d1baf516d5cff5d2b65cc734ca5098a26894.tar.gz
poky-6302d1baf516d5cff5d2b65cc734ca5098a26894.tar.bz2
poky-6302d1baf516d5cff5d2b65cc734ca5098a26894.zip
bitbake: toaster: task with outcome 2 (sstate), should have sstate_result!=0
0 (not applicable) is not a valid sstate_result for tasks with outcome 2 (sstate), which should return 3 (restored), 2 (failed) or 1 (missed). Sstate_result for tasks with outcome 2 is equal to the outcome of _setscene corespondent task. [YOCTO #5220] (Bitbake rev: 8ff8d75318ea88ba80c744b471e486901ef6749a) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/ui/buildinfohelper.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py
index 7eac734183..c4131aebf0 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -93,6 +93,12 @@ class ORMWrapper(object):
# if we got covered by a setscene task, we're SSTATE
if task_object.outcome == Task.OUTCOME_COVERED and 1 == Task.objects.filter(task_executed=True, build = task_object.build, recipe = task_object.recipe, task_name=task_object.task_name+"_setscene").count():
task_object.outcome = Task.OUTCOME_SSTATE
+ outcome_task_setscene = Task.objects.get(task_executed=True, build = task_object.build,
+ recipe = task_object.recipe, task_name=task_object.task_name+"_setscene").outcome
+ if outcome_task_setscene == Task.OUTCOME_SUCCESS:
+ task_object.sstate_result = Task.SSTATE_RESTORED
+ elif outcome_task_setscene == Task.OUTCOME_FAILED:
+ task_object.sstate_result = Task.SSTATE_FAILED
# mark down duration if we have a start time
if 'start_time' in task_information.keys():