From 7fe84009f8acffdb126b1f4602e8375dc8313b8d Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Fri, 26 Dec 2014 12:51:54 +0200
Subject: [PATCH] tests: Reorder build.sh operations

This leaves the build tree with valid wpa_supplicant object files in the
end and makes it a bit easier to do additional custom builds when
needed.

Signed-off-by: Jouni Malinen <j@w1.fi>
---
 tests/hwsim/build.sh | 45 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/tests/hwsim/build.sh b/tests/hwsim/build.sh
index dd0ddba36..301c330d2 100755
--- a/tests/hwsim/build.sh
+++ b/tests/hwsim/build.sh
@@ -26,25 +26,16 @@ while [ "$1" != "" ]; do
 	esac
 done
 
-echo "Building wpa_supplicant"
-cd ../../wpa_supplicant
-if [ ! -e .config -o $force_config -eq 1 ]; then
-    cp ../tests/hwsim/example-wpa_supplicant.config .config
-else
-    echo "wpa_supplicant config file exists"
-fi
-
-if [ $use_lcov -eq 1 ]; then
-    if ! grep -q CONFIG_CODE_COVERAGE .config; then
-	    echo CONFIG_CODE_COVERAGE=y >> .config
-    else
-	    echo "CONFIG_CODE_COVERAGE already exists in wpa_supplicant/.config. Ignore"
-    fi
-fi
-
+echo "Building TNC testing tools"
+cd tnc
 make clean > /dev/null
 make QUIET=1 -j8
 
+echo "Building wlantest"
+cd ../../../wlantest
+make clean > /dev/null
+make QUIET=1 -j8 > /dev/null
+
 echo "Building hostapd"
 cd ../hostapd
 if [ ! -e .config -o $force_config -eq 1 ]; then
@@ -64,13 +55,21 @@ fi
 make clean > /dev/null
 make QUIET=1 -j8 hostapd hostapd_cli hlr_auc_gw
 
-echo "Building wlantest"
-cd ../wlantest
-make clean > /dev/null
-make QUIET=1 -j8 > /dev/null
+echo "Building wpa_supplicant"
+cd ../wpa_supplicant
+if [ ! -e .config -o $force_config -eq 1 ]; then
+    cp ../tests/hwsim/example-wpa_supplicant.config .config
+else
+    echo "wpa_supplicant config file exists"
+fi
+
+if [ $use_lcov -eq 1 ]; then
+    if ! grep -q CONFIG_CODE_COVERAGE .config; then
+	    echo CONFIG_CODE_COVERAGE=y >> .config
+    else
+	    echo "CONFIG_CODE_COVERAGE already exists in wpa_supplicant/.config. Ignore"
+    fi
+fi
 
-echo "Building TNC testing tools"
-cd ../tests/hwsim/tnc
 make clean > /dev/null
 make QUIET=1 -j8
-cd ..