Skip to contentSkip to conversation

Fixing for [BUGID #594]. Check DISPLAY is set in sanity.bbclass

PATCH Applied Jiajun Xu 2 participants 3 messages Dec 16, 2010

lore
Share & tools
lore

Jiajun Xu

author
#0 lore raw

cover Fixing for [BUGID #594]. Check DISPLAY is set in sanity.bbclass

[BUGID #594] Fixing bug #594, checking in sanity.bbclass if DISPLAY is set when IMAGETEST is set to qemu.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: jxu49/master
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jxu49/master

Thanks,
Jiajun Xu <[email protected]>
---

Jiajun Xu (1):
sanity.bbclass: Check if DISPLAY is set when IMAGETEST is set

 meta/classes/sanity.bbclass |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
author
#1 lore raw

PATCH 1/1 sanity.bbclass: Check if DISPLAY is set when IMAGETEST is set

Fixes [BUGID: 594]

In imagetest-qemu.bbclass, we depend on DISPLAY to start qemu in a X desktop. When user wants to run qemu sanity test, we need to check if the variable is set.

Signed-off-by Jiajun Xu <[email protected]>

---
 meta/classes/sanity.bbclass |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
meta/classes/sanity.bbclass +4 -0
index e1f37ac..bc02a82 100644
@@ -139,6 +139,10 @@ def check_sanity(e):
 		missing = missing.rstrip(',')
 		messages = messages + "Please install following missing utilities: %s\n" % missing
 
+	# Check if DISPLAY is set if IMAGETEST is set
+	if not data.getVar( 'DISPLAY', e.data, True ) and data.getVar( 'IMAGETEST', e.data, True ) == 'qemu':
+		messages = messages + 'qemuimagetest needs a X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n'
+
 	# Ensure we have the binary for TERMCMD, as when patch application fails the error is fairly intimidating
 	termcmd = data.getVar("TERMCMD", e.data, True)
 	term = termcmd.split()[0]
Signature · 1 line
1.7.1
#2 lore raw
In reply to Jiajun Xu
Quoted 12 lines · Jiajun Xu

[BUGID #594] Fixing bug #594, checking in sanity.bbclass if DISPLAY is set when IMAGETEST is set to qemu.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: jxu49/master
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jxu49/master

Thanks,
Jiajun Xu <[email protected]>
---

Quoted 5 lines

Jiajun Xu (1):
sanity.bbclass: Check if DISPLAY is set when IMAGETEST is set

 meta/classes/sanity.bbclass |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

Merged into master, thanks!

Richard