Merge branch 'rj/highlight-test-hang'

* rj/highlight-test-hang: gitweb test: fix highlight test hang on Linux Mint
rolfbjarne · Oct 14, 2013 · a43948b · a43948b
2 parents ec145c9 + 7202db8
commit a43948b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git 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