X-Git-Url: http://nitlanguage.org diff --git a/tests/tests.sh b/tests/tests.sh index 2fbab89..a402eb2 100755 --- a/tests/tests.sh +++ b/tests/tests.sh @@ -130,12 +130,12 @@ else fi # Detect a working time command -if env time --quiet -f%U true 2>/dev/null; then - TIME="env time --quiet -f%U" -elif env time -f%U true 2>/dev/null; then - TIME="env time -f%U" -elif env gtime -f%U true 2>/dev/null; then - TIME="env gtime -f%U" +if command time --quiet -f%e true 2>/dev/null; then + TIME="command time --quiet -f%e" +elif command time -f%e true 2>/dev/null; then + TIME="command time -f%e" +elif command gtime -f%e true 2>/dev/null; then + TIME="command gtime -f%e" else TIME= fi @@ -436,7 +436,7 @@ istodo() find_nitc() { local name="$enginebinname" - local recent=`ls -t ../src/$name ../src/$name_[0-9] ../bin/$name ../c_src/$name 2>/dev/null | head -1` + local recent=`ls -t ../src/$name ../src/$name_[0-9] ../bin/$name ../contrib/nitin/bin/$name ../c_src/$name 2>/dev/null | head -1` if [[ "x$recent" == "x" ]]; then echo "Could not find binary for engine $engine, aborting" exit 1 @@ -470,6 +470,7 @@ while [ $stop = false ]; do done enginebinname=$engine isinterpret= +isinteractive= case $engine in nitc|nitg) engine=nitcs; @@ -515,6 +516,10 @@ case $engine in OPT="--vm $OPT" savdirs="sav/niti/" ;; + nitin) + enginebinname=nitin + isinteractive=true + ;; nitj) engine=nitj; OPT="--compile-dir $compdir --ant" @@ -629,6 +634,15 @@ END > "$ff.compile.log" ERR=0 echo 0.0 > "$ff.time.out" + elif [ -n "$isinteractive" ]; then + cat > "$ff.bin" < "$ff.cmp.err" + > "$ff.compile.log" + ERR=0 + echo 0.0 > "$ff.time.out" else if skip_cc "$bf"; then nocc="--no-cc"