mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

selftest/recipetool: Drop globbing SRC_URI test, no longer supported

Browse Source 
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>
This commit is contained in:
Richard Purdie
2020-08-25 14:47:24 +01:00
parent 93ff8a8323
commit dd82e01426
3 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-selftest/recipes-test/recipetool/files/selftest-replaceme-src-globfile
-1
View File
@@ -1 +0,0 @@
A file matched by a glob in SRC_URI
meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb
-2
View File
@@ -10,7 +10,6 @@ SRC_URI = "file://installscript.sh \
file://file1 \ file://file1 \
file://add-file.patch \ file://add-file.patch \
file://subdir \ file://subdir \
file://selftest-replaceme-src-glob* \
file://selftest-replaceme-inst-globfile \ file://selftest-replaceme-inst-globfile \
file://selftest-replaceme-inst-todir-globfile \ file://selftest-replaceme-inst-todir-globfile \
file://selftest-replaceme-inst-func" file://selftest-replaceme-inst-func"
@@ -27,7 +26,6 @@ do_install() {
install -m 0644 ${WORKDIR}/selftest-replaceme-todir ${D}${datadir} install -m 0644 ${WORKDIR}/selftest-replaceme-todir ${D}${datadir}
install -m 0644 ${WORKDIR}/file1 ${D}${datadir}/selftest-replaceme-renamed install -m 0644 ${WORKDIR}/file1 ${D}${datadir}/selftest-replaceme-renamed
install -m 0644 ${WORKDIR}/subdir/fileinsubdir ${D}${datadir}/selftest-replaceme-subdir install -m 0644 ${WORKDIR}/subdir/fileinsubdir ${D}${datadir}/selftest-replaceme-subdir
install -m 0644 ${WORKDIR}/selftest-replaceme-src-globfile ${D}${datadir}/selftest-replaceme-src-globfile
cp ${WORKDIR}/selftest-replaceme-inst-glob* ${D}${datadir}/selftest-replaceme-inst-globfile cp ${WORKDIR}/selftest-replaceme-inst-glob* ${D}${datadir}/selftest-replaceme-inst-globfile
cp ${WORKDIR}/selftest-replaceme-inst-todir-glob* ${D}${datadir} cp ${WORKDIR}/selftest-replaceme-inst-todir-glob* ${D}${datadir}
install -d ${D}${sysconfdir} install -d ${D}${sysconfdir}
meta/lib/oeqa/selftest/cases/recipetool.py
-13
View File
@@ -226,19 +226,6 @@ class RecipetoolTests(RecipetoolBase):
_, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-subdir', self.testfile, '', expectedlines, ['testfile']) _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-subdir', self.testfile, '', expectedlines, ['testfile'])
self.assertNotIn('WARNING: ', output) self.assertNotIn('WARNING: ', output)
def test_recipetool_appendfile_src_glob(self):
# A file that's in SRC_URI as a glob
expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n',
'\n',
'SRC_URI += "file://testfile"\n',
'\n',
'do_install_append() {\n',
' install -d ${D}${datadir}\n',
' install -m 0644 ${WORKDIR}/testfile ${D}${datadir}/selftest-replaceme-src-globfile\n',
'}\n']
_, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-src-globfile', self.testfile, '', expectedlines, ['testfile'])
self.assertNotIn('WARNING: ', output)
def test_recipetool_appendfile_inst_glob(self): def test_recipetool_appendfile_inst_glob(self):
# A file that's in do_install as a glob # A file that's in do_install as a glob
expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n',