From: Li Zhijian <lizhijian@cn.fujitsu.com>
Date: Tue, 6 Jun 2017 08:13:29 +0000 (+0800)
Subject: tests: Enable D-Bus test on more platforms
X-Git-Tag: hostap_2_7~1122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b62d0544c53f3d12821d39e0dcaa0bb7ead08284;p=thirdparty%2Fhostap.git

tests: Enable D-Bus test on more platforms

Not all distro contains /var/run/dbus/pid, debian for example:
dbus-daemon start with nopidfile
root@debian9:/home/lizhijian/chroot_clean/tmp/build-hwsim/hostap/tests/hwsim# ps aux |grep dbus
message+   598  0.0  0.1  46068  4836 ?        Ss   15:46   0:00 /usr/bin/dbus-daemon --system --address=systemd: --nofork --nopidfile --systemd-activation
Debian-+   656  0.0  0.0  45220  3924 ?        Ss   15:46   0:00 /usr/bin/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation

Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
Signed-off-by: Xiaodong Jia <jiaxd-fnst@cn.fujitsu.com>
---

diff --git a/tests/hwsim/start.sh b/tests/hwsim/start.sh
index cee923972..dce65ba82 100755
--- a/tests/hwsim/start.sh
+++ b/tests/hwsim/start.sh
@@ -107,7 +107,7 @@ sudo ifconfig hwsim0 up
 sudo $WLANTEST -i hwsim0 -n $LOGDIR/hwsim0.pcapng -c -dtN -L $LOGDIR/hwsim0 &
 for i in 0 1 2; do
     DBUSARG=""
-    if [ $i = "0" -a -r /var/run/dbus/pid -a -r /var/run/dbus/hwsim-test ]; then
+    if [ $i = "0" ] && ([ -r /var/run/dbus/pid ] || [ -r /var/run/dbus/system_bus_socket ]); then
 	if $WPAS | grep -q -- -u; then
 	    DBUSARG="-u"
 	fi