From 185275228de4ca3cce826526713c749d28100aee Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Fri, 26 Dec 2014 12:49:36 +0200
Subject: [PATCH] tests: Use QUIET=1 option to make build.sh output much
 shorter

Report only fatal errors when building binaries for hwsim testing.

Signed-off-by: Jouni Malinen <j@w1.fi>
---
 tests/hwsim/build.sh     | 22 ++++++++++++++--------
 tests/hwsim/tnc/Makefile | 14 +++++++++++++-
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/tests/hwsim/build.sh b/tests/hwsim/build.sh
index f450af7e0..dd0ddba36 100755
--- a/tests/hwsim/build.sh
+++ b/tests/hwsim/build.sh
@@ -26,6 +26,7 @@ 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
@@ -41,9 +42,10 @@ if [ $use_lcov -eq 1 ]; then
     fi
 fi
 
-make clean
-make -j8
+make clean > /dev/null
+make QUIET=1 -j8
 
+echo "Building hostapd"
 cd ../hostapd
 if [ ! -e .config -o $force_config -eq 1 ]; then
     cp ../tests/hwsim/example-hostapd.config .config
@@ -59,12 +61,16 @@ if [ $use_lcov -eq 1 ]; then
     fi
 fi
 
-make clean
-make -j8 hostapd hostapd_cli hlr_auc_gw
+make clean > /dev/null
+make QUIET=1 -j8 hostapd hostapd_cli hlr_auc_gw
+
+echo "Building wlantest"
 cd ../wlantest
-make clean
-make -j8
+make clean > /dev/null
+make QUIET=1 -j8 > /dev/null
+
+echo "Building TNC testing tools"
 cd ../tests/hwsim/tnc
-make clean
-make -j8
+make clean > /dev/null
+make QUIET=1 -j8
 cd ..
diff --git a/tests/hwsim/tnc/Makefile b/tests/hwsim/tnc/Makefile
index 693fbeee0..64ba0cac6 100644
--- a/tests/hwsim/tnc/Makefile
+++ b/tests/hwsim/tnc/Makefile
@@ -4,8 +4,20 @@ CFLAGS += -I$(abspath ../../../src/utils)
 ALL=libhostap_imc.so libhostap_imv.so libhostap2_imc.so libhostap2_imv.so
 all: $(ALL)
 
+Q=@
+E=echo
+ifeq ($(V), 1)
+Q=
+E=true
+endif
+ifeq ($(QUIET), 1)
+Q=@
+E=true
+endif
+
 lib%.so: %.c
-	$(CC) $(LDFLAGS) -o $@ $(CFLAGS) -shared -rdynamic -fPIC $<
+	$(Q)$(CC) $(LDFLAGS) -o $@ $(CFLAGS) -shared -rdynamic -fPIC $<
+	@$(E) "  CC " $@
 
 clean:
 	rm -f $(ALL)