summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>2017-02-01 12:04:55 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-02 17:37:43 +0000
commitd3c6c10de478b21c8f82898c0c1ec114dbfe33c3 (patch)
tree492b598f1235fe3664029c735adee4804fc458d9
parent3bc5724ec7fa685e4f8e6cf6254f2288cad080bf (diff)
downloadpoky-d3c6c10de478b21c8f82898c0c1ec114dbfe33c3.tar.gz
selftest/bbtests: use write_config instead of local.conf file
Extra configuration data should be write using the write_config method instead of manually appending to the local.conf file (From OE-Core rev: 65c26d51eedc687c92e8ade262d24dc53ca71cec) Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/bbtests.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/meta/lib/oeqa/selftest/bbtests.py b/meta/lib/oeqa/selftest/bbtests.py
index c4e50cbfa0..9dbac957ed 100644
--- a/meta/lib/oeqa/selftest/bbtests.py
+++ b/meta/lib/oeqa/selftest/bbtests.py
@@ -229,10 +229,7 @@ INHERIT_remove = \"report-error\"
229 229
230 @testcase(1119) 230 @testcase(1119)
231 def test_non_gplv3(self): 231 def test_non_gplv3(self):
232 data = 'INCOMPATIBLE_LICENSE = "GPLv3"' 232 self.write_config('INCOMPATIBLE_LICENSE = "GPLv3"')
233 conf = os.path.join(self.builddir, 'conf/local.conf')
234 ftools.append_file(conf ,data)
235 self.addCleanup(ftools.remove_from_file, conf ,data)
236 result = bitbake('readline', ignore_status=True) 233 result = bitbake('readline', ignore_status=True)
237 self.assertEqual(result.status, 0, "Bitbake failed, exit code %s, output %s" % (result.status, result.output)) 234 self.assertEqual(result.status, 0, "Bitbake failed, exit code %s, output %s" % (result.status, result.output))
238 lic_dir = get_bb_var('LICENSE_DIRECTORY') 235 lic_dir = get_bb_var('LICENSE_DIRECTORY')