tests: rename engine `nitg` to `nitg-g` ; alias `nitg` to `nitg-s`

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/tests/Makefile b/tests/Makefile
index 98c6b72..42c6c72 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,9 +1,9 @@
 
 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/nitmetrics.nit ../src/nitg.nit
 
-all: separate niti nitg nitg-s
+all: separate niti nitg-g nitg-s
 
-alot: 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
+alot: separate global 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
 
 separate:
        ./testfull.sh
@@ -17,8 +17,8 @@ global:
 niti:
        ./testfull.sh --engine niti
 
-nitg:
-       ./testfull.sh --engine nitg
+nitg-g:
+       ./testfull.sh --engine nitg-g
 
 nitg-s:
        ./testfull.sh --engine nitg-s

diff --git a/tests/nitg.skip b/tests/nitg-g.skip
similarity index 100%
rename from tests/nitg.skip
rename to tests/nitg-g.skip

diff --git a/tests/sav/nitg/base_isa1.res b/tests/sav/nitg-g/base_isa1.res
similarity index 100%
rename from tests/sav/nitg/base_isa1.res
rename to tests/sav/nitg-g/base_isa1.res

diff --git a/tests/sav/nitg/base_isa_gen1.sav b/tests/sav/nitg-g/base_isa_gen1.sav
similarity index 100%
rename from tests/sav/nitg/base_isa_gen1.sav
rename to tests/sav/nitg-g/base_isa_gen1.sav

diff --git a/tests/sav/nitg/base_isa_vt_gen1.res b/tests/sav/nitg-g/base_isa_vt_gen1.res
similarity index 100%
rename from tests/sav/nitg/base_isa_vt_gen1.res
rename to tests/sav/nitg-g/base_isa_vt_gen1.res

diff --git a/tests/sav/nitg/base_super_linext_raf.res b/tests/sav/nitg-g/base_super_linext_raf.res
similarity index 100%
rename from tests/sav/nitg/base_super_linext_raf.res
rename to tests/sav/nitg-g/base_super_linext_raf.res

diff --git a/tests/sav/nitg/fixme/base_attr_gen_alt1.res b/tests/sav/nitg-g/fixme/base_attr_gen_alt1.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_attr_gen_alt1.res
rename to tests/sav/nitg-g/fixme/base_attr_gen_alt1.res

diff --git a/tests/sav/nitg/fixme/base_attr_init_val_raf_alt1.res b/tests/sav/nitg-g/fixme/base_attr_init_val_raf_alt1.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_attr_init_val_raf_alt1.res
rename to tests/sav/nitg-g/fixme/base_attr_init_val_raf_alt1.res

diff --git a/tests/sav/nitg/fixme/base_attr_nullable_int_alt1.res b/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt1.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_attr_nullable_int_alt1.res
rename to tests/sav/nitg-g/fixme/base_attr_nullable_int_alt1.res

diff --git a/tests/sav/nitg/fixme/base_attr_nullable_int_alt2.res b/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt2.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_attr_nullable_int_alt2.res
rename to tests/sav/nitg-g/fixme/base_attr_nullable_int_alt2.res

diff --git a/tests/sav/nitg/fixme/base_attr_nullable_int_alt3.res b/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt3.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_attr_nullable_int_alt3.res
rename to tests/sav/nitg-g/fixme/base_attr_nullable_int_alt3.res

diff --git a/tests/sav/nitg/fixme/base_attr_nullable_int_alt4.res b/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt4.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_attr_nullable_int_alt4.res
rename to tests/sav/nitg-g/fixme/base_attr_nullable_int_alt4.res

diff --git a/tests/sav/nitg/fixme/base_attr_nullable_int_alt5.res b/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt5.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_attr_nullable_int_alt5.res
rename to tests/sav/nitg-g/fixme/base_attr_nullable_int_alt5.res

diff --git a/tests/sav/nitg/fixme/base_conflict_submodule_name.res b/tests/sav/nitg-g/fixme/base_conflict_submodule_name.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_conflict_submodule_name.res
rename to tests/sav/nitg-g/fixme/base_conflict_submodule_name.res

diff --git a/tests/sav/nitg/fixme/base_conflict_submodule_name_alt1.res b/tests/sav/nitg-g/fixme/base_conflict_submodule_name_alt1.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_conflict_submodule_name_alt1.res
rename to tests/sav/nitg-g/fixme/base_conflict_submodule_name_alt1.res

diff --git a/tests/sav/nitg/fixme/base_conflict_submodule_name_alt2.res b/tests/sav/nitg-g/fixme/base_conflict_submodule_name_alt2.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_conflict_submodule_name_alt2.res
rename to tests/sav/nitg-g/fixme/base_conflict_submodule_name_alt2.res

diff --git a/tests/sav/nitg/fixme/base_covar_gen_alt3.res b/tests/sav/nitg-g/fixme/base_covar_gen_alt3.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_covar_gen_alt3.res
rename to tests/sav/nitg-g/fixme/base_covar_gen_alt3.res

diff --git a/tests/sav/nitg/fixme/base_covar_int2_alt1.res b/tests/sav/nitg-g/fixme/base_covar_int2_alt1.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_covar_int2_alt1.res
rename to tests/sav/nitg-g/fixme/base_covar_int2_alt1.res

diff --git a/tests/sav/nitg/fixme/base_covar_int2_alt3.res b/tests/sav/nitg-g/fixme/base_covar_int2_alt3.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_covar_int2_alt3.res
rename to tests/sav/nitg-g/fixme/base_covar_int2_alt3.res

diff --git a/tests/sav/nitg/fixme/base_covar_int2_alt5.res b/tests/sav/nitg-g/fixme/base_covar_int2_alt5.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_covar_int2_alt5.res
rename to tests/sav/nitg-g/fixme/base_covar_int2_alt5.res

diff --git a/tests/sav/nitg/fixme/base_gen_infinite.res b/tests/sav/nitg-g/fixme/base_gen_infinite.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_gen_infinite.res
rename to tests/sav/nitg-g/fixme/base_gen_infinite.res

diff --git a/tests/sav/nitg/fixme/base_gen_reassign_alt1.res b/tests/sav/nitg-g/fixme/base_gen_reassign_alt1.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_gen_reassign_alt1.res
rename to tests/sav/nitg-g/fixme/base_gen_reassign_alt1.res

diff --git a/tests/sav/nitg/fixme/base_gen_reassign_alt2.res b/tests/sav/nitg-g/fixme/base_gen_reassign_alt2.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_gen_reassign_alt2.res
rename to tests/sav/nitg-g/fixme/base_gen_reassign_alt2.res

diff --git a/tests/sav/nitg/fixme/base_gen_reassign_alt4.res b/tests/sav/nitg-g/fixme/base_gen_reassign_alt4.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_gen_reassign_alt4.res
rename to tests/sav/nitg-g/fixme/base_gen_reassign_alt4.res

diff --git a/tests/sav/nitg/fixme/base_gen_reassign_alt5.res b/tests/sav/nitg-g/fixme/base_gen_reassign_alt5.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_gen_reassign_alt5.res
rename to tests/sav/nitg-g/fixme/base_gen_reassign_alt5.res

diff --git a/tests/sav/nitg/fixme/base_gen_reassign_alt6.res b/tests/sav/nitg-g/fixme/base_gen_reassign_alt6.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_gen_reassign_alt6.res
rename to tests/sav/nitg-g/fixme/base_gen_reassign_alt6.res

diff --git a/tests/sav/nitg/fixme/base_gen_variance_int_alt1.res b/tests/sav/nitg-g/fixme/base_gen_variance_int_alt1.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_gen_variance_int_alt1.res
rename to tests/sav/nitg-g/fixme/base_gen_variance_int_alt1.res

diff --git a/tests/sav/nitg/fixme/base_vararg2.res b/tests/sav/nitg-g/fixme/base_vararg2.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_vararg2.res
rename to tests/sav/nitg-g/fixme/base_vararg2.res

diff --git a/tests/sav/nitg/fixme/base_vararg2_alt1.res b/tests/sav/nitg-g/fixme/base_vararg2_alt1.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_vararg2_alt1.res
rename to tests/sav/nitg-g/fixme/base_vararg2_alt1.res

diff --git a/tests/sav/nitg/fixme/base_vararg2_alt2.res b/tests/sav/nitg-g/fixme/base_vararg2_alt2.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_vararg2_alt2.res
rename to tests/sav/nitg-g/fixme/base_vararg2_alt2.res

diff --git a/tests/sav/nitg/fixme/base_vararg2_alt3.res b/tests/sav/nitg-g/fixme/base_vararg2_alt3.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_vararg2_alt3.res
rename to tests/sav/nitg-g/fixme/base_vararg2_alt3.res

diff --git a/tests/sav/nitg/fixme/base_vararg2_alt4.res b/tests/sav/nitg-g/fixme/base_vararg2_alt4.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_vararg2_alt4.res
rename to tests/sav/nitg-g/fixme/base_vararg2_alt4.res

diff --git a/tests/sav/nitg/fixme/base_vararg2_alt5.res b/tests/sav/nitg-g/fixme/base_vararg2_alt5.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_vararg2_alt5.res
rename to tests/sav/nitg-g/fixme/base_vararg2_alt5.res

diff --git a/tests/sav/nitg/fixme/base_virtual_int2_alt2.res b/tests/sav/nitg-g/fixme/base_virtual_int2_alt2.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_virtual_int2_alt2.res
rename to tests/sav/nitg-g/fixme/base_virtual_int2_alt2.res

diff --git a/tests/sav/nitg/fixme/base_virtual_type_variance_int_alt1.res b/tests/sav/nitg-g/fixme/base_virtual_type_variance_int_alt1.res
similarity index 100%
rename from tests/sav/nitg/fixme/base_virtual_type_variance_int_alt1.res
rename to tests/sav/nitg-g/fixme/base_virtual_type_variance_int_alt1.res

diff --git a/tests/testall.sh b/tests/testall.sh
index 95339bc..07b1296 100755 (executable)
--- a/tests/testall.sh
+++ b/tests/testall.sh
@@ -1,4 +1,4 @@
-for x in nitc nitg nitg-s nitg-e niti; do
+for x in nitc nitg-g nitg-s nitg-e niti; do
        echo "--engine $x"
        ./tests.sh --engine $x "$@"
 done

diff --git a/tests/tests.sh b/tests/tests.sh
index 65ef4e1..5ea4456 100755 (executable)
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -252,9 +252,10 @@ done
 enginebinname=$engine
 case $engine in
        nitc) ;;
-       nitg) OPT="--global $OPT";;
+       nitg) engine=nitg-s; enginebinname=nitg; OPT="--separate $OPT";;
        nitg-s) enginebinname=nitg; OPT="--separate $OPT";;
        nitg-e) enginebinname=nitg; OPT="--erasure $OPT";;
+       nitg-g) enginebinname=nitg; OPT="--global $OPT";;
        nit) engine=niti ;;
        niti) enginebinname=nit ;;
 esac