aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-09-14 08:57:44 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-13 21:59:48 +0100
commit6a7c50def569b5e86aa17bd9b287e8c63781dcb0 (patch)
tree185e6fcb5b232ca6902e3a497836995be285af3a
parentde70799af1a8bfe2fac22b90401053275d4714ba (diff)
downloadopenembedded-core-6a7c50def569b5e86aa17bd9b287e8c63781dcb0.zip
openembedded-core-6a7c50def569b5e86aa17bd9b287e8c63781dcb0.tar.gz
openembedded-core-6a7c50def569b5e86aa17bd9b287e8c63781dcb0.tar.bz2
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]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/cases/devtool.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index d5d0918..1dfef59 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -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)