Merge branch 'js/visual-studio'

diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index cdd291344047394b26c17635d4507ad7ce14b542..ff0ef7f08e759059a9e0053946f2f1cda3c26026 100755 (executable)
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -11,9 +11,9 @@ windows*) cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";;
 esac
 
 make
-make test
-if test "$jobname" = "linux-gcc"
-then
+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
@@ -21,7 +21,16 @@ then
        export GIT_TEST_COMMIT_GRAPH=1
        export GIT_TEST_MULTI_PACK_INDEX=1
        make test
-fi
+       ;;
+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