tests: only do lua tests if lua is compiled-in

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2014-01-20 13:11:10 +01:00
parent 6a1563343c
commit f759cc0f08
2 changed files with 17 additions and 2 deletions

View File

@ -60,6 +60,12 @@ fi
FILTER_DIRECTORY=$(cd ../filters && pwd) FILTER_DIRECTORY=$(cd ../filters && pwd)
if cgit --version | grep -F -q "[+] Lua scripting"; then
export CGIT_HAS_LUA=1
else
export CGIT_HAS_LUA=0
fi
mkrepo() { mkrepo() {
name=$1 name=$1
count=$2 count=$2
@ -133,7 +139,10 @@ repo.commit-filter=exec:$FILTER_DIRECTORY/dump.sh
repo.email-filter=exec:$FILTER_DIRECTORY/dump.sh repo.email-filter=exec:$FILTER_DIRECTORY/dump.sh
repo.source-filter=exec:$FILTER_DIRECTORY/dump.sh repo.source-filter=exec:$FILTER_DIRECTORY/dump.sh
repo.readme=master:a+b repo.readme=master:a+b
EOF
if [ $CGIT_HAS_LUA -eq 1 ]; then
cat >>cgitrc <<EOF
repo.url=filter-lua repo.url=filter-lua
repo.path=$PWD/repos/filter/.git repo.path=$PWD/repos/filter/.git
repo.desc=filtered repo repo.desc=filtered repo
@ -143,6 +152,7 @@ repo.email-filter=lua:$FILTER_DIRECTORY/dump.lua
repo.source-filter=lua:$FILTER_DIRECTORY/dump.lua repo.source-filter=lua:$FILTER_DIRECTORY/dump.lua
repo.readme=master:a+b repo.readme=master:a+b
EOF EOF
fi
} }
cgit_query() cgit_query()
@ -155,7 +165,7 @@ cgit_url()
CGIT_CONFIG="$PWD/cgitrc" QUERY_STRING="url=$1" cgit CGIT_CONFIG="$PWD/cgitrc" QUERY_STRING="url=$1" cgit
} }
strip_headers () { strip_headers() {
while read -r line while read -r line
do do
test -z "$line" && break test -z "$line" && break

View File

@ -3,7 +3,12 @@
test_description='Check filtered content' test_description='Check filtered content'
. ./setup.sh . ./setup.sh
for prefix in exec lua prefixes="exec"
if [ $CGIT_HAS_LUA -eq 1 ]; then
prefixes="$prefixes lua"
fi
for prefix in $prefixes
do do
test_expect_success "generate filter-$prefix/tree/a%2bb" " test_expect_success "generate filter-$prefix/tree/a%2bb" "
cgit_url 'filter-$prefix/tree/a%2bb' >tmp cgit_url 'filter-$prefix/tree/a%2bb' >tmp