DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Jouni Malinen 2014-12-29 15:47:08 +02:00
parent de677292d5
commit 6532a84ed3
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/hwsim/start.sh
View file

@ -16,6 +16,7 @@ if [ -z "$LOGDIR" ] ; then
else else
if [ -e $LOGDIR/alt-wpa_supplicant/wpa_supplicant/wpa_supplicant ]; then if [ -e $LOGDIR/alt-wpa_supplicant/wpa_supplicant/wpa_supplicant ]; then
WPAS=$LOGDIR/alt-wpa_supplicant/wpa_supplicant/wpa_supplicant WPAS=$LOGDIR/alt-wpa_supplicant/wpa_supplicant/wpa_supplicant
WPACLI=$LOGDIR/alt-wpa_supplicant/wpa_supplicant/wpa_cli
# extra code coverage # extra code coverage
$WPAS > /dev/null 2>&1 $WPAS > /dev/null 2>&1
$WPAS -efoo -Ifoo -mfoo -ofoo -Ofoo -pfoo -Pfoo -h > /dev/null 2>&1 $WPAS -efoo -Ifoo -mfoo -ofoo -Ofoo -pfoo -Pfoo -h > /dev/null 2>&1
@ -25,6 +26,7 @@ else
fi fi
if [ -e $LOGDIR/alt-hostapd/hostapd/hostapd ]; then if [ -e $LOGDIR/alt-hostapd/hostapd/hostapd ]; then
HAPD=$LOGDIR/alt-hostapd/hostapd/hostapd HAPD=$LOGDIR/alt-hostapd/hostapd/hostapd
HAPDCLI=$LOGDIR/alt-hostapd/hostapd/hostapd_cli
# extra code coverage # extra code coverage
$HAPD > /dev/null 2>&1 $HAPD > /dev/null 2>&1
$HAPD -v > /dev/null 2>&1 $HAPD -v > /dev/null 2>&1

4
tests/hwsim/vm/build-codecov.sh
View file

@ -39,11 +39,11 @@ make -j8 > /dev/null
cd $TMPDIR/alt-hostapd/hostapd cd $TMPDIR/alt-hostapd/hostapd
echo "Building hostapd" echo "Building hostapd"
make -j8 hostapd > /dev/null make -j8 hostapd hostapd_cli > /dev/null
cd $TMPDIR/alt-hostapd-as/hostapd cd $TMPDIR/alt-hostapd-as/hostapd
echo "Building hostapd (AS)" echo "Building hostapd (AS)"
make -j8 hostapd > /dev/null make -j8 hostapd hostapd_cli > /dev/null
cd $TMPDIR/alt-hlr_auc_gw/hostapd cd $TMPDIR/alt-hlr_auc_gw/hostapd
echo "Building hlr_auc_gw" echo "Building hlr_auc_gw"