mirror of
https://git.yoctoproject.org/poky
synced 2026-06-05 14:29:48 +00:00
oe-selftest: devtool: fix test_devtool_add hanging on some machines
The code in scriptutils which implements the logic for running the editor used by devtool edit-recipe looks at the VISUAL environment variable before EDITOR, and thus if VISUAL is set in the environment it will override the EDITOR value we are setting here, the editor (usually vim) launches and there's nothing to stop it running forever short of manually killing it. Set VISUAL instead to fix this. Apparently VISUAL is in fact the variable we should really be preferring here - I don't think I knew that but somehow I got it right in the code, just not in the test. Here are the details for the curious: https://unix.stackexchange.com/questions/4859/visual-vs-editor-whats-the-difference Fixes [YOCTO #12074]. (From OE-Core rev: 6a7c50def569b5e86aa17bd9b287e8c63781dcb0) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
082dcd0163
commit
92a08ae838
@@ -216,7 +216,7 @@ class DevtoolTests(DevtoolBase):
|
||||
result = runCmd('devtool -q find-recipe %s' % pn)
|
||||
self.assertEqual(recipepath, result.output.strip())
|
||||
# Test devtool edit-recipe
|
||||
result = runCmd('EDITOR="echo 123" devtool -q edit-recipe %s' % pn)
|
||||
result = runCmd('VISUAL="echo 123" devtool -q edit-recipe %s' % pn)
|
||||
self.assertEqual('123 %s' % recipepath, result.output.strip())
|
||||
# Clean up anything in the workdir/sysroot/sstate cache (have to do this *after* devtool add since the recipe only exists then)
|
||||
bitbake('%s -c cleansstate' % pn)
|
||||
|
||||
Reference in New Issue
Block a user