From: Ian Campbell <ian.campbell@citrix.com>
Date: Fri, 22 May 2015 09:29:18 +0000 (+0100)
Subject: standalone: Prefer ./local-config to $HOME/.xen-osstest/config
X-Git-Tag: wip.libvirt-v3-base~84
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=25f44c68ad1ed1eeffc37670d0f8a43a1684c9cb;p=people%2Fliuw%2Fosstest.git

standalone: Prefer ./local-config to $HOME/.xen-osstest/config

OSSTEST_CONFIG still trumps both.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v3: local-config not standalone.config
---

diff --git a/standalone b/standalone
index b5c97c8..e9a74c1 100755
--- a/standalone
+++ b/standalone
@@ -68,7 +68,13 @@ TEMP=$(getopt -o c:f:h:rRs --long config:,flight:,host:,reuse,noreuse,reinstall,
 
 eval set -- "$TEMP"
 
-config=${OSSTEST_CONFIG-$HOME/.xen-osstest/config}
+if [ -n "${OSSTEST_CONFIG}" ]; then
+    config=${OSSTEST_CONFIG}
+elif [ -f local-config ]; then
+    config=local-config
+else
+    config=$HOME/.xen-osstest/config
+fi
 flight="standalone"
 host=
 reuse=1 # Don't blow away machines by default