aboutsummaryrefslogtreecommitdiff
path: root/t/t9500-gitweb-standalone-no-errors.sh
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2013-10-14 16:19:31 -0700
committerJonathan Nieder <jrnieder@gmail.com>2013-10-14 16:19:31 -0700
commita43948bae9a5c95731f089c14f3379394ff2f380 (patch)
tree895d6ed90e0db7393d1923f5975dc2c9b49709b8 /t/t9500-gitweb-standalone-no-errors.sh
parentec145c9c2ef0ddf0ca8b57b968054f4db9de63b3 (diff)
parent7202db86478390ead1b5ca6c6d47d44badff10f3 (diff)
downloadgit-a43948bae9a5c95731f089c14f3379394ff2f380.tar.gz
git-a43948bae9a5c95731f089c14f3379394ff2f380.tar.xz
Merge branch 'rj/highlight-test-hang'
* rj/highlight-test-hang: gitweb test: fix highlight test hang on Linux Mint
Diffstat (limited to 't/t9500-gitweb-standalone-no-errors.sh')
-rwxr-xr-xt/t9500-gitweb-standalone-no-errors.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index 6fca19353..718014d5d 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