summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2015-05-20 15:41:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-29 11:59:46 +0100
commit3480be741ec7bc8fe5b8684e1926447183c6f2c2 (patch)
treed3ea14e5956c2891650c03aaaa49c8c4e3adfffe /bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
parent22a0d8aab2db31a4276bd523f484936efe3f0410 (diff)
downloadpoky-3480be741ec7bc8fe5b8684e1926447183c6f2c2.tar.gz
bitbake: bldcontrol: Fix all failing unit tests
This fixes the unit tests for the bldcontrol it requires the implementation of a new Exception type so that a known Exception can be handled. Also fixed is the path to the toaster conf files so that the test doesn't need to be run from the top level directory and the ability to specify the values of TTS_SOURCE_DIR and TTS_BUILD_DIR and TTS_TEST_ADDRESS used for testing. Edited by Alex Damian to correct the rebasing of the localhostbecontroller.py file. (Bitbake rev: c17933271cd273a346115c2ee0b6695ff3f981ce) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/bldcontrol/localhostbecontroller.py')
-rw-r--r--bitbake/lib/toaster/bldcontrol/localhostbecontroller.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index dfe06f9473..bc3566acee 100644
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -117,7 +117,7 @@ class LocalhostBEController(BuildEnvironmentController):
117 f.seek(0, 2) # jump to the end 117 f.seek(0, 2) # jump to the end
118 toaster_ui_log_filelength = f.tell() 118 toaster_ui_log_filelength = f.tell()
119 119
120 cmd = "bash -c \"source %s/oe-init-build-env %s 2>&1 >toaster_server.log && bitbake --read conf/toaster-pre.conf --postread conf/toaster.conf --server-only -t xmlrpc -B 0.0.0.0:0 2>&1 >>toaster_server.log \"" % (self.pokydirname, self.be.builddir) 120 cmd = "bash -c \"source %s/oe-init-build-env %s 2>&1 >toaster_server.log && bitbake --read %s/conf/toaster-pre.conf --postread %s/conf/toaster.conf --server-only -t xmlrpc -B 0.0.0.0:0 2>&1 >>toaster_server.log \"" % (self.pokydirname, self.be.builddir, self.be.builddir, self.be.builddir)
121 121
122 port = "-1" 122 port = "-1"
123 logger.debug("localhostbecontroller: starting builder \n%s\n" % cmd) 123 logger.debug("localhostbecontroller: starting builder \n%s\n" % cmd)