contracts: change the contract syntax

[nit.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index dd8cb87..07b39b1 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,9 +1,7 @@
 
-PROGS=*.nit ../examples/*.nit ../examples/leapfrog/leapfrog.nit ../examples/shoot/shoot_logic.nit ../contrib/pep8analysis/src/pep8analysis ../lib/*.nit ../src/nitdoc.nit ../src/test_parser.nit ../src/nit.nit ../src/nitmetrics.nit ../src/nitg.nit
+all: niti nitcg nitcs
 
-all: niti nitg-g nitg-s
-
-alot: niti nitg-g nitg-s nitg-s-bm nitg-s-phmod nitg-s-phand nitg-e nitg-e-bm nitg-e-phmod nitg-e-phand icode
+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
@@ -11,32 +9,32 @@ some:
 niti:
        ./testfull.sh --engine niti
 
-nitg-g:
-       ./testfull.sh --engine nitg-g
+nitcg:
+       ./testfull.sh --engine nitcg
 
-nitg-s:
-       ./testfull.sh --engine nitg-s
+nitcs:
+       ./testfull.sh --engine nitcs
 
-nitg-s-bm:
-       ./testfull.sh --engine nitg-s -o --bm-typing
+nitcs-bm:
+       ./testfull.sh --engine nitcs -o --bm-typing
 
-nitg-s-phmod:
-       ./testfull.sh --engine nitg-s -o --phmod-typing
+nitcs-phmod:
+       ./testfull.sh --engine nitcs -o --phmod-typing
 
-nitg-s-phand:
-       ./testfull.sh --engine nitg-s -o --phand-typing
+nitcs-phand:
+       ./testfull.sh --engine nitcs -o --phand-typing
 
-nitg-e:
-       ./testfull.sh --engine nitg-e
+nitce:
+       ./testfull.sh --engine nitce
 
-nitg-e-bm:
-       ./testfull.sh --engine nitg-e -o --bm-typing
+nitce-bm:
+       ./testfull.sh --engine nitce -o --bm-typing
 
-nitg-e-phmod:
-       ./testfull.sh --engine nitg-e -o --phmod-typing
+nitce-phmod:
+       ./testfull.sh --engine nitce -o --phmod-typing
 
-nitg-e-phand:
-       ./testfull.sh --engine nitg-e -o --phand-typing
+nitce-phand:
+       ./testfull.sh --engine nitce -o --phand-typing
 
 failed:
        @[ ! -s errlist ] && echo 'No failed tests to execute' ; true
@@ -46,6 +44,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