diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-02-27 18:54:12 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-28 12:25:03 +0000 |
| commit | bf1d7739618dabf3872a868230c0112b9ad2a2c0 (patch) | |
| tree | 435b1fe9a03ef0453ea518d9194b61da7d62fb71 /lib/bb/runqueue.py | |
| parent | af524a656fce32d01687481b86c31bef00eb9fc3 (diff) | |
| download | bitbake-bf1d7739618dabf3872a868230c0112b9ad2a2c0.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.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/runqueue.py')
| -rw-r--r-- | lib/bb/runqueue.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index f08f93aef..0e5d5c35a 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -1187,7 +1187,8 @@ class RunQueueExecute: logger.critical(str(exc)) os._exit(1) try: - ret = bb.build.exec_task(fn, taskname, the_data) + if not self.cooker.configuration.dry_run: + ret = bb.build.exec_task(fn, taskname, the_data) os._exit(ret) except: os._exit(1) @@ -1370,12 +1371,6 @@ class RunQueueExecuteTasks(RunQueueExecute): self.rqdata.get_user_idstring(task)) self.task_skip(task) return True - elif self.cooker.configuration.dry_run: - self.runq_running[task] = 1 - self.runq_buildable[task] = 1 - self.stats.taskActive() - self.task_complete(task) - return True taskdep = self.rqdata.dataCache.task_deps[fn] if 'noexec' in taskdep and taskname in taskdep['noexec']: |