Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/setup.sh | 12 | ||||
| -rwxr-xr-x | tests/t0111-filter.sh | 7 |
2 files changed, 2 insertions, 17 deletions
diff --git a/tests/setup.sh b/tests/setup.sh index 7590f04..785edd7 100755 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -60,12 +60,6 @@ fi 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() { name=$1 count=$2 @@ -139,10 +133,7 @@ repo.commit-filter=exec:$FILTER_DIRECTORY/dump.sh repo.email-filter=exec:$FILTER_DIRECTORY/dump.sh repo.source-filter=exec:$FILTER_DIRECTORY/dump.sh repo.readme=master:a+b -EOF - if [ $CGIT_HAS_LUA -eq 1 ]; then - cat >>cgitrc <<EOF repo.url=filter-lua repo.path=$PWD/repos/filter/.git repo.desc=filtered repo @@ -152,7 +143,6 @@ repo.email-filter=lua:$FILTER_DIRECTORY/dump.lua repo.source-filter=lua:$FILTER_DIRECTORY/dump.lua repo.readme=master:a+b EOF - fi } cgit_query() @@ -165,7 +155,7 @@ cgit_url() CGIT_CONFIG="$PWD/cgitrc" QUERY_STRING="url=$1" cgit } -strip_headers() { +strip_headers () { while read -r line do test -z "$line" && break diff --git a/tests/t0111-filter.sh b/tests/t0111-filter.sh index 2fdc366..730f1c0 100755 --- a/tests/t0111-filter.sh +++ b/tests/t0111-filter.sh @@ -3,12 +3,7 @@ test_description='Check filtered content' . ./setup.sh -prefixes="exec" -if [ $CGIT_HAS_LUA -eq 1 ]; then - prefixes="$prefixes lua" -fi - -for prefix in $prefixes +for prefix in exec lua do test_expect_success "generate filter-$prefix/tree/a%2bb" " cgit_url 'filter-$prefix/tree/a%2bb' >tmp |