Merge branch 'dl/rebase-i-keep-base'
[gitweb.git] / ci / run-build-and-tests.sh
index cda170d5c27bab7c511d6fe70fc9852b21cc0180..ff0ef7f08e759059a9e0053946f2f1cda3c26026 100755 (executable)
@@ -3,22 +3,34 @@
 # Build and test Git
 #
 
-. ${0%/*}/lib-travisci.sh
+. ${0%/*}/lib.sh
 
-ln -s "$cache_dir/.prove" t/.prove
+case "$CI_OS_NAME" in
+windows*) cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";;
+*) ln -s "$cache_dir/.prove" t/.prove;;
+esac
 
-make --jobs=2
-make --quiet test
-if test "$jobname" = "linux-gcc"
-then
+make
+case "$jobname" in
+linux-gcc)
+       make test
        export GIT_TEST_SPLIT_INDEX=yes
        export GIT_TEST_FULL_IN_PACK_ARRAY=true
        export GIT_TEST_OE_SIZE=10
        export GIT_TEST_OE_DELTA_SIZE=5
        export GIT_TEST_COMMIT_GRAPH=1
        export GIT_TEST_MULTI_PACK_INDEX=1
-       make --quiet test
-fi
+       make test
+       ;;
+linux-gcc-4.8)
+       # Don't run the tests; we only care about whether Git can be
+       # built with GCC 4.8, as it errors out on some undesired (C99)
+       # constructs that newer compilers seem to quietly accept.
+       ;;
+*)
+       make test
+       ;;
+esac
 
 check_unignored_build_artifacts