Merge: Raise nitc from the dead

Raise dead on `nitc`.
It's super effective...

Pull-Request: #1000
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>
Reviewed-by: Alexis Laferrière <alexis.laf@xymus.net>
Reviewed-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --combined tests/nitg-g.skip
index bd170fc,9f22200..8725c3e
--- 1/tests/nitg-g.skip
--- 2/tests/nitg-g.skip
+++ b/tests/nitg-g.skip
@@@ -1,11 -1,7 +1,11 @@@
- nitg
+ nitc
  nitdoc
  nitlight
  neo_doxygen_dump
  neo_doxygen_file_compound
  neo_doxygen_graph_empty_project
  neo_doxygen_member_resolve_introducer
 +test_docdown
 +nith
 +nit_pretty
 +nitmetrics

diff --combined tests/niti.skip
index c2c24ff,9da5a56..cb551a2
--- 1/tests/niti.skip
--- 2/tests/niti.skip
+++ b/tests/niti.skip
@@@ -7,11 -7,10 +7,10 @@@ nit_args
  nitvm_args1
  nitvm_args3
  nitc_args1
- nitg_args1
- nitg_args3
- nitg_args5
- nitg_args6
- nitg_args8
+ nitc_args3
+ nitc_args5
+ nitc_args6
+ nitc_args8
  nitunit_args
  test_docdown_args
  pep8analysis
@@@ -19,5 -18,3 +18,5 @@@ emscripte
  nitserial_args
  nitunit_args
  nitpretty_args
 +hamming_number
 +hailstone

diff --combined tests/tests.sh
index 77e116b,ca15577..88487d4
--- 1/tests/tests.sh
--- 2/tests/tests.sh
+++ b/tests/tests.sh
@@@ -29,9 -29,9 +29,9 @@@ unset NIT_DI
  shopt -s nullglob
  JAVA_HOME=$(dirname $(dirname $(readlink -f $(which javac))))
  
 -paths=`echo $JAVA_HOME/jre/lib/*/{client,server}/`
 -paths=($paths)        
 -JNI_LIB_PATH=${paths[0]}
 +paths=`echo $JAVA_HOME/jre/lib/*/{client,server}/libjvm.so`
 +paths=($paths)
 +JNI_LIB_PATH=`dirname ${paths[0]}`
  shopt -u nullglob
  
  outdir="out"
@@@ -45,7 -45,7 +45,7 @@@ Usage: $e [options] modulename
  -o option   Pass option to the engine
  -v          Verbose (show tests steps)
  -h          This help
- --engine    Use a specific engine (default=nitg)
+ --engine    Use a specific engine (default=nitc)
  --noskip    Do not skip a test even if the .skip file matches
  --outdir    Use a specific output folder (default=out/)
  --compdir   Use a specific temporary compilation folder (default=.nit_compile)
@@@ -316,14 -316,6 +316,14 @@@ need_skip(
                echo >>$xml "<testcase classname='`xmlesc "$3"`' name='`xmlesc "$2"`' `timestamp`><skipped/></testcase>"
                return 0
        fi
 +
 +      # Skip by OS
 +      os_skip_file=`uname`.skip
 +      if test -e $os_skip_file && echo "$1" | grep -f "$os_skip_file"; then
 +              echo "=> $2: [skip os]"
 +              echo >>$xml "<testcase classname='`xmlesc "$3"`' name='`xmlesc "$2"`' `timestamp`><skipped/></testcase>"
 +              return 0
 +      fi
        return 1
  }
  
@@@ -363,7 -355,7 +363,7 @@@ find_nitc(
  verbose=false
  isnode=false
  stop=false
- engine=nitg
+ engine=nitc
  noskip=
  savdirs=
  while [ $stop = false ]; do
@@@ -382,29 -374,29 +382,29 @@@ don
  enginebinname=$engine
  isinterpret=
  case $engine in
-       nitg)
+       nitc|nitg)
                engine=nitg-s;
-               enginebinname=nitg;
+               enginebinname=nitc;
                OPT="--separate $OPT --compile-dir $compdir"
                savdirs="sav/nitg-common/"
                ;;
-       nitg-s)
-               enginebinname=nitg;
+       nitcs|nitg-s)
+               enginebinname=nitc;
                OPT="--separate $OPT --compile-dir $compdir"
                savdirs="sav/nitg-common/"
                ;;
-       nitg-e)
-               enginebinname=nitg;
+       nitce|nitg-e)
+               enginebinname=nitc;
                OPT="--erasure $OPT --compile-dir $compdir"
                savdirs="sav/nitg-common/"
                ;;
-       nitg-sg)
-               enginebinname=nitg;
+       nitcsg|nitg-sg)
+               enginebinname=nitc;
                OPT="--semi-global $OPT --compile-dir $compdir"
                savdirs="sav/nitg-common/"
                ;;
-       nitg-g)
-               enginebinname=nitg;
+       nitcg|nitg-g)
+               enginebinname=nitc;
                OPT="--global $OPT --compile-dir $compdir"
                savdirs="sav/nitg-common/"
                ;;
@@@ -421,7 -413,7 +421,7 @@@
                savdirs="sav/niti/"
                ;;
        emscripten)
-               enginebinname=nitg
+               enginebinname=nitc
                OPT="-m emscripten_nodejs.nit --semi-global $OPT --compile-dir $compdir"
                savdirs="sav/nitg-sg/"
                ;;