From: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon, 14 Oct 2013 23:19:31 +0000 (-0700)
Subject: Merge branch 'rj/highlight-test-hang'
X-Git-Tag: rs/ref-transaction-1~601
X-Git-Url: https://repo.or.cz/w/git/jrn.git/commitdiff_plain/a43948bae9a5c95731f089c14f3379394ff2f380

Merge branch 'rj/highlight-test-hang'

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

a43948bae9a5c95731f089c14f3379394ff2f380
diff --cc t/t9500-gitweb-standalone-no-errors.sh
index 6fca19353d,ad8cd0613d..718014d5de
--- a/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 \