From 3fca1fc651c025724c7ea36aa9a83182c8dfdb58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Tue, 9 Feb 2021 22:41:53 +0100 Subject: test libs: rename gitweb-lib.sh to lib-gitweb.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename gitweb-lib.sh to lib-gitweb.sh for consistency with other test library files. When it was introduced in 05526071cb5 (gitweb: split test suite into library and tests, 2009-08-27) this naming pattern was more common. Since then all but one other such library which didn't start with "lib-*.sh" such as t6000lib.sh has been been renamed, see e.g. 9d488eb40e2 (Move t6000lib.sh to lib-*, 2010-05-07). Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- t/gitweb-lib.sh | 123 ------------------------------ t/lib-gitweb.sh | 123 ++++++++++++++++++++++++++++++ t/t9500-gitweb-standalone-no-errors.sh | 2 +- t/t9501-gitweb-standalone-http-status.sh | 2 +- t/t9502-gitweb-standalone-parse-output.sh | 2 +- 5 files changed, 126 insertions(+), 126 deletions(-) delete mode 100644 t/gitweb-lib.sh create mode 100644 t/lib-gitweb.sh diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh deleted file mode 100644 index 1f32ca66ea..0000000000 --- a/t/gitweb-lib.sh +++ /dev/null @@ -1,123 +0,0 @@ -# Initialization and helpers for Gitweb tests, which source this -# shell library instead of test-lib.sh. -# -# Copyright (c) 2007 Jakub Narebski -# - -gitweb_init () { - safe_pwd="$(perl -MPOSIX=getcwd -e 'print quotemeta(getcwd)')" - cat >gitweb_config.perl <.git/description <gitweb.output 2>gitweb.log && - perl -w -e ' - open O, ">gitweb.headers"; - while (<>) { - print O; - last if (/^\r$/ || /^$/); - } - open O, ">gitweb.body"; - while (<>) { - print O; - } - close O; - ' gitweb.output && - if grep '^[[]' gitweb.log >/dev/null 2>&1; then - test_debug 'cat gitweb.log >&2' && - false - else - true - fi - - # gitweb.log is left for debugging - # gitweb.output is used to parse HTTP output - # gitweb.headers contains only HTTP headers - # gitweb.body contains body of message, without headers -} - -. ./test-lib.sh - -if ! test_have_prereq PERL; then - skip_all='skipping gitweb tests, perl not available' - test_done -fi - -perl -MEncode -e '$e="";decode_utf8($e, Encode::FB_CROAK)' >/dev/null 2>&1 || { - skip_all='skipping gitweb tests, perl version is too old' - test_done -} - -perl -MCGI -MCGI::Util -MCGI::Carp -e 0 >/dev/null 2>&1 || { - skip_all='skipping gitweb tests, CGI & CGI::Util & CGI::Carp modules not available' - test_done -} - -perl -mTime::HiRes -e 0 >/dev/null 2>&1 || { - skip_all='skipping gitweb tests, Time::HiRes module not available' - test_done -} - -gitweb_init diff --git a/t/lib-gitweb.sh b/t/lib-gitweb.sh new file mode 100644 index 0000000000..1f32ca66ea --- /dev/null +++ b/t/lib-gitweb.sh @@ -0,0 +1,123 @@ +# Initialization and helpers for Gitweb tests, which source this +# shell library instead of test-lib.sh. +# +# Copyright (c) 2007 Jakub Narebski +# + +gitweb_init () { + safe_pwd="$(perl -MPOSIX=getcwd -e 'print quotemeta(getcwd)')" + cat >gitweb_config.perl <.git/description <gitweb.output 2>gitweb.log && + perl -w -e ' + open O, ">gitweb.headers"; + while (<>) { + print O; + last if (/^\r$/ || /^$/); + } + open O, ">gitweb.body"; + while (<>) { + print O; + } + close O; + ' gitweb.output && + if grep '^[[]' gitweb.log >/dev/null 2>&1; then + test_debug 'cat gitweb.log >&2' && + false + else + true + fi + + # gitweb.log is left for debugging + # gitweb.output is used to parse HTTP output + # gitweb.headers contains only HTTP headers + # gitweb.body contains body of message, without headers +} + +. ./test-lib.sh + +if ! test_have_prereq PERL; then + skip_all='skipping gitweb tests, perl not available' + test_done +fi + +perl -MEncode -e '$e="";decode_utf8($e, Encode::FB_CROAK)' >/dev/null 2>&1 || { + skip_all='skipping gitweb tests, perl version is too old' + test_done +} + +perl -MCGI -MCGI::Util -MCGI::Carp -e 0 >/dev/null 2>&1 || { + skip_all='skipping gitweb tests, CGI & CGI::Util & CGI::Carp modules not available' + test_done +} + +perl -mTime::HiRes -e 0 >/dev/null 2>&1 || { + skip_all='skipping gitweb tests, Time::HiRes module not available' + test_done +} + +gitweb_init diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh index ee8c6e30e6..0333065d4d 100755 --- a/t/t9500-gitweb-standalone-no-errors.sh +++ b/t/t9500-gitweb-standalone-no-errors.sh @@ -13,7 +13,7 @@ or warnings to log.' GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME -. ./gitweb-lib.sh +. ./lib-gitweb.sh # ---------------------------------------------------------------------- # no commits (empty, just initialized repository) diff --git a/t/t9501-gitweb-standalone-http-status.sh b/t/t9501-gitweb-standalone-http-status.sh index 141610de54..32814e75df 100755 --- a/t/t9501-gitweb-standalone-http-status.sh +++ b/t/t9501-gitweb-standalone-http-status.sh @@ -13,7 +13,7 @@ code and message.' GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME -. ./gitweb-lib.sh +. ./lib-gitweb.sh # # Gitweb only provides the functionality tested by the 'modification times' diff --git a/t/t9502-gitweb-standalone-parse-output.sh b/t/t9502-gitweb-standalone-parse-output.sh index 9cf7ab30a8..3167473b30 100755 --- a/t/t9502-gitweb-standalone-parse-output.sh +++ b/t/t9502-gitweb-standalone-parse-output.sh @@ -13,7 +13,7 @@ in the HTTP header or the actual script output.' GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME -. ./gitweb-lib.sh +. ./lib-gitweb.sh # ---------------------------------------------------------------------- # snapshot file name and prefix -- cgit v1.2.3