mirror of
https://git.yoctoproject.org/poky
synced 2026-06-03 01:40:07 +00:00
oeqs/selftest: OESelftestTestContext: replace the os.environ after subprocess.check_output
No function change but is needed to simplify the next patch. (From OE-Core rev: 273cc6d6a11c4f11f80830f23489a287f38c1a17) Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit 193d8f0d6383f54c61f90d58eeb8f41580c2360a) Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
committed by
Steve Sakoman
parent
ab086e9bd6
commit
ee5fc31a74
@@ -86,17 +86,17 @@ class OESelftestTestContext(OETestContext):
|
|||||||
oe.path.copytree(builddir + "/cache", newbuilddir + "/cache")
|
oe.path.copytree(builddir + "/cache", newbuilddir + "/cache")
|
||||||
oe.path.copytree(selftestdir, newselftestdir)
|
oe.path.copytree(selftestdir, newselftestdir)
|
||||||
|
|
||||||
|
subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True)
|
||||||
|
|
||||||
|
# Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow
|
||||||
|
subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True)
|
||||||
|
|
||||||
for e in os.environ:
|
for e in os.environ:
|
||||||
if builddir + "/" in os.environ[e]:
|
if builddir + "/" in os.environ[e]:
|
||||||
os.environ[e] = os.environ[e].replace(builddir + "/", newbuilddir + "/")
|
os.environ[e] = os.environ[e].replace(builddir + "/", newbuilddir + "/")
|
||||||
if os.environ[e].endswith(builddir):
|
if os.environ[e].endswith(builddir):
|
||||||
os.environ[e] = os.environ[e].replace(builddir, newbuilddir)
|
os.environ[e] = os.environ[e].replace(builddir, newbuilddir)
|
||||||
|
|
||||||
subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True)
|
|
||||||
|
|
||||||
# Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow
|
|
||||||
subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True)
|
|
||||||
|
|
||||||
os.chdir(newbuilddir)
|
os.chdir(newbuilddir)
|
||||||
|
|
||||||
def patch_test(t):
|
def patch_test(t):
|
||||||
|
|||||||
Reference in New Issue
Block a user