From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Fri, 10 May 2013 14:09:55 +0000 (+0300)
Subject: tests: Use /var/run/hostapd-global to avoid socket file in work dir
X-Git-Tag: aosp-kk-from-upstream~271
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c87f65f32463344becc5c4a383a63fea04bc49b;p=thirdparty%2Fhostap.git

tests: Use /var/run/hostapd-global to avoid socket file in work dir

This makes some cases more convenient with read-only file systems.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
---

diff --git a/tests/hwsim/hostapd.py b/tests/hwsim/hostapd.py
index db586e9b4..8bf4a56a9 100644
--- a/tests/hwsim/hostapd.py
+++ b/tests/hwsim/hostapd.py
@@ -13,7 +13,7 @@ import wpaspy
 
 logger = logging.getLogger(__name__)
 hapd_ctrl = '/var/run/hostapd'
-hapd_global = 'hostapd-global'
+hapd_global = '/var/run/hostapd-global'
 
 class HostapdGlobal:
     def __init__(self):
diff --git a/tests/hwsim/start.sh b/tests/hwsim/start.sh
index 36502e819..9a76ecb1b 100755
--- a/tests/hwsim/start.sh
+++ b/tests/hwsim/start.sh
@@ -15,6 +15,6 @@ sudo tcpdump -ni hwsim0 -s 2500 -w $DIR/logs/$DATE-hwsim0.dump &
 sudo $WPAS -Dnl80211 -iwlan0 -c $DIR/p2p0.conf -ddKt > $DIR/logs/$DATE-log0 &
 sudo $WPAS -Dnl80211 -iwlan1 -c $DIR/p2p1.conf -ddKt > $DIR/logs/$DATE-log1 &
 sudo $WPAS -Dnl80211 -iwlan2 -c $DIR/p2p2.conf -ddKt > $DIR/logs/$DATE-log2 &
-sudo $HAPD -ddKt -g $DIR/hostapd-global -G admin -ddKt > $DIR/logs/$DATE-hostapd &
+sudo $HAPD -ddKt -g /var/run/hostapd-global -G admin -ddKt > $DIR/logs/$DATE-hostapd &
 sleep 1
 sudo chown $USER $DIR/logs/$DATE-hwsim0.dump