tests: rename compiler engines with `nitc*`, not `nitg*`

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

diff --git a/tests/Makefile b/tests/Makefile
index 12c5bcb..29e9937 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 ../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: niti nitg-g nitg-s
+all: niti nitcg nitcs
 
-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 +11,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

diff --git a/tests/README.md b/tests/README.md
index 578880a..5a6f51c 100644 (file)
--- a/tests/README.md
+++ b/tests/README.md
@@ -208,18 +208,18 @@ Use the various skipping or controls to try to produce reproducible results.
 Engines are selected with the option `--engine`.
 
 ~~~
-./tests.sh --engine nitg-e base_class_name.nit
+./tests.sh --engine nitce base_class_name.nit
 ~~~
 
 Current engines are:
 
-* `nitg-s`, for `nitg --separate` (this is the default)
-* `nitg-e`, for `nitg --erasure`
-* `nitg-sg`, for `nitg --separate --semi-global`
-* `nitg-g`, for `nitg --global`
+* `nitcs`, for `nitc --separate` (this is the default)
+* `nitce`, for `nitc --erasure`
+* `nitcsg`, for `nitc --separate --semi-global`
+* `nitcg`, for `nitc --global`
 * `niti`, for `nit`, the interpreter
-* `nitvm`, for `nitvm` (not automatically executed by `testall.sh`)
-* `emscripten`, for `nitg --semi-global -m emscripten` (not automatically executed by `testall.sh`)
+* `nitvm`, for `nit --vm`, the virtual machine
+* `emscripten`, for `nitc --semi-global -m emscripten` (not automatically executed by `testall.sh`)
 
 Engines control:
 

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

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

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

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

diff --git a/tests/sav/nitg-common/fixme/base_attr_init_val_int_alt1.res b/tests/sav/nitc-common/fixme/base_attr_init_val_int_alt1.res
similarity index 100%
rename from tests/sav/nitg-common/fixme/base_attr_init_val_int_alt1.res
rename to tests/sav/nitc-common/fixme/base_attr_init_val_int_alt1.res

diff --git a/tests/sav/nitg-common/fixme/base_attr_init_val_int_alt2.res b/tests/sav/nitc-common/fixme/base_attr_init_val_int_alt2.res
similarity index 100%
rename from tests/sav/nitg-common/fixme/base_attr_init_val_int_alt2.res
rename to tests/sav/nitc-common/fixme/base_attr_init_val_int_alt2.res

diff --git a/tests/sav/nitg-common/fixme/base_attr_init_val_int_alt3.res b/tests/sav/nitc-common/fixme/base_attr_init_val_int_alt3.res
similarity index 100%
rename from tests/sav/nitg-common/fixme/base_attr_init_val_int_alt3.res
rename to tests/sav/nitc-common/fixme/base_attr_init_val_int_alt3.res

diff --git a/tests/sav/nitg-common/fixme/base_attr_init_val_int_alt4.res b/tests/sav/nitc-common/fixme/base_attr_init_val_int_alt4.res
similarity index 100%
rename from tests/sav/nitg-common/fixme/base_attr_init_val_int_alt4.res
rename to tests/sav/nitc-common/fixme/base_attr_init_val_int_alt4.res

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

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

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

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

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

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

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

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

diff --git a/tests/sav/nitg-common/fixme/base_covar_int_alt3.res b/tests/sav/nitc-common/fixme/base_covar_int_alt3.res
similarity index 100%
rename from tests/sav/nitg-common/fixme/base_covar_int_alt3.res
rename to tests/sav/nitc-common/fixme/base_covar_int_alt3.res

diff --git a/tests/sav/nitg-common/fixme/base_for_finish.res b/tests/sav/nitc-common/fixme/base_for_finish.res
similarity index 100%
rename from tests/sav/nitg-common/fixme/base_for_finish.res
rename to tests/sav/nitc-common/fixme/base_for_finish.res

diff --git a/tests/sav/nitg-common/fixme/base_with_alt1.res b/tests/sav/nitc-common/fixme/base_with_alt1.res
similarity index 100%
rename from tests/sav/nitg-common/fixme/base_with_alt1.res
rename to tests/sav/nitc-common/fixme/base_with_alt1.res

diff --git a/tests/sav/nitg-e/base_autocast_alt1.res b/tests/sav/nitce/base_autocast_alt1.res
similarity index 100%
rename from tests/sav/nitg-e/base_autocast_alt1.res
rename to tests/sav/nitce/base_autocast_alt1.res

diff --git a/tests/sav/nitg-e/base_autocast_array_alt2.res b/tests/sav/nitce/base_autocast_array_alt2.res
similarity index 100%
rename from tests/sav/nitg-e/base_autocast_array_alt2.res
rename to tests/sav/nitce/base_autocast_array_alt2.res

diff --git a/tests/sav/nitg-e/base_class_name.res b/tests/sav/nitce/base_class_name.res
similarity index 100%
rename from tests/sav/nitg-e/base_class_name.res
rename to tests/sav/nitce/base_class_name.res

diff --git a/tests/sav/nitg-e/base_gen_variance2_alt1.res b/tests/sav/nitce/base_gen_variance2_alt1.res
similarity index 100%
rename from tests/sav/nitg-e/base_gen_variance2_alt1.res
rename to tests/sav/nitce/base_gen_variance2_alt1.res

diff --git a/tests/sav/nitg-e/base_gen_variance2_alt2.res b/tests/sav/nitce/base_gen_variance2_alt2.res
similarity index 100%
rename from tests/sav/nitg-e/base_gen_variance2_alt2.res
rename to tests/sav/nitce/base_gen_variance2_alt2.res

diff --git a/tests/sav/nitg-e/base_gen_variance_alt3.res b/tests/sav/nitce/base_gen_variance_alt3.res
similarity index 100%
rename from tests/sav/nitg-e/base_gen_variance_alt3.res
rename to tests/sav/nitce/base_gen_variance_alt3.res

diff --git a/tests/sav/nitg-e/base_gen_variance_alt5.res b/tests/sav/nitce/base_gen_variance_alt5.res
similarity index 100%
rename from tests/sav/nitg-e/base_gen_variance_alt5.res
rename to tests/sav/nitce/base_gen_variance_alt5.res

diff --git a/tests/sav/nitg-e/base_gen_variance_alt6.res b/tests/sav/nitce/base_gen_variance_alt6.res
similarity index 100%
rename from tests/sav/nitg-e/base_gen_variance_alt6.res
rename to tests/sav/nitce/base_gen_variance_alt6.res

diff --git a/tests/sav/nitg-e/base_gen_variance_alt7.res b/tests/sav/nitce/base_gen_variance_alt7.res
similarity index 100%
rename from tests/sav/nitg-e/base_gen_variance_alt7.res
rename to tests/sav/nitce/base_gen_variance_alt7.res

diff --git a/tests/sav/nitg-e/base_gen_variance_alt8.res b/tests/sav/nitce/base_gen_variance_alt8.res
similarity index 100%
rename from tests/sav/nitg-e/base_gen_variance_alt8.res
rename to tests/sav/nitce/base_gen_variance_alt8.res

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

diff --git a/tests/sav/nitg-e/base_isa_gen4.res b/tests/sav/nitce/base_isa_gen4.res
similarity index 100%
rename from tests/sav/nitg-e/base_isa_gen4.res
rename to tests/sav/nitce/base_isa_gen4.res

diff --git a/tests/sav/nitg-e/base_isa_gen5.res b/tests/sav/nitce/base_isa_gen5.res
similarity index 100%
rename from tests/sav/nitg-e/base_isa_gen5.res
rename to tests/sav/nitce/base_isa_gen5.res

diff --git a/tests/sav/nitg-e/base_isa_gen7.res b/tests/sav/nitce/base_isa_gen7.res
similarity index 100%
rename from tests/sav/nitg-e/base_isa_gen7.res
rename to tests/sav/nitce/base_isa_gen7.res

diff --git a/tests/sav/nitg-e/base_isa_nullable1.res b/tests/sav/nitce/base_isa_nullable1.res
similarity index 100%
rename from tests/sav/nitg-e/base_isa_nullable1.res
rename to tests/sav/nitce/base_isa_nullable1.res

diff --git a/tests/sav/nitg-e/base_isa_nullable2.res b/tests/sav/nitce/base_isa_nullable2.res
similarity index 100%
rename from tests/sav/nitg-e/base_isa_nullable2.res
rename to tests/sav/nitce/base_isa_nullable2.res

diff --git a/tests/sav/nitg-e/base_isa_vt3.res b/tests/sav/nitce/base_isa_vt3.res
similarity index 100%
rename from tests/sav/nitg-e/base_isa_vt3.res
rename to tests/sav/nitce/base_isa_vt3.res

diff --git a/tests/sav/nitg-e/base_isa_vt_ft.res b/tests/sav/nitce/base_isa_vt_ft.res
similarity index 100%
rename from tests/sav/nitg-e/base_isa_vt_ft.res
rename to tests/sav/nitce/base_isa_vt_ft.res

diff --git a/tests/sav/nitg-e/base_notnull_lit.res b/tests/sav/nitce/base_notnull_lit.res
similarity index 100%
rename from tests/sav/nitg-e/base_notnull_lit.res
rename to tests/sav/nitce/base_notnull_lit.res

diff --git a/tests/sav/nitg-e/base_output_class_name.res b/tests/sav/nitce/base_output_class_name.res
similarity index 100%
rename from tests/sav/nitg-e/base_output_class_name.res
rename to tests/sav/nitce/base_output_class_name.res

diff --git a/tests/sav/nitg-e/base_self_type.res b/tests/sav/nitce/base_self_type.res
similarity index 100%
rename from tests/sav/nitg-e/base_self_type.res
rename to tests/sav/nitce/base_self_type.res

diff --git a/tests/sav/nitg-e/base_self_type_alt2.res b/tests/sav/nitce/base_self_type_alt2.res
similarity index 100%
rename from tests/sav/nitg-e/base_self_type_alt2.res
rename to tests/sav/nitce/base_self_type_alt2.res

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

diff --git a/tests/sav/nitg-e/fixme/base_covar_gen_1alt1_alt1.res b/tests/sav/nitce/fixme/base_covar_gen_1alt1_alt1.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_covar_gen_1alt1_alt1.res
rename to tests/sav/nitce/fixme/base_covar_gen_1alt1_alt1.res

diff --git a/tests/sav/nitg-e/fixme/base_covar_gen_1alt1_alt2.res b/tests/sav/nitce/fixme/base_covar_gen_1alt1_alt2.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_covar_gen_1alt1_alt2.res
rename to tests/sav/nitce/fixme/base_covar_gen_1alt1_alt2.res

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

diff --git a/tests/sav/nitg-e/fixme/base_covar_gen_alt4.res b/tests/sav/nitce/fixme/base_covar_gen_alt4.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_covar_gen_alt4.res
rename to tests/sav/nitce/fixme/base_covar_gen_alt4.res

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

diff --git a/tests/sav/nitg-e/fixme/base_covar_int_alt1.res b/tests/sav/nitce/fixme/base_covar_int_alt1.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_covar_int_alt1.res
rename to tests/sav/nitce/fixme/base_covar_int_alt1.res

diff --git a/tests/sav/nitg-e/fixme/base_covar_int_alt5.res b/tests/sav/nitce/fixme/base_covar_int_alt5.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_covar_int_alt5.res
rename to tests/sav/nitce/fixme/base_covar_int_alt5.res

diff --git a/tests/sav/nitg-e/fixme/base_formal_isa.res b/tests/sav/nitce/fixme/base_formal_isa.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_formal_isa.res
rename to tests/sav/nitce/fixme/base_formal_isa.res

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

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

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

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

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

diff --git a/tests/sav/nitg-e/fixme/base_gen_variance3_alt1.res b/tests/sav/nitce/fixme/base_gen_variance3_alt1.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_gen_variance3_alt1.res
rename to tests/sav/nitce/fixme/base_gen_variance3_alt1.res

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

diff --git a/tests/sav/nitg-e/fixme/base_isa_formal_type.res b/tests/sav/nitce/fixme/base_isa_formal_type.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_isa_formal_type.res
rename to tests/sav/nitce/fixme/base_isa_formal_type.res

diff --git a/tests/sav/nitg-e/fixme/base_isa_gen.res b/tests/sav/nitce/fixme/base_isa_gen.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_isa_gen.res
rename to tests/sav/nitce/fixme/base_isa_gen.res

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

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

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

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

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

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

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

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

diff --git a/tests/sav/nitg-e/fixme/converter.res b/tests/sav/nitce/fixme/converter.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/converter.res
rename to tests/sav/nitce/fixme/converter.res

diff --git a/tests/sav/nitg-e/test_array_formal.res b/tests/sav/nitce/test_array_formal.res
similarity index 100%
rename from tests/sav/nitg-e/test_array_formal.res
rename to tests/sav/nitce/test_array_formal.res

diff --git a/tests/sav/nitg-e/test_json_deserialization_alt1.res b/tests/sav/nitce/test_json_deserialization_alt1.res
similarity index 100%
rename from tests/sav/nitg-e/test_json_deserialization_alt1.res
rename to tests/sav/nitce/test_json_deserialization_alt1.res

diff --git a/tests/sav/nitg-e/test_meta.res b/tests/sav/nitce/test_meta.res
similarity index 100%
rename from tests/sav/nitg-e/test_meta.res
rename to tests/sav/nitce/test_meta.res

diff --git a/tests/sav/nitg-e/test_new_native.res b/tests/sav/nitce/test_new_native.res
similarity index 100%
rename from tests/sav/nitg-e/test_new_native.res
rename to tests/sav/nitce/test_new_native.res

diff --git a/tests/sav/nitg-e/test_new_native_alt1.res b/tests/sav/nitce/test_new_native_alt1.res
similarity index 100%
rename from tests/sav/nitg-e/test_new_native_alt1.res
rename to tests/sav/nitce/test_new_native_alt1.res

diff --git a/tests/sav/nitg-e/test_serialization.res b/tests/sav/nitce/test_serialization.res
similarity index 100%
rename from tests/sav/nitg-e/test_serialization.res
rename to tests/sav/nitce/test_serialization.res

diff --git a/tests/sav/nitg-e/test_serialization_alt2.res b/tests/sav/nitce/test_serialization_alt2.res
similarity index 100%
rename from tests/sav/nitg-e/test_serialization_alt2.res
rename to tests/sav/nitce/test_serialization_alt2.res

diff --git a/tests/sav/nitg-e/test_serialization_alt3.res b/tests/sav/nitce/test_serialization_alt3.res
similarity index 100%
rename from tests/sav/nitg-e/test_serialization_alt3.res
rename to tests/sav/nitce/test_serialization_alt3.res

diff --git a/tests/sav/nitg-e/test_serialization_alt4.res b/tests/sav/nitce/test_serialization_alt4.res
similarity index 100%
rename from tests/sav/nitg-e/test_serialization_alt4.res
rename to tests/sav/nitce/test_serialization_alt4.res

diff --git a/tests/sav/nitg-e/test_serialization_alt5.res b/tests/sav/nitce/test_serialization_alt5.res
similarity index 100%
rename from tests/sav/nitg-e/test_serialization_alt5.res
rename to tests/sav/nitce/test_serialization_alt5.res

diff --git a/tests/sav/nitg-e/test_serialization_redef.res b/tests/sav/nitce/test_serialization_redef.res
similarity index 100%
rename from tests/sav/nitg-e/test_serialization_redef.res
rename to tests/sav/nitce/test_serialization_redef.res

diff --git a/tests/sav/nitg-e/test_serialization_redef_alt0.res b/tests/sav/nitce/test_serialization_redef_alt0.res
similarity index 100%
rename from tests/sav/nitg-e/test_serialization_redef_alt0.res
rename to tests/sav/nitce/test_serialization_redef_alt0.res

diff --git a/tests/sav/nitg-e/test_serialization_redef_alt1.res b/tests/sav/nitce/test_serialization_redef_alt1.res
similarity index 100%
rename from tests/sav/nitg-e/test_serialization_redef_alt1.res
rename to tests/sav/nitce/test_serialization_redef_alt1.res

diff --git a/tests/sav/nitg-e/test_serialization_redef_alt2.res b/tests/sav/nitce/test_serialization_redef_alt2.res
similarity index 100%
rename from tests/sav/nitg-e/test_serialization_redef_alt2.res
rename to tests/sav/nitce/test_serialization_redef_alt2.res

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/tests/sav/nitg-s/fixme/base_covar_int_alt1.res b/tests/sav/nitcs/fixme/base_covar_int_alt1.res
similarity index 100%
rename from tests/sav/nitg-s/fixme/base_covar_int_alt1.res
rename to tests/sav/nitcs/fixme/base_covar_int_alt1.res

diff --git a/tests/sav/nitg-s/fixme/base_covar_int_alt5.res b/tests/sav/nitcs/fixme/base_covar_int_alt5.res
similarity index 100%
rename from tests/sav/nitg-s/fixme/base_covar_int_alt5.res
rename to tests/sav/nitcs/fixme/base_covar_int_alt5.res

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

diff --git a/tests/sav/nitg-s/fixme/base_gen_variance3_alt1.res b/tests/sav/nitcs/fixme/base_gen_variance3_alt1.res
similarity index 100%
rename from tests/sav/nitg-s/fixme/base_gen_variance3_alt1.res
rename to tests/sav/nitcs/fixme/base_gen_variance3_alt1.res

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

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

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

diff --git a/tests/sav/nitg-s/fixme/converter.res b/tests/sav/nitcs/fixme/converter.res
similarity index 100%
rename from tests/sav/nitg-s/fixme/converter.res
rename to tests/sav/nitcs/fixme/converter.res

diff --git a/tests/sav/nitg-s/fixme/test_meta.res b/tests/sav/nitcs/fixme/test_meta.res
similarity index 100%
rename from tests/sav/nitg-s/fixme/test_meta.res
rename to tests/sav/nitcs/fixme/test_meta.res

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

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

diff --git a/tests/sav/nitg-sg/fixme/base_covar_int_alt1.res b/tests/sav/nitcsg/fixme/base_covar_int_alt1.res
similarity index 100%
rename from tests/sav/nitg-sg/fixme/base_covar_int_alt1.res
rename to tests/sav/nitcsg/fixme/base_covar_int_alt1.res

diff --git a/tests/sav/nitg-sg/fixme/base_covar_int_alt5.res b/tests/sav/nitcsg/fixme/base_covar_int_alt5.res
similarity index 100%
rename from tests/sav/nitg-sg/fixme/base_covar_int_alt5.res
rename to tests/sav/nitcsg/fixme/base_covar_int_alt5.res

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

diff --git a/tests/sav/nitg-sg/fixme/base_gen_variance3_alt1.res b/tests/sav/nitcsg/fixme/base_gen_variance3_alt1.res
similarity index 100%
rename from tests/sav/nitg-sg/fixme/base_gen_variance3_alt1.res
rename to tests/sav/nitcsg/fixme/base_gen_variance3_alt1.res

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

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

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

diff --git a/tests/sav/nitg-sg/fixme/complete_simple_android.res b/tests/sav/nitcsg/fixme/complete_simple_android.res
similarity index 100%
rename from tests/sav/nitg-sg/fixme/complete_simple_android.res
rename to tests/sav/nitcsg/fixme/complete_simple_android.res

diff --git a/tests/sav/nitg-sg/fixme/test_meta.res b/tests/sav/nitcsg/fixme/test_meta.res
similarity index 100%
rename from tests/sav/nitg-sg/fixme/test_meta.res
rename to tests/sav/nitcsg/fixme/test_meta.res

diff --git a/tests/sav/nitg-sg/fixme/test_platform_android.res b/tests/sav/nitcsg/fixme/test_platform_android.res
similarity index 100%
rename from tests/sav/nitg-sg/fixme/test_platform_android.res
rename to tests/sav/nitcsg/fixme/test_platform_android.res

diff --git a/tests/testall.sh b/tests/testall.sh
index 986a852..61b00e9 100755 (executable)
--- a/tests/testall.sh
+++ b/tests/testall.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # Run some tests on each engine
-for x in nitg-g nitg-s nitg-sg nitg-e niti nitvm; do
+for x in nitcg nitcs nitcsg nitce niti nitvm; do
        echo "--engine $x"
        ./tests.sh --engine $x "$@"
 done

diff --git a/tests/tests.sh b/tests/tests.sh
index 3fd5510..95c06f5 100755 (executable)
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -395,30 +395,34 @@ enginebinname=$engine
 isinterpret=
 case $engine in
        nitc|nitg)
-               engine=nitg-s;
+               engine=nitcs;
                enginebinname=nitc;
                OPT="--separate $OPT --compile-dir $compdir"
-               savdirs="sav/nitg-common/"
+               savdirs="sav/nitc-common/"
                ;;
        nitcs|nitg-s)
+               engine=nitcs;
                enginebinname=nitc;
                OPT="--separate $OPT --compile-dir $compdir"
-               savdirs="sav/nitg-common/"
+               savdirs="sav/nitc-common/"
                ;;
        nitce|nitg-e)
+               engine=nitce;
                enginebinname=nitc;
                OPT="--erasure $OPT --compile-dir $compdir"
-               savdirs="sav/nitg-common/"
+               savdirs="sav/nitc-common/"
                ;;
        nitcsg|nitg-sg)
+               engine=nitcsg;
                enginebinname=nitc;
                OPT="--semi-global $OPT --compile-dir $compdir"
-               savdirs="sav/nitg-common/"
+               savdirs="sav/nitc-common/"
                ;;
        nitcg|nitg-g)
+               engine=nitcg;
                enginebinname=nitc;
                OPT="--global $OPT --compile-dir $compdir"
-               savdirs="sav/nitg-common/"
+               savdirs="sav/nitc-common/"
                ;;
        nit)
                engine=niti
@@ -437,11 +441,7 @@ case $engine in
        emscripten)
                enginebinname=nitc
                OPT="-m emscripten_nodejs.nit --semi-global $OPT --compile-dir $compdir"
-               savdirs="sav/nitg-sg/"
-               ;;
-       nitc)
-               echo "disabled engine $engine"
-               exit 0
+               savdirs="sav/nitcsg/"
                ;;
        *)
                echo "unknown engine $engine"

diff --git a/tests/turing.skip b/tests/turing.skip
index 7cac9bd..ea13024 100644 (file)
--- a/tests/turing.skip
+++ b/tests/turing.skip
@@ -1,4 +1,3 @@
-nitg
 nitx
 _linux
 android