t0111: Additions and fixes

[ps-cgit] / tests / setup.sh

diff --git a/tests/setup.sh b/tests/setup.sh
index 81e7220662800a46fb697c1f7a35a4ee45dceb55..785edd79565d8334ee0490be1b42c59afc0bab6f 100755 (executable)
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -15,12 +15,50 @@
 # run_test 'repo index' 'cgit_url "/" | tidy -e'
 # run_test 'repo summary' 'cgit_url "/foo" | tidy -e'
 
 # run_test 'repo index' 'cgit_url "/" | tidy -e'
 # run_test 'repo summary' 'cgit_url "/foo" | tidy -e'
 

+# We don't want to run Git commands through Valgrind, so we filter out the
+# --valgrind option here and handle it ourselves.  We copy the arguments
+# assuming that none contain a newline, although other whitespace is
+# preserved.
+LF='
+'
+test_argv=
+
+while test $# != 0
+do
+       case "$1" in
+       --va|--val|--valg|--valgr|--valgri|--valgrin|--valgrind)
+               cgit_valgrind=t
+               test_argv="$test_argv${LF}--verbose"
+               ;;
+       *)
+               test_argv="$test_argv$LF$1"
+               ;;
+       esac
+       shift
+done
+
+OLDIFS=$IFS
+IFS=$LF
+set -- $test_argv
+IFS=$OLDIFS
+

 : ${TEST_DIRECTORY=$(pwd)/../git/t}
 : ${TEST_DIRECTORY=$(pwd)/../git/t}

+: ${TEST_OUTPUT_DIRECTORY=$(pwd)}

 TEST_NO_CREATE_REPO=YesPlease
 . "$TEST_DIRECTORY"/test-lib.sh
 
 # Prepend the directory containing cgit to PATH.
 TEST_NO_CREATE_REPO=YesPlease
 . "$TEST_DIRECTORY"/test-lib.sh
 
 # Prepend the directory containing cgit to PATH.

-PATH="$(pwd)/../..:$PATH"
+if test -n "$cgit_valgrind"
+then
+       GIT_VALGRIND="$TEST_DIRECTORY/valgrind"
+       CGIT_VALGRIND=$(cd ../valgrind && pwd)
+       PATH="$CGIT_VALGRIND/bin:$PATH"
+       export GIT_VALGRIND CGIT_VALGRIND
+else
+       PATH="$(pwd)/../..:$PATH"
+fi
+
+FILTER_DIRECTORY=$(cd ../filters && pwd)

 
 mkrepo() {
        name=$1
 
 mkrepo() {
        name=$1


@@ -54,6 +92,7 @@ setup_repos()
        mkrepo repos/bar 50 >/dev/null
        mkrepo repos/foo+bar 10 testplus >/dev/null
        mkrepo "repos/with space" 2 >/dev/null
        mkrepo repos/bar 50 >/dev/null
        mkrepo repos/foo+bar 10 testplus >/dev/null
        mkrepo "repos/with space" 2 >/dev/null

+       mkrepo repos/filter 5 testplus >/dev/null

        cat >cgitrc <<EOF
 virtual-root=/
 cache-root=$PWD/cache
        cat >cgitrc <<EOF
 virtual-root=/
 cache-root=$PWD/cache


@@ -66,6 +105,7 @@ summary-log=5
 summary-branches=5
 summary-tags=5
 clone-url=git://example.org/\$CGIT_REPO_URL.git
 summary-branches=5
 summary-tags=5
 clone-url=git://example.org/\$CGIT_REPO_URL.git

+enable-filter-overrides=1

 
 repo.url=foo
 repo.path=$PWD/repos/foo/.git
 
 repo.url=foo
 repo.path=$PWD/repos/foo/.git


@@ -84,6 +124,24 @@ repo.desc=the foo+bar repo
 repo.url=with space
 repo.path=$PWD/repos/with space/.git
 repo.desc=spaced repo
 repo.url=with space
 repo.path=$PWD/repos/with space/.git
 repo.desc=spaced repo

+
+repo.url=filter-exec
+repo.path=$PWD/repos/filter/.git
+repo.desc=filtered repo
+repo.about-filter=exec:$FILTER_DIRECTORY/dump.sh
+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
+
+repo.url=filter-lua
+repo.path=$PWD/repos/filter/.git
+repo.desc=filtered repo
+repo.about-filter=lua:$FILTER_DIRECTORY/dump.lua
+repo.commit-filter=lua:$FILTER_DIRECTORY/dump.lua
+repo.email-filter=lua:$FILTER_DIRECTORY/dump.lua
+repo.source-filter=lua:$FILTER_DIRECTORY/dump.lua
+repo.readme=master:a+b

 EOF
 }
 
 EOF
 }
 


@@ -97,4 +155,12 @@ cgit_url()
        CGIT_CONFIG="$PWD/cgitrc" QUERY_STRING="url=$1" cgit
 }
 
        CGIT_CONFIG="$PWD/cgitrc" QUERY_STRING="url=$1" cgit
 }
 

+strip_headers () {
+       while read -r line
+       do
+               test -z "$line" && break
+       done
+       cat
+}
+

 test -z "$CGIT_TEST_NO_CREATE_REPOS" && setup_repos
 test -z "$CGIT_TEST_NO_CREATE_REPOS" && setup_repos