From: Jouni Malinen <j@w1.fi>
Date: Mon, 29 Dec 2014 13:47:08 +0000 (+0200)
Subject: tests: Fix --codecov cases to find correct wpa_cli/hostapd_cli
X-Git-Tag: hostap_2_4~660
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6532a84ed3939e26ec48b33fdbd4bdc79732c5f7;p=thirdparty%2Fhostap.git

tests: Fix --codecov cases to find correct wpa_cli/hostapd_cli

It was possible for the separate builds to not include
wpa_cli/hostapd_cli in the default location. Make sure hostapd_cli gets
built for --codecov cases and update both WPACLI and HAPDCLI paths to
match the alternative location.

Signed-off-by: Jouni Malinen <j@w1.fi>
---

diff --git a/tests/hwsim/start.sh b/tests/hwsim/start.sh
index d0015fa3c..602e4b84f 100755
--- a/tests/hwsim/start.sh
+++ b/tests/hwsim/start.sh
@@ -16,6 +16,7 @@ if [ -z "$LOGDIR" ] ; then
 else
     if [ -e $LOGDIR/alt-wpa_supplicant/wpa_supplicant/wpa_supplicant ]; then
 	WPAS=$LOGDIR/alt-wpa_supplicant/wpa_supplicant/wpa_supplicant
+	WPACLI=$LOGDIR/alt-wpa_supplicant/wpa_supplicant/wpa_cli
 	# extra code coverage
 	$WPAS > /dev/null 2>&1
 	$WPAS -efoo -Ifoo -mfoo -ofoo -Ofoo -pfoo -Pfoo -h > /dev/null 2>&1
@@ -25,6 +26,7 @@ else
     fi
     if [ -e $LOGDIR/alt-hostapd/hostapd/hostapd ]; then
 	HAPD=$LOGDIR/alt-hostapd/hostapd/hostapd
+	HAPDCLI=$LOGDIR/alt-hostapd/hostapd/hostapd_cli
 	# extra code coverage
 	$HAPD > /dev/null 2>&1
 	$HAPD -v > /dev/null 2>&1
diff --git a/tests/hwsim/vm/build-codecov.sh b/tests/hwsim/vm/build-codecov.sh
index 676a24d51..e67ef2ea8 100755
--- a/tests/hwsim/vm/build-codecov.sh
+++ b/tests/hwsim/vm/build-codecov.sh
@@ -39,11 +39,11 @@ make -j8 > /dev/null
 
 cd $TMPDIR/alt-hostapd/hostapd
 echo "Building hostapd"
-make -j8 hostapd > /dev/null
+make -j8 hostapd hostapd_cli > /dev/null
 
 cd $TMPDIR/alt-hostapd-as/hostapd
 echo "Building hostapd (AS)"
-make -j8 hostapd > /dev/null
+make -j8 hostapd hostapd_cli > /dev/null
 
 cd $TMPDIR/alt-hlr_auc_gw/hostapd
 echo "Building hlr_auc_gw"