diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-06-24 00:07:03 +1200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-07 13:29:01 +0100 |
commit | e1390c1ef85862b91b067ab24f3c06ca506155ad (patch) | |
tree | 912d9081b5af568ab0f47306aa121247c352067e /meta/classes/testsdk.bbclass | |
parent | a8f11bc5ce07114b9ec7da7ad48da62e2026cd74 (diff) | |
download | openembedded-core-contrib-e1390c1ef85862b91b067ab24f3c06ca506155ad.tar.gz |
classes/populate_sdk_ext: eliminate double execution on install
Use the new BB_SETSCENE_ENFORCE functionality to avoid having to run
bitbake twice on installing the extensible SDK - we can now do it all in
one invocation which not only takes less time, but we should also get
more meaningful errors for some types of failure, in particular where
downloading from an sstate mirror fails.
One result of this change is that you get the errors printed on the
console during normal output rather than this going to the
preparing_build_system.log file first. In OE-Core revision
227d2cbf9e0b8c35fa6644e3d72e0699db9607fa, we changed to always print the
contents of preparing_build_system.log on failure, but now at least the
error contents of that log is duplicated. Besides, I intentionally
didn't print out the contents of that log during normal usage because
it's quite verbose - the bug that we were attempting to fix was about
not getting this information when seeing failures in the automated
tests, thus I've moved printing the log to the test handling code
instead.
Part of the implementation of [YOCTO #9367].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/testsdk.bbclass')
-rw-r--r-- | meta/classes/testsdk.bbclass | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass index 18f7678d37f..0b8716edb5f 100644 --- a/meta/classes/testsdk.bbclass +++ b/meta/classes/testsdk.bbclass @@ -113,10 +113,18 @@ def testsdkext_main(d): testdir = d.expand("${WORKDIR}/testsdkext/") bb.utils.remove(testdir, True) bb.utils.mkdirhier(testdir) + sdkdir = os.path.join(testdir, 'tc') try: - subprocess.check_output("%s -y -d %s/tc" % (tcname, testdir), shell=True) + subprocess.check_output("%s -y -d %s" % (tcname, sdkdir), shell=True) except subprocess.CalledProcessError as e: - bb.fatal("Couldn't install the SDK EXT:\n%s" % e.output.decode("utf-8")) + msg = "Couldn't install the extensible SDK:\n%s" % e.output.decode("utf-8") + logfn = os.path.join(sdkdir, 'preparing_build_system.log') + if os.path.exists(logfn): + msg += '\n\nContents of preparing_build_system.log:\n' + with open(logfn, 'r') as f: + for line in f: + msg += line + bb.fatal(msg) try: bb.plain("Running SDK Compatibility tests ...") |