diff options
Diffstat (limited to 'meta/lib/oeqa/selftest/bbtests.py')
-rw-r--r-- | meta/lib/oeqa/selftest/bbtests.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/bbtests.py b/meta/lib/oeqa/selftest/bbtests.py index 4b423237b0..869840022a 100644 --- a/meta/lib/oeqa/selftest/bbtests.py +++ b/meta/lib/oeqa/selftest/bbtests.py | |||
@@ -64,12 +64,15 @@ class BitbakeTests(oeSelfTest): | |||
64 | 64 | ||
65 | @testcase(108) | 65 | @testcase(108) |
66 | def test_invalid_patch(self): | 66 | def test_invalid_patch(self): |
67 | # This patch already exists in SRC_URI so adding it again will cause the | ||
68 | # patch to fail. | ||
67 | self.write_recipeinc('man', 'SRC_URI += "file://man-1.5h1-make.patch"') | 69 | self.write_recipeinc('man', 'SRC_URI += "file://man-1.5h1-make.patch"') |
70 | self.write_config("INHERIT_remove = \"report-error\"") | ||
68 | result = bitbake('man -c patch', ignore_status=True) | 71 | result = bitbake('man -c patch', ignore_status=True) |
69 | self.delete_recipeinc('man') | 72 | self.delete_recipeinc('man') |
70 | bitbake('-cclean man') | 73 | bitbake('-cclean man') |
71 | line = self.getline(result, "Function failed: patch_do_patch") | 74 | line = self.getline(result, "Function failed: patch_do_patch") |
72 | self.assertTrue(line and line.startswith("ERROR:"), msg = "Though no man-1.5h1-make.patch file exists, bitbake didn't output any err. message. bitbake output: %s" % result.output) | 75 | self.assertTrue(line and line.startswith("ERROR:"), msg = "Repeated patch application didn't fail. bitbake output: %s" % result.output) |
73 | 76 | ||
74 | @testcase(1354) | 77 | @testcase(1354) |
75 | def test_force_task_1(self): | 78 | def test_force_task_1(self): |
@@ -212,6 +215,7 @@ SSTATE_DIR = \"${TOPDIR}/download-selftest\" | |||
212 | def test_continue(self): | 215 | def test_continue(self): |
213 | self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\" | 216 | self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\" |
214 | SSTATE_DIR = \"${TOPDIR}/download-selftest\" | 217 | SSTATE_DIR = \"${TOPDIR}/download-selftest\" |
218 | INHERIT_remove = \"report-error\" | ||
215 | """) | 219 | """) |
216 | self.track_for_cleanup(os.path.join(self.builddir, "download-selftest")) | 220 | self.track_for_cleanup(os.path.join(self.builddir, "download-selftest")) |
217 | self.write_recipeinc('man',"\ndo_fail_task () {\nexit 1 \n}\n\naddtask do_fail_task before do_fetch\n" ) | 221 | self.write_recipeinc('man',"\ndo_fail_task () {\nexit 1 \n}\n\naddtask do_fail_task before do_fetch\n" ) |