diff options
Diffstat (limited to 'meta/lib/oeqa/selftest/buildoptions.py')
-rw-r--r-- | meta/lib/oeqa/selftest/buildoptions.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/lib/oeqa/selftest/buildoptions.py b/meta/lib/oeqa/selftest/buildoptions.py index 28734fd1f0..568882ba8f 100644 --- a/meta/lib/oeqa/selftest/buildoptions.py +++ b/meta/lib/oeqa/selftest/buildoptions.py | |||
@@ -5,7 +5,7 @@ import shutil | |||
5 | import tempfile | 5 | import tempfile |
6 | from oeqa.selftest.base import oeSelfTest | 6 | from oeqa.selftest.base import oeSelfTest |
7 | from oeqa.selftest.buildhistory import BuildhistoryBase | 7 | from oeqa.selftest.buildhistory import BuildhistoryBase |
8 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var | 8 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars |
9 | import oeqa.utils.ftools as ftools | 9 | import oeqa.utils.ftools as ftools |
10 | from oeqa.utils.decorators import testcase | 10 | from oeqa.utils.decorators import testcase |
11 | 11 | ||
@@ -33,13 +33,15 @@ class ImageOptionsTests(oeSelfTest): | |||
33 | @testcase(286) | 33 | @testcase(286) |
34 | def test_ccache_tool(self): | 34 | def test_ccache_tool(self): |
35 | bitbake("ccache-native") | 35 | bitbake("ccache-native") |
36 | p = get_bb_var('SYSROOT_DESTDIR', 'ccache-native') + get_bb_var('bindir', 'ccache-native') + "/" + "ccache" | 36 | bb_vars = get_bb_vars(['SYSROOT_DESTDIR', 'bindir'], 'ccache-native') |
37 | p = bb_vars['SYSROOT_DESTDIR'] + bb_vars['bindir'] + "/" + "ccache" | ||
37 | self.assertTrue(os.path.isfile(p), msg = "No ccache found (%s)" % p) | 38 | self.assertTrue(os.path.isfile(p), msg = "No ccache found (%s)" % p) |
38 | self.write_config('INHERIT += "ccache"') | 39 | self.write_config('INHERIT += "ccache"') |
39 | self.add_command_to_tearDown('bitbake -c clean m4') | 40 | self.add_command_to_tearDown('bitbake -c clean m4') |
40 | bitbake("m4 -f -c compile") | 41 | bitbake("m4 -f -c compile") |
41 | res = runCmd("grep ccache %s" % (os.path.join(get_bb_var("WORKDIR","m4"),"temp/log.do_compile")), ignore_status=True) | 42 | log_compile = os.path.join(get_bb_var("WORKDIR","m4"), "temp/log.do_compile") |
42 | self.assertEqual(0, res.status, msg="No match for ccache in m4 log.do_compile. For further details: %s" % os.path.join(get_bb_var("WORKDIR","m4"),"temp/log.do_compile")) | 43 | res = runCmd("grep ccache %s" % log_compile, ignore_status=True) |
44 | self.assertEqual(0, res.status, msg="No match for ccache in m4 log.do_compile. For further details: %s" % log_compile) | ||
43 | 45 | ||
44 | @testcase(1435) | 46 | @testcase(1435) |
45 | def test_read_only_image(self): | 47 | def test_read_only_image(self): |