]> git.cameronkatri.com Git - cgit.git/commitdiff
tests: only do lua tests if lua is compiled-in
authorJason A. Donenfeld <Jason@zx2c4.com>
Mon, 20 Jan 2014 12:11:10 +0000 (13:11 +0100)
committerJason A. Donenfeld <Jason@zx2c4.com>
Mon, 20 Jan 2014 12:11:10 +0000 (13:11 +0100)
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
tests/setup.sh
tests/t0111-filter.sh

index 785edd79565d8334ee0490be1b42c59afc0bab6f..7590f04944116e00b8d4728333bf9caa043b6d18 100755 (executable)
@@ -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
index 730f1c02a36b70cc64d63b87426d7ef625730fda..2fdc3669f492745b464c2a2fa593c15802acbe79 100755 (executable)
@@ -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