summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-02-27 18:54:12 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-28 12:27:21 +0000
commite7952c188374508bcf65903d85ae27a593de7465 (patch)
treecaeca90c2afda2f5183e301f73a3b6bd8996fea9
parent959981da53913090575e16d6d942148c24988615 (diff)
downloadpoky-e7952c188374508bcf65903d85ae27a593de7465.tar.gz
bitbake/runqueue: make dry-run do everything except execute
Make dry-run do everything except executing the task, instead of cutting it off earlier. This fully tests the code path for running the child task (parsing and fakeroot), as well as enabling future functionality such as using dry-run to produce signature files. (Bitbake rev: bf1d7739618dabf3872a868230c0112b9ad2a2c0) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/runqueue.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index f08f93aef4..0e5d5c35a9 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1187,7 +1187,8 @@ class RunQueueExecute:
1187 logger.critical(str(exc)) 1187 logger.critical(str(exc))
1188 os._exit(1) 1188 os._exit(1)
1189 try: 1189 try:
1190 ret = bb.build.exec_task(fn, taskname, the_data) 1190 if not self.cooker.configuration.dry_run:
1191 ret = bb.build.exec_task(fn, taskname, the_data)
1191 os._exit(ret) 1192 os._exit(ret)
1192 except: 1193 except:
1193 os._exit(1) 1194 os._exit(1)
@@ -1370,12 +1371,6 @@ class RunQueueExecuteTasks(RunQueueExecute):
1370 self.rqdata.get_user_idstring(task)) 1371 self.rqdata.get_user_idstring(task))
1371 self.task_skip(task) 1372 self.task_skip(task)
1372 return True 1373 return True
1373 elif self.cooker.configuration.dry_run:
1374 self.runq_running[task] = 1
1375 self.runq_buildable[task] = 1
1376 self.stats.taskActive()
1377 self.task_complete(task)
1378 return True
1379 1374
1380 taskdep = self.rqdata.dataCache.task_deps[fn] 1375 taskdep = self.rqdata.dataCache.task_deps[fn]
1381 if 'noexec' in taskdep and taskname in taskdep['noexec']: 1376 if 'noexec' in taskdep and taskname in taskdep['noexec']: