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

diff --git a/tests/tests.sh b/tests/tests.sh
index 9eda24c..c19a9a8 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -37,9 +37,13 @@ if ! locale -a 2>/dev/null | grep -q C.UTF-8; then
 fi
 export LC_ALL="$locale_candidate"
 
+# Darwin / macOS
 if uname | grep Darwin 1>/dev/null 2>&1; then
 	export LANG=en_US.UTF-8
 	export LC_ALL=en_US.UTF-8
+
+	# Fix for errors on some libevent/nitcorn clients
+	export EVENT_NOKQUEUE=1
 fi
 
 export NIT_TESTING=true
@@ -407,6 +411,11 @@ need_skip()
 		echo >>$xml "<testcase classname='`xmlesc "$3"`' name='`xmlesc "$2"`' `timestamp`><skipped/></testcase>"
 		return 0
 	fi
+	if test -n "GITLAB_CI" && echo "$1" | grep -f "gitlab_ci.skip" >/dev/null 2>&1; then
+		echo "=> $2: [skip gitlab ci]"
+		echo >>$xml "<testcase classname='`xmlesc "$3"`' name='`xmlesc "$2"`' `timestamp`><skipped/></testcase>"
+		return 0
+	fi
 
 	# Skip by OS
 	local os_skip_file=$UNAME.skip
@@ -572,6 +581,7 @@ case $engine in
 esac
 
 savdirs="sav/`$HOSTNAME` sav/$UNAME sav/$engine $savdirs sav/"
+test -n "$GITLAB_CI" && savdirs="sav/gitlab_ci $savdirs"
 
 # The default nitc compiler
 [ -z "$NITC" ] && find_nitc
@@ -836,6 +846,10 @@ fi
 
 echo >>$xml "</testsuite></testsuites>"
 
+if type junit2html >/dev/null; then
+	junit2html "$xml"
+fi
+
 if [ -n "$nok" ]; then
 	exit 1
 else