X-Git-Url: http://nitlanguage.org

diff --git a/tests/tests.sh b/tests/tests.sh
index 8168d0d..2fbab89 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -134,6 +134,8 @@ 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"
 else
 	TIME=
 fi
@@ -146,12 +148,14 @@ else
 fi
 
 # Detect a working hostname command
-if hostname --version | grep coreutils >/dev/null 2>&1; then
+if hostname --version 2>&1 | grep coreutils >/dev/null 2>&1; then
 	HOSTNAME="hostname"
 else
 	HOSTNAME="hostname -s"
 fi
 
+UNAME=`uname | sed s/-.*//`
+
 # $1 is the pattern of the test
 # $2 is the file to compare to
 # the result is:
@@ -371,7 +375,7 @@ need_skip()
 	fi
 
 	# Skip by OS
-	local os_skip_file=`uname`.skip
+	local os_skip_file=$UNAME.skip
 	if test -e $os_skip_file && echo "$1" | grep -f "$os_skip_file" >/dev/null 2>&1; then
 		echo "=> $2: [skip os]"
 		echo >>$xml "<testcase classname='`xmlesc "$3"`' name='`xmlesc "$2"`' `timestamp`><skipped/></testcase>"
@@ -528,7 +532,7 @@ case $engine in
 		;;
 esac
 
-savdirs="sav/`$HOSTNAME` sav/`uname` sav/$engine $savdirs sav/"
+savdirs="sav/`$HOSTNAME` sav/$UNAME sav/$engine $savdirs sav/"
 
 # The default nitc compiler
 [ -z "$NITC" ] && find_nitc