Merge branch 'jk/test-httpd-config-nosystem' into maint

diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index b0ec12ff6cbcdd7352b764db32bc34340b37fc8a..6a50b8793e4ff840e67d20c169159f474cb9d297 100644 (file)
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -186,3 +186,15 @@ start_svnserve () {
              --listen-host 127.0.0.1 &
 }
 
+prepare_a_utf8_locale () {
+       a_utf8_locale=$(locale -a | sed -n '/\.[uU][tT][fF]-*8$/{
+       p
+       q
+}')
+       if test -n "$a_utf8_locale"
+       then
+               test_set_prereq UTF8
+       else
+               say "# UTF-8 locale not available, some tests are skipped"
+       fi
+}