a1429dbc89
The current 'clone-prefix' setting has some known issues: * All repos get the same 'clone-prefix' value since the setting is not adopted during repo registration (in cgitrc, or during scan-path traversal), but only when the setting is used. * The generated clone-urls for a repo is a combination of 'clone-prefix', a slash and the repo url. This doesn't work well with e.g. ssh-style urls like 'git@example.org:repo.git', since the inserted slash will make the repo relative to the filesystem root. * If 'remove-suffix' is enabled, the generated clone-urls will not work for cloning (except for http-urls to cgit itself) since they miss the '.git' suffix. The new 'clone-url' setting is designed to avoid the mentioned issues: * Each repo adopts the default 'clone-url' when the repo is defined. This allows different groups of repos to adopt different values. * The clone-urls for a repo is generated by expanding environment variables in a string template without inserting arbitrary characters, hence any kind of clone-url can be generated. * Macro expansion also eases the 'remove-suffix' pain since it's now possible to define e.g. 'clone-url=git://foo.org/$CGIT_REPO_URL.git' for a set of repos. A furter improvement would be to define e.g. $CGIT_REPO_SUFFIX to '.git' for all repos which had their url prettified, or to store the original $CGIT_REPO_URL in e.g. $CGIT_REPO_REAL_URL before suffix removal. Reviewed-by: Ferry Huberts <mailings@hupie.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
148 γραμμές
3.1 KiB
Bash
Εκτελέσιμο Αρχείο
148 γραμμές
3.1 KiB
Bash
Εκτελέσιμο Αρχείο
# This file should be sourced by all test-scripts
|
|
#
|
|
# Main functions:
|
|
# prepare_tests(description) - setup for testing, i.e. create repos+config
|
|
# run_test(description, script) - run one test, i.e. eval script
|
|
#
|
|
# Helper functions
|
|
# cgit_query(querystring) - call cgit with the specified querystring
|
|
# cgit_url(url) - call cgit with the specified virtual url
|
|
#
|
|
# Example script:
|
|
#
|
|
# . setup.sh
|
|
# prepare_tests "html validation"
|
|
# run_test 'repo index' 'cgit_url "/" | tidy -e'
|
|
# run_test 'repo summary' 'cgit_url "/foo" | tidy -e'
|
|
|
|
|
|
mkrepo() {
|
|
name=$1
|
|
count=$2
|
|
dir=$PWD
|
|
test -d "$name" && return
|
|
printf "Creating testrepo %s\n" $name
|
|
mkdir -p "$name"
|
|
cd "$name"
|
|
git init
|
|
n=1
|
|
while test $n -le $count
|
|
do
|
|
echo $n >file-$n
|
|
git add file-$n
|
|
git commit -m "commit $n"
|
|
n=$(expr $n + 1)
|
|
done
|
|
if test "$3" = "testplus"
|
|
then
|
|
echo "hello" >a+b
|
|
git add a+b
|
|
git commit -m "add a+b"
|
|
git branch "1+2"
|
|
fi
|
|
cd $dir
|
|
}
|
|
|
|
setup_repos()
|
|
{
|
|
rm -rf trash/cache
|
|
mkdir -p trash/cache
|
|
mkrepo trash/repos/foo 5 >/dev/null
|
|
mkrepo trash/repos/bar 50 >/dev/null
|
|
mkrepo trash/repos/foo+bar 10 testplus >/dev/null
|
|
mkrepo "trash/repos/with space" 2 >/dev/null
|
|
cat >trash/cgitrc <<EOF
|
|
virtual-root=/
|
|
cache-root=$PWD/trash/cache
|
|
|
|
cache-size=1021
|
|
snapshots=tar.gz tar.bz zip
|
|
enable-log-filecount=1
|
|
enable-log-linecount=1
|
|
summary-log=5
|
|
summary-branches=5
|
|
summary-tags=5
|
|
clone-url=git://example.org/\$CGIT_REPO_URL.git
|
|
|
|
repo.url=foo
|
|
repo.path=$PWD/trash/repos/foo/.git
|
|
# Do not specify a description for this repo, as it then will be assigned
|
|
# the constant value "[no description]" (which actually used to cause a
|
|
# segfault).
|
|
|
|
repo.url=bar
|
|
repo.path=$PWD/trash/repos/bar/.git
|
|
repo.desc=the bar repo
|
|
|
|
repo.url=foo+bar
|
|
repo.path=$PWD/trash/repos/foo+bar/.git
|
|
repo.desc=the foo+bar repo
|
|
|
|
repo.url=with space
|
|
repo.path=$PWD/trash/repos/with space/.git
|
|
repo.desc=spaced repo
|
|
EOF
|
|
}
|
|
|
|
prepare_tests()
|
|
{
|
|
setup_repos
|
|
rm -f test-output.log 2>/dev/null
|
|
test_count=0
|
|
test_failed=0
|
|
echo "[$0]" "$@" >test-output.log
|
|
echo "$@" "($0)"
|
|
}
|
|
|
|
tests_done()
|
|
{
|
|
printf "\n"
|
|
if test $test_failed -gt 0
|
|
then
|
|
printf "test: *** %s failure(s), logfile=%s\n" \
|
|
$test_failed "$(pwd)/test-output.log"
|
|
false
|
|
fi
|
|
}
|
|
|
|
run_test()
|
|
{
|
|
bug=0
|
|
if test "$1" = "BUG"
|
|
then
|
|
bug=1
|
|
shift
|
|
fi
|
|
desc=$1
|
|
script=$2
|
|
test_count=$(expr $test_count + 1)
|
|
printf "\ntest %d: name='%s'\n" $test_count "$desc" >>test-output.log
|
|
printf "test %d: eval='%s'\n" $test_count "$2" >>test-output.log
|
|
eval "$2" >>test-output.log 2>>test-output.log
|
|
res=$?
|
|
printf "test %d: exitcode=%d\n" $test_count $res >>test-output.log
|
|
if test $res = 0 -a $bug = 0
|
|
then
|
|
printf " %2d) %-60s [ok]\n" $test_count "$desc"
|
|
elif test $res = 0 -a $bug = 1
|
|
then
|
|
printf " %2d) %-60s [BUG FIXED]\n" $test_count "$desc"
|
|
elif test $bug = 1
|
|
then
|
|
printf " %2d) %-60s [KNOWN BUG]\n" $test_count "$desc"
|
|
else
|
|
test_failed=$(expr $test_failed + 1)
|
|
printf " %2d) %-60s [failed]\n" $test_count "$desc"
|
|
fi
|
|
}
|
|
|
|
cgit_query()
|
|
{
|
|
CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit"
|
|
}
|
|
|
|
cgit_url()
|
|
{
|
|
CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit"
|
|
}
|