diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-25 14:47:24 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-26 09:04:04 +0100 |
| commit | dd82e01426de969cb4ef346ed221064bcea82d43 (patch) | |
| tree | 01fcf2941558345e0bbc2e599a7d55c1037d7614 | |
| parent | 93ff8a8323a4c9e397e9911d09578d6ff0080389 (diff) | |
| download | poky-dd82e01426de969cb4ef346ed221064bcea82d43.tar.gz | |
selftest/recipetool: Drop globbing SRC_URI test, no longer supported
Globbing is a bad idea in SRC_URI, it breaks the task checksums and
can't really be fixed. Since we're removing it, drop the test for
its interaction with recipetool.
(From OE-Core rev: 8bf93fa89aa1ba73f6eec05b95d6e8ca5f7d4c4b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 0 insertions, 16 deletions
diff --git a/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-src-globfile b/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-src-globfile deleted file mode 100644 index 1e20a2b03e..0000000000 --- a/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-src-globfile +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | A file matched by a glob in SRC_URI | ||
diff --git a/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb b/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb index 7375c47933..b5f976708f 100644 --- a/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb +++ b/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb | |||
| @@ -10,7 +10,6 @@ SRC_URI = "file://installscript.sh \ | |||
| 10 | file://file1 \ | 10 | file://file1 \ |
| 11 | file://add-file.patch \ | 11 | file://add-file.patch \ |
| 12 | file://subdir \ | 12 | file://subdir \ |
| 13 | file://selftest-replaceme-src-glob* \ | ||
| 14 | file://selftest-replaceme-inst-globfile \ | 13 | file://selftest-replaceme-inst-globfile \ |
| 15 | file://selftest-replaceme-inst-todir-globfile \ | 14 | file://selftest-replaceme-inst-todir-globfile \ |
| 16 | file://selftest-replaceme-inst-func" | 15 | file://selftest-replaceme-inst-func" |
| @@ -27,7 +26,6 @@ do_install() { | |||
| 27 | install -m 0644 ${WORKDIR}/selftest-replaceme-todir ${D}${datadir} | 26 | install -m 0644 ${WORKDIR}/selftest-replaceme-todir ${D}${datadir} |
| 28 | install -m 0644 ${WORKDIR}/file1 ${D}${datadir}/selftest-replaceme-renamed | 27 | install -m 0644 ${WORKDIR}/file1 ${D}${datadir}/selftest-replaceme-renamed |
| 29 | install -m 0644 ${WORKDIR}/subdir/fileinsubdir ${D}${datadir}/selftest-replaceme-subdir | 28 | install -m 0644 ${WORKDIR}/subdir/fileinsubdir ${D}${datadir}/selftest-replaceme-subdir |
| 30 | install -m 0644 ${WORKDIR}/selftest-replaceme-src-globfile ${D}${datadir}/selftest-replaceme-src-globfile | ||
| 31 | cp ${WORKDIR}/selftest-replaceme-inst-glob* ${D}${datadir}/selftest-replaceme-inst-globfile | 29 | cp ${WORKDIR}/selftest-replaceme-inst-glob* ${D}${datadir}/selftest-replaceme-inst-globfile |
| 32 | cp ${WORKDIR}/selftest-replaceme-inst-todir-glob* ${D}${datadir} | 30 | cp ${WORKDIR}/selftest-replaceme-inst-todir-glob* ${D}${datadir} |
| 33 | install -d ${D}${sysconfdir} | 31 | install -d ${D}${sysconfdir} |
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py index c2ade2543a..6bac53cf3d 100644 --- a/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/meta/lib/oeqa/selftest/cases/recipetool.py | |||
| @@ -226,19 +226,6 @@ class RecipetoolTests(RecipetoolBase): | |||
| 226 | _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-subdir', self.testfile, '', expectedlines, ['testfile']) | 226 | _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-subdir', self.testfile, '', expectedlines, ['testfile']) |
| 227 | self.assertNotIn('WARNING: ', output) | 227 | self.assertNotIn('WARNING: ', output) |
| 228 | 228 | ||
| 229 | def test_recipetool_appendfile_src_glob(self): | ||
| 230 | # A file that's in SRC_URI as a glob | ||
| 231 | expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', | ||
| 232 | '\n', | ||
| 233 | 'SRC_URI += "file://testfile"\n', | ||
| 234 | '\n', | ||
| 235 | 'do_install_append() {\n', | ||
| 236 | ' install -d ${D}${datadir}\n', | ||
| 237 | ' install -m 0644 ${WORKDIR}/testfile ${D}${datadir}/selftest-replaceme-src-globfile\n', | ||
| 238 | '}\n'] | ||
| 239 | _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-src-globfile', self.testfile, '', expectedlines, ['testfile']) | ||
| 240 | self.assertNotIn('WARNING: ', output) | ||
| 241 | |||
| 242 | def test_recipetool_appendfile_inst_glob(self): | 229 | def test_recipetool_appendfile_inst_glob(self): |
| 243 | # A file that's in do_install as a glob | 230 | # A file that's in do_install as a glob |
| 244 | expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', | 231 | expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', |
