X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/aa9b1b9d49ec37d28b6f576656170d47618e25b5..1ce4005c30c89bd3ab2142fe371bc5b50e71c932:/t/test-lib.sh?ds=sidebyside diff --git a/t/test-lib.sh b/t/test-lib.sh index 6339c54..d50a3ba 100755 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -17,11 +17,11 @@ unset COMMIT_AUTHOR_EMAIL unset COMMIT_AUTHOR_NAME unset GIT_ALTERNATE_OBJECT_DIRECTORIES unset GIT_AUTHOR_DATE -GIT_AUTHOR_EMAIL=author@example.com -GIT_AUTHOR_NAME='A U Thor' +#GIT_AUTHOR_EMAIL=author@example.com +#GIT_AUTHOR_NAME='A U Thor' unset GIT_COMMITTER_DATE -GIT_COMMITTER_EMAIL=committer@example.com -GIT_COMMITTER_NAME='C O Mitter' +#GIT_COMMITTER_EMAIL=committer@example.com +#GIT_COMMITTER_NAME='C O Mitter' unset GIT_DIFF_OPTS unset GIT_DIR unset GIT_EXTERNAL_DIFF @@ -63,6 +63,7 @@ do echo "$test_description" exit 0 ;; -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose) + export STGIT_DEBUG_LEVEL="-1" verbose=t; shift ;; *) break ;; @@ -159,12 +160,12 @@ test_create_repo () { repo="$1" mkdir "$repo" cd "$repo" || error "Cannot setup test environment" - git-init-db 2>/dev/null || + git-init-db >&3 2>&4 || error "cannot run git-init-db -- have you installed git-core?" mv .git/hooks .git/hooks-disabled echo "empty start" | - git-commit-tree `git-write-tree` >.git/refs/heads/master 2>/dev/null || - error "cannot run git-commit -- is your git-core funtionning?" + git-commit-tree `git-write-tree` >.git/refs/heads/master 2>&4 || + error "cannot run git-commit -- is your git-core functioning?" cd "$owd" } @@ -193,7 +194,8 @@ test_done () { # Test the binaries we have just built. The tests are kept in # t/ subdirectory and are run in trash subdirectory. PATH=$(pwd)/..:$PATH -export PATH +HOME=$(pwd)/trash +export PATH HOME # Test repository