Merge lp:~terceiro/lava-dispatcher/lava-test-shell-oe into lp:lava-dispatcher

[Antonio Terceiro]

This branch removes unconditional calling of Ubuntu-specific commands in lava-test-runner, and makes it work with OE images.

We still have some other instances of this incorrect behavior on other parts of lava-test-shell, but this is a good start at tackling the problem.

[Senthil Kumaran S (stylesen)]

It makes sense to do this change in lava-test-runner-ubuntu shell script as of now. But in future this must be renamed to 'lava-test-runner' since this is generic for all images other than android (this change could be done later).

+1 for this change.

review: Approve

=== modified file 'lava_test_shell/lava-test-runner-ubuntu'
--- lava_test_shell/lava-test-runner-ubuntu	2013-01-28 08:51:59 +0000
+++ lava_test_shell/lava-test-runner-ubuntu	2013-03-25 16:51:22 +0000
@@ -5,6 +5,12 @@
 RESULTSDIR="/lava/results"
 BINDIR="/lava/bin"
 
+detect_distro() {
+	test -x /usr/bin/dpkg-query && echo "debian_based" && return
+
+	echo "unknown"
+}
+
 hwcontext()
 {
 	mkdir -p ${RESULTSDIR}/hwcontext
@@ -15,7 +21,17 @@
 	[ -f ${meminfo} ] || cat /proc/meminfo > ${meminfo}
 }
 
-swcontext()
+unknown_swcontext() {
+	mkdir -p ${RESULTSDIR}/swcontext
+	build=${RESULTSDIR}/swcontext/build.txt
+	pkgs=${RESULTSDIR}/swcontext/pkgs.txt
+
+	# we don't know about the software context
+	echo 'Unsupported distro: cannot determine build version' > "$build"
+	echo 'Unsupported distro: cannot obtain list of installed packages' > "$pkgs"
+}
+
+debian_based_swcontext()
 {
 	mkdir -p ${RESULTSDIR}/swcontext
 	build=${RESULTSDIR}/swcontext/build.txt
@@ -27,6 +43,10 @@
 	[ -f ${pkgs} ]  || dpkg-query -W -f '${status} ${package} : ${version}\n' | sed -n 's/^install ok installed/package:/p'  > ${pkgs}
 }
 
+swcontext() {
+	distro=$(detect_distro)
+	${distro}_swcontext
+}
 
 cleanup()
 {