diff mbox

hwsim tests: vm: read a config file from $HOME

Message ID 1389692313-16051-1-git-send-email-johannes@sipsolutions.net
State Accepted
Headers show

Commit Message

Johannes Berg Jan. 14, 2014, 9:38 a.m. UTC 
From: Johannes Berg <johannes.berg@intel.com>

The vm-config in the subdirectory is less useful as it
will get removed by "git clean" and similar, so read a
config file from ~/.wpas-vm-config in addition.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 tests/hwsim/vm/vm-run.sh | 1 +
 1 file changed, 1 insertion(+)

Comments

Jouni Malinen Jan. 14, 2014, 4:13 p.m. UTC | #1 
On Tue, Jan 14, 2014 at 10:38:33AM +0100, Johannes Berg wrote:
> The vm-config in the subdirectory is less useful as it
> will get removed by "git clean" and similar, so read a
> config file from ~/.wpas-vm-config in addition.

Thanks, applied.
diff mbox

Patch

diff --git a/tests/hwsim/vm/vm-run.sh b/tests/hwsim/vm/vm-run.sh
index dc643cb..616073f 100755
--- a/tests/hwsim/vm/vm-run.sh
+++ b/tests/hwsim/vm/vm-run.sh
@@ -29,6 +29,7 @@  KVMOUT=ttyS1
 CHANNELS=1
 
 test -f vm-config && . vm-config
+test -f ~/.wpas-vm-config && . ~/.wpas-vm-config
 
 if [ -z "$KERNEL" ] && [ -z "$KERNELDIR" ] ; then
 	echo "You need to set a KERNEL or KERNELDIR (in the environment or vm-config)"