diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2014-01-20 13:11:10 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2014-01-20 13:11:10 +0100 |
| commit | f759cc0f08c195940de05d5394f7b1ad4d44365e (patch) | |
| tree | e67ad33c58aced179929d5f5c5665745d56e90f9 | |
| parent | 6a1563343c48f9e38b85f39f4a95c89ea0f46a60 (diff) | |
| download | cgit-f759cc0f08c195940de05d5394f7b1ad4d44365e.tar.gz cgit-f759cc0f08c195940de05d5394f7b1ad4d44365e.tar.xz | |
tests: only do lua tests if lua is compiled-in
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rwxr-xr-x | tests/setup.sh | 12 | ||||
| -rwxr-xr-x | tests/t0111-filter.sh | 7 |
2 files changed, 17 insertions, 2 deletions
diff --git a/tests/setup.sh b/tests/setup.sh index 785edd7..7590f04 100755 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -60,6 +60,12 @@ 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 @@ -133,7 +139,10 @@ 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 @@ -143,6 +152,7 @@ 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() @@ -155,7 +165,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 730f1c0..2fdc366 100755 --- a/tests/t0111-filter.sh +++ b/tests/t0111-filter.sh @@ -3,7 +3,12 @@ test_description='Check filtered content' . ./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 test_expect_success "generate filter-$prefix/tree/a%2bb" " cgit_url 'filter-$prefix/tree/a%2bb' >tmp |