mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Merge branch 'rj/highlight-test-hang'
* rj/highlight-test-hang: gitweb test: fix highlight test hang on Linux Mint
This commit is contained in:
commit
a43948bae9
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue