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: v1.8.5-rc0~54
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a43948bae9a5c95731f089c14f3379394ff2f380?hp=ec145c9c2ef0ddf0ca8b57b968054f4db9de63b3

Merge branch 'rj/highlight-test-hang'

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

diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index 6fca19353d..718014d5de 100755
--- a/t/t9500-gitweb-standalone-no-errors.sh
+++ b/t/t9500-gitweb-standalone-no-errors.sh
@@ -683,9 +683,11 @@ test_expect_success \
 # syntax highlighting
 
 
-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