X-Git-Url: http://nitlanguage.org

diff --git a/tests/Makefile b/tests/Makefile
index bc2295a..29e9937 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,52 +1,42 @@
 
-PROGS=*.nit ../examples/*.nit ../examples/leapfrog/leapfrog.nit ../examples/shoot/shoot_logic.nit ../lib/*.nit ../src/nitdoc.nit ../src/nits.nit ../src/nitc.nit ../src/test_parser.nit ../src/nit.nit ../src/nitstats.nit ../src/nitg.nit
+PROGS=*.nit ../examples/*.nit ../examples/leapfrog/leapfrog.nit ../examples/shoot/shoot_logic.nit ../contrib/pep8analysis/src/pep8analysis ../contrib/nitiwiki/src/nitiwiki ../lib/*.nit ../src/nitdoc.nit ../src/test_parser.nit ../src/nit.nit ../src/nitmetrics.nit ../src/nitc.nit
 
-all: separate global niti nitg nitg-s nitg-s-bm nitg-s-phmod nitg-s-phand nitg-e nitg-e-bm nitg-e-phmod nitg-e-phand icode
+all: niti nitcg nitcs
 
-separate:
-	./tests.sh ${PROGS}
+alot: niti nitcg nitcs nitcs-bm nitcs-phmod nitcs-phand nitce nitce-bm nitce-phmod nitce-phand icode
 
 some:
 	./tests.sh base_compile.nit base_attr.nit base_gen.nit test_gen_inh.nit bench_fib.nit example_objet.nit
 
-global:
-	./tests.sh -o --global ${PROGS}
-
 niti:
-	./tests.sh --engine niti ${PROGS}
-
-nitg:
-	./tests.sh --engine nitg ${PROGS}
+	./testfull.sh --engine niti
 
-nitg-s:
-	./tests.sh --engine nitg-s *.nit
+nitcg:
+	./testfull.sh --engine nitcg
 
-nitg-s-bm:
-	./tests.sh --engine nitg-s -o --bm-typing *.nit
+nitcs:
+	./testfull.sh --engine nitcs
 
-nitg-s-phmod:
-	./tests.sh --engine nitg-s -o --phmod-typing *.nit
+nitcs-bm:
+	./testfull.sh --engine nitcs -o --bm-typing
 
-nitg-s-phand:
-	./tests.sh --engine nitg-s -o --phand-typing *.nit
+nitcs-phmod:
+	./testfull.sh --engine nitcs -o --phmod-typing
 
-nitg-e:
-	./tests.sh --engine nitg-e ${PROGS}
+nitcs-phand:
+	./testfull.sh --engine nitcs -o --phand-typing
 
-nitg-e-bm:
-	./tests.sh --engine nitg-e -o --bm-typing ${PROGS}
+nitce:
+	./testfull.sh --engine nitce
 
-nitg-e-phmod:
-	./tests.sh --engine nitg-e -o --phmod-typing ${PROGS}
+nitce-bm:
+	./testfull.sh --engine nitce -o --bm-typing
 
-nitg-e-phand:
-	./tests.sh --engine nitg-e -o --phand-typing ${PROGS}
+nitce-phmod:
+	./testfull.sh --engine nitce -o --phmod-typing
 
-nitdoc:
-	./tests.sh ../src/nitdoc.nit
-
-icode:
-	./tests_icode.sh icode*.nit
+nitce-phand:
+	./testfull.sh --engine nitce -o --phand-typing
 
 failed:
 	@[ ! -s errlist ] && echo 'No failed tests to execute' ; true
@@ -56,6 +46,4 @@ store:
 	./store_save.sh *.nit
 
 clean:
-	rm -r -f -- out/ alt .nit_compile errlist 2> /dev/null || true
-
-distclean: clean
+	rm -r -f -- out/ alt nit_compile errlist errlist.bak *.xml 2> /dev/null || true