X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile;h=d78686bef8468ff855d406cedd8ce36b46998a4b;hb=eff15be7c050cd7c614b52b997161558bfbc7ab9;hp=c283ec62ff5d6796d577b2562815061658c59814;hpb=6afcf1f9b14d9ad0111daea549cb0db5bf7f9009;p=tpg%2Facess2.git

diff --git a/Makefile b/Makefile
index c283ec62..d78686be 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,8 @@
 
 .PHONY: all clean SyscallList all-user
 
-SUBMAKE = $(MAKE) --no-print-directory
+SUBMAKE = $(MAKE)
+# --no-print-directory
 
 USRLIBS := crt0.o acess.ld ld-acess.so libc.so libc++.so libposix.so
 USRLIBS += libreadline.so libnet.so liburi.so libpsocket.so
@@ -66,20 +67,26 @@ all-install:	install-Filesystem SyscallList ai-user ai-kmode
 clean:	clean-kmode clean-user
 install:	install-Filesystem SyscallList install-user install-kmode
 
-utest: $(USRLIBS:%=utest-%)
+utest-build: $(USRLIBS:%=utest-build-%)
+utest-run: $(USRLIBS:%=utest-run-%)
+utest: utest-build utest-run
 
-$(USRLIBS:%=utest-%): utest-%:
+utest-build-%:
 	@CC=$(NCC) $(SUBMAKE) -C Usermode/Libraries/$*_src generate_exp
-	@CC=$(NCC) $(SUBMAKE) -C Usermode/Libraries/$*_src utest -k
+	@CC=$(NCC) $(SUBMAKE) -C Usermode/Libraries/$*_src utest-build
+utest-run-%:
+	@CC=$(NCC) $(SUBMAKE) -C Usermode/Libraries/$*_src utest-run -k
 
 # TODO: Module tests using DiskTool and NetTest
-mtest: mtest-Network
+mtest: mtest-build mtest-run
 	@echo > /dev/null
-
-mtest-Network:
-	@$(SUBMAKE) -C Tools/nativelib
-	@$(SUBMAKE) -C Tools/NetTest
-	@$(SUBMAKE) -C Tools/NetTest_Runner
+mtest-build:
+	# Network
+	@CC=$(NCC) $(SUBMAKE) -C Tools/nativelib
+	@CC=$(NCC) $(SUBMAKE) -C Tools/NetTest
+	@CC=$(NCC) $(SUBMAKE) -C Tools/NetTest_Runner
+mtest-run:
+	@echo "=== Network Module Test ==="
 	@cd Tools && ./nettest_runner
 
 SyscallList: include/syscalls.h