From e67143f45c221a11825e573c77ca0de0163fe7be Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Fri, 23 May 2014 08:21:05 +0800
Subject: [PATCH] Tests - Cleanup (disabling TCP Window Size module test)

---
 Tools/NetTest_Runner/main.c     |  2 +-
 Usermode/Libraries/Makefile.tpl | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Tools/NetTest_Runner/main.c b/Tools/NetTest_Runner/main.c
index 57ac080e..05b455f8 100644
--- a/Tools/NetTest_Runner/main.c
+++ b/Tools/NetTest_Runner/main.c
@@ -26,7 +26,7 @@ int main(int argc, char *argv[])
 	t_test	*tests[] = {
 		Test_ARP_Basic,
 		Test_TCP_Basic,
-		Test_TCP_WindowSizes,
+		//Test_TCP_WindowSizes,
 		Test_TCP_Reset,
 		NULL
 		};
diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index 79bb8456..d04a6ff7 100644
--- a/Usermode/Libraries/Makefile.tpl
+++ b/Usermode/Libraries/Makefile.tpl
@@ -65,7 +65,8 @@ utest-run: $(UTESTS:%=runtest-%)
 	@echo > /dev/null
 
 $(UTESTS:%=runtest-%): runtest-%: TEST_% EXP_%.txt
-	./TEST_$* | diff EXP_$*.txt -
+	@echo --- [TEST] $*
+	@./TEST_$* | diff EXP_$*.txt -
 
 clean:
 	$(RM) $(_BIN) $(_XBIN) $(OBJ) $(_BIN).dsm $(DEPFILES) $(EXTRACLEAN)
@@ -117,12 +118,14 @@ $(OUTPUTDIR)Libs/%:
 
 obj-native/%.no: %.c
 	@mkdir -p $(dir $@)
-	$(NCC) -g -c $< -o $@ -Wall -std=gnu99 -MD -MP -MF $@.dep '-D_SysDebug(f,v...)=fprintf(stderr,"DEBUG "f"\n",##v)' -include stdio.h
+	@echo [CC Native] -o $@
+	@$(NCC) -g -c $< -o $@ -Wall -std=gnu99 -MD -MP -MF $@.dep '-D_SysDebug(f,v...)=fprintf(stderr,"DEBUG "f"\n",##v)' -include stdio.h
 
 TEST_%: obj-native/TEST_%.no obj-native/%.no
-	$(NCC) -g -o $@ $^
+	@echo [CC Native] -o $@
+	@$(NCC) -g -o $@ $^
 
-.SECONDARY: %.no
+.PRECIOUS: $(UTESTS:%=obj-native/%.no) $(UTESTS:%=obj-native/TEST_%.no)
 
 -include $(UTESTS:%=obj-native/TEST_%.no.dep)
 -include $(UTESTS:%=obj-native/%.no.dep)
-- 
2.20.1