summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorDavid Reyna <David.Reyna@windriver.com>2014-03-06 22:15:58 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-11 12:24:32 -0700
commit324791a729d29b929dd2c78489f2564d5e01ad92 (patch)
tree6a3bdbee7a14eac260532d1ef9a0b7ea09e8a5bf /bitbake/lib
parent65c298dedf75ae3fb1ff90ba5e4e8e53b8e2f390 (diff)
downloadpoky-324791a729d29b929dd2c78489f2564d5e01ad92.tar.gz
bitbake: toaster: add empty outcome support to task page
Add the new "empty" outcome value to the task detail page, with help text, help notice, plus sorting for empty in the tasks page. [YOCTO #5917] (Bitbake rev: 874b627b96809c274023b5fa330dfbdd14676d19) Signed-off-by: David Reyna <David.Reyna@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/toaster/orm/models.py1
-rw-r--r--bitbake/lib/toaster/toastergui/templates/task.html4
-rw-r--r--bitbake/lib/toaster/toastergui/views.py2
3 files changed, 6 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 0646813552..93506d7c1b 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -146,6 +146,7 @@ class Task(models.Model):
146 (OUTCOME_CACHED, 'This task restored output from the sstate-cache directory or mirrors'), 146 (OUTCOME_CACHED, 'This task restored output from the sstate-cache directory or mirrors'),
147 (OUTCOME_PREBUILT, 'This task did not run because its outcome was reused from a previous build'), 147 (OUTCOME_PREBUILT, 'This task did not run because its outcome was reused from a previous build'),
148 (OUTCOME_FAILED, 'This task did not complete'), 148 (OUTCOME_FAILED, 'This task did not complete'),
149 (OUTCOME_EMPTY, 'This task has no executable content'),
149 (OUTCOME_NA, ''), 150 (OUTCOME_NA, ''),
150 ) 151 )
151 152
diff --git a/bitbake/lib/toaster/toastergui/templates/task.html b/bitbake/lib/toaster/toastergui/templates/task.html
index a8bcb52194..5d79d447b9 100644
--- a/bitbake/lib/toaster/toastergui/templates/task.html
+++ b/bitbake/lib/toaster/toastergui/templates/task.html
@@ -121,6 +121,10 @@
121 </code> 121 </code>
122 </dd> 122 </dd>
123 </dl> 123 </dl>
124 {%elif task.outcome == task.OUTCOME_EMPTY%}
125 <div class="alert alert-info details">
126 This task is empty because it has the <code>noexec</code> flag set to <code>1</code>, or the task function is empty
127 </div>
124 {% endif %} 128 {% endif %}
125{% endif %} 129{% endif %}
126 130
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index ccf95855a3..6273d4c5ae 100644
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -558,7 +558,7 @@ def tasks_common(request, build_id, variant):
558 ('Cached Tasks', 'outcome:%d'%Task.OUTCOME_CACHED), 558 ('Cached Tasks', 'outcome:%d'%Task.OUTCOME_CACHED),
559 ('Prebuilt Tasks', 'outcome:%d'%Task.OUTCOME_PREBUILT), 559 ('Prebuilt Tasks', 'outcome:%d'%Task.OUTCOME_PREBUILT),
560 ('Covered Tasks', 'outcome:%d'%Task.OUTCOME_COVERED), 560 ('Covered Tasks', 'outcome:%d'%Task.OUTCOME_COVERED),
561 ('Empty Tasks', 'outcome:%d'%Task.OUTCOME_NA), 561 ('Empty Tasks', 'outcome:%d'%Task.OUTCOME_EMPTY),
562 ] 562 ]
563 } 563 }
564 564