Merge branch 'rj/highlight-test-hang'

* rj/highlight-test-hang:
gitweb test: fix highlight test hang on Linux Mint

diff --cc t/t9500-gitweb-standalone-no-errors.sh
index 6fca19353d7308f88e63806f7187d9d379412d18,ad8cd0613dc2fd539097cdb0f8bb663083758510..718014d5dead8f36b2dde6ce38de63316ec57fdb
--- 1/t/t9500-gitweb-standalone-no-errors.sh
--- 2/t/t9500-gitweb-standalone-no-errors.sh
+++ b/t/t9500-gitweb-standalone-no-errors.sh
@@@ -682,16 -650,17 +682,18 @@@ test_expect_success 
  # ----------------------------------------------------------------------
  # syntax highlighting
  
 -cat >>gitweb_config.perl <<\EOF
 -$feature{'highlight'}{'override'} = 1;
 -EOF
  
- highlight --version >/dev/null 2>&1
+ highlight_version=$(highlight --version </dev/null 2>/dev/null)
  if [ $? -eq 127 ]; then
-       say "Skipping syntax highlighting test, because 'highlight' was not found"
+       say "Skipping syntax highlighting tests: 'highlight' not found"
+ elif test -z "$highlight_version"; then
+       say "Skipping syntax highlighting tests: incorrect 'highlight' found"
  else
        test_set_prereq HIGHLIGHT
 +      cat >>gitweb_config.perl <<-\EOF
 +      our $highlight_bin = "highlight";
 +      $feature{'highlight'}{'override'} = 1;
 +      EOF
  fi
  
  test_expect_success HIGHLIGHT \