Makefile - Fix mtest target (and clean up utest targets)

[tpg/acess2.git] / Makefile

diff --git a/Makefile b/Makefile
index c283ec6..d78686b 100644 (file)
--- 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