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

gitweb: Fix test of highlighting support in t9500

Browse Source 
The commit 7ce896b (Enable highlight executable path as a
configuration option, 2010-09-21) forgot to update t9500 test.

While at it, describe highlight test better.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jakub Narebski
2010-10-13 13:57:41 +02:00
committed by Junio C Hamano
parent c72781d612
commit ae5e97ec40
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -650,25 +650,26 @@ test_debug 'cat gitweb.log'
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# syntax highlighting # syntax highlighting
cat >>gitweb_config.perl <<\EOF
$feature{'highlight'}{'override'} = 1;
EOF
highlight --version >/dev/null 2>&1 highlight --version >/dev/null 2>&1
if [ $? -eq 127 ]; then if [ $? -eq 127 ]; then
say "Skipping syntax highlighting test, because 'highlight' was not found" say "Skipping syntax highlighting test, because 'highlight' was not found"
else else
test_set_prereq HIGHLIGHT test_set_prereq HIGHLIGHT
cat >>gitweb_config.perl <<-\EOF
our $highlight_bin = "highlight";
$feature{'highlight'}{'override'} = 1;
EOF
fi fi
test_expect_success HIGHLIGHT \ test_expect_success HIGHLIGHT \
'syntax highlighting (no highlight)' \ 'syntax highlighting (no highlight, unknown syntax)' \
'git config gitweb.highlight yes && 'git config gitweb.highlight yes &&
gitweb_run "p=.git;a=blob;f=file"' gitweb_run "p=.git;a=blob;f=file"'
test_debug 'cat gitweb.log' test_debug 'cat gitweb.log'
test_expect_success HIGHLIGHT \ test_expect_success HIGHLIGHT \
'syntax highlighting (highlighted)' \ 'syntax highlighting (highlighted, shell script)' \
'git config gitweb.highlight yes && 'git config gitweb.highlight yes &&
echo "#!/usr/bin/sh" > test.sh && echo "#!/usr/bin/sh" > test.sh &&
git add test.sh && git add test.sh &&