admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'rj/highlight-test-hang'

Browse Source 
* rj/highlight-test-hang:
  gitweb test: fix highlight test hang on Linux Mint
This commit is contained in:
Jonathan Nieder
2013-10-14 16:19:31 -07:00
parent ec145c9c2e 7202db8647
commit a43948bae9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
t/t9500-gitweb-standalone-no-errors.sh
View File

@@ -683,9 +683,11 @@ test_expect_success \
# syntax highlighting # syntax highlighting
highlight --version >/dev/null 2>&1 highlight_version=$(highlight --version </dev/null 2>/dev/null)
if [ $? -eq 127 ]; then 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 else
test_set_prereq HIGHLIGHT test_set_prereq HIGHLIGHT
cat >>gitweb_config.perl <<-\EOF cat >>gitweb_config.perl <<-\EOF