{"thread":{"id":"25436","subject":"[PATCH] gitweb: Fix test of highlighting support in t9500","startedAt":"2010-10-13T11:57:41Z","lastAt":"2010-10-13T11:57:41Z","messageCount":1,"participants":["Jakub Narebski"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"153398","messageId":"20101013115657.11392.76179.stgit@localhost.localdomain","threadId":"25436","inReplyTo":null,"subject":"[PATCH] gitweb: Fix test of highlighting support in t9500","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2010-10-13T11:57:41Z","receivedAt":"2010-10-13T11:57:41Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"The commit 7ce896b (Enable highlight executable path as a\nconfiguration option, 2010-09-21) forgot to update t9500 test.\n\nWhile at it, describe highlight test better.\n\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\n---\nNoticed while running t9500 with `--debug` option.\n\n t/t9500-gitweb-standalone-no-errors.sh |   11 ++++++-----\n 1 files changed, 6 insertions(+), 5 deletions(-)\n\ndiff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh\nindex 4f2b9b0..21cd286 100755\n--- a/t/t9500-gitweb-standalone-no-errors.sh\n+++ b/t/t9500-gitweb-standalone-no-errors.sh\n@@ -650,25 +650,26 @@ test_debug 'cat gitweb.log'\n # ----------------------------------------------------------------------\n # syntax highlighting\n \n-cat >>gitweb_config.perl <<\\EOF\n-$feature{'highlight'}{'override'} = 1;\n-EOF\n \n highlight --version >/dev/null 2>&1\n if [ $? -eq 127 ]; then\n \tsay \"Skipping syntax highlighting test, because 'highlight' was not found\"\n else\n \ttest_set_prereq HIGHLIGHT\n+\tcat >>gitweb_config.perl <<-\\EOF\n+\tour $highlight_bin = \"highlight\";\n+\t$feature{'highlight'}{'override'} = 1;\n+\tEOF\n fi\n \n test_expect_success HIGHLIGHT \\\n-\t'syntax highlighting (no highlight)' \\\n+\t'syntax highlighting (no highlight, unknown syntax)' \\\n \t'git config gitweb.highlight yes &&\n \t gitweb_run \"p=.git;a=blob;f=file\"'\n test_debug 'cat gitweb.log'\n \n test_expect_success HIGHLIGHT \\\n-\t'syntax highlighting (highlighted)' \\\n+\t'syntax highlighting (highlighted, shell script)' \\\n \t'git config gitweb.highlight yes &&\n \t echo \"#!/usr/bin/sh\" > test.sh &&\n \t git add test.sh &&\n"}]}